oiupoyt/discordo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(ui): incorrect default keybinding value for external editor

Browse source
This commit is contained in:
ayntgl 2022-03-01 20:34:09 +04:00
parent 9ccf36847c
commit 4fbf35fe65
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
config/keybindings.go
View file

@ -1,12 +1,13 @@
package config
type KeybindingsConfig struct {
ToggleGuildsList string `toml:"toggle_guilds_list"`
ToggleChannelsTreeView string `toml:"toggle_channels_tree_view"`
ToggleMessagesTextView string `toml:"toggle_messages_text_view"`
ToggleMessageInputField string `toml:"toggle_message_input_field"`
ToggleMessageActionsList string `toml:"toggle_message_actions_list"`
ToggleExternalEditor string `toml:"toggle_external_editor"`
ToggleGuildsList string `toml:"toggle_guilds_list"`
ToggleChannelsTreeView string `toml:"toggle_channels_tree_view"`
ToggleMessagesTextView string `toml:"toggle_messages_text_view"`
ToggleMessageInputField string `toml:"toggle_message_input_field"`
OpenMessageActionsList string `toml:"open_message_actions_list"`
OpenExternalEditor string `toml:"open_external_editor"`
SelectPreviousMessage string `toml:"select_previous_message"`
SelectNextMessage string `toml:"select_next_message"`
@ -16,12 +17,13 @@ type KeybindingsConfig struct {
func newKeybindingsConfig() KeybindingsConfig {
return KeybindingsConfig{
ToggleGuildsList: "Rune[g]",
ToggleChannelsTreeView: "Rune[c]",
ToggleMessagesTextView: "Rune[m]",
ToggleMessageInputField: "Rune[i]",
ToggleMessageActionsList: "Rune[a]",
ToggleExternalEditor: "Ctrl-E",
ToggleGuildsList: "Rune[g]",
ToggleChannelsTreeView: "Rune[c]",
ToggleMessagesTextView: "Rune[m]",
ToggleMessageInputField: "Rune[i]",
OpenMessageActionsList: "Rune[a]",
OpenExternalEditor: "Ctrl+E",
SelectPreviousMessage: "Up",
SelectNextMessage: "Down",

4
ui/messages.go
View file

@ -91,7 +91,7 @@ func (mtv *MessagesTextView) onInputCapture(e *tcell.EventKey) *tcell.EventKey {
ScrollToHighlight()
return nil
case mtv.app.Config.Keybindings.ToggleMessageActionsList:
case mtv.app.Config.Keybindings.OpenMessageActionsList:
messageActionsList := tview.NewList()
hs := mtv.app.MessagesTextView.GetHighlights()
@ -255,7 +255,7 @@ func (mi *MessageInputField) onInputCapture(e *tcell.EventKey) *tcell.EventKey {
mi.app.MessagesTextView.Highlight()
return nil
case mi.app.Config.Keybindings.ToggleExternalEditor:
case mi.app.Config.Keybindings.OpenExternalEditor:
e := os.Getenv("EDITOR")
if e == "" {
return nil