diff --git a/internal/ui/key.go b/internal/ui/key.go index eb51f81c..86b1b580 100644 --- a/internal/ui/key.go +++ b/internal/ui/key.go @@ -137,72 +137,72 @@ func initNumbKeys() { } func initStdKeys() { - tcell.KeyNames[tcell.Key(KeyA)] = "a" - tcell.KeyNames[tcell.Key(KeyB)] = "b" - tcell.KeyNames[tcell.Key(KeyC)] = "c" - tcell.KeyNames[tcell.Key(KeyD)] = "d" - tcell.KeyNames[tcell.Key(KeyE)] = "e" - tcell.KeyNames[tcell.Key(KeyF)] = "f" - tcell.KeyNames[tcell.Key(KeyG)] = "g" - tcell.KeyNames[tcell.Key(KeyH)] = "h" - tcell.KeyNames[tcell.Key(KeyI)] = "i" - tcell.KeyNames[tcell.Key(KeyJ)] = "j" - tcell.KeyNames[tcell.Key(KeyK)] = "k" - tcell.KeyNames[tcell.Key(KeyL)] = "l" - tcell.KeyNames[tcell.Key(KeyM)] = "m" - tcell.KeyNames[tcell.Key(KeyN)] = "n" - tcell.KeyNames[tcell.Key(KeyO)] = "o" - tcell.KeyNames[tcell.Key(KeyP)] = "p" - tcell.KeyNames[tcell.Key(KeyQ)] = "q" - tcell.KeyNames[tcell.Key(KeyR)] = "r" - tcell.KeyNames[tcell.Key(KeyS)] = "s" - tcell.KeyNames[tcell.Key(KeyT)] = "t" - tcell.KeyNames[tcell.Key(KeyU)] = "u" - tcell.KeyNames[tcell.Key(KeyV)] = "v" - tcell.KeyNames[tcell.Key(KeyW)] = "w" - tcell.KeyNames[tcell.Key(KeyX)] = "x" - tcell.KeyNames[tcell.Key(KeyY)] = "y" - tcell.KeyNames[tcell.Key(KeyZ)] = "z" + tcell.KeyNames[KeyA] = "a" + tcell.KeyNames[KeyB] = "b" + tcell.KeyNames[KeyC] = "c" + tcell.KeyNames[KeyD] = "d" + tcell.KeyNames[KeyE] = "e" + tcell.KeyNames[KeyF] = "f" + tcell.KeyNames[KeyG] = "g" + tcell.KeyNames[KeyH] = "h" + tcell.KeyNames[KeyI] = "i" + tcell.KeyNames[KeyJ] = "j" + tcell.KeyNames[KeyK] = "k" + tcell.KeyNames[KeyL] = "l" + tcell.KeyNames[KeyM] = "m" + tcell.KeyNames[KeyN] = "n" + tcell.KeyNames[KeyO] = "o" + tcell.KeyNames[KeyP] = "p" + tcell.KeyNames[KeyQ] = "q" + tcell.KeyNames[KeyR] = "r" + tcell.KeyNames[KeyS] = "s" + tcell.KeyNames[KeyT] = "t" + tcell.KeyNames[KeyU] = "u" + tcell.KeyNames[KeyV] = "v" + tcell.KeyNames[KeyW] = "w" + tcell.KeyNames[KeyX] = "x" + tcell.KeyNames[KeyY] = "y" + tcell.KeyNames[KeyZ] = "z" } func initShiftNumKeys() { - tcell.KeyNames[tcell.Key(KeyShift0)] = "Shift-0" - tcell.KeyNames[tcell.Key(KeyShift1)] = "Shift-1" - tcell.KeyNames[tcell.Key(KeyShift2)] = "Shift-2" - tcell.KeyNames[tcell.Key(KeyShift3)] = "Shift-3" - tcell.KeyNames[tcell.Key(KeyShift4)] = "Shift-4" - tcell.KeyNames[tcell.Key(KeyShift5)] = "Shift-5" - tcell.KeyNames[tcell.Key(KeyShift6)] = "Shift-6" - tcell.KeyNames[tcell.Key(KeyShift7)] = "Shift-7" - tcell.KeyNames[tcell.Key(KeyShift8)] = "Shift-8" - tcell.KeyNames[tcell.Key(KeyShift9)] = "Shift-9" + tcell.KeyNames[KeyShift0] = "Shift-0" + tcell.KeyNames[KeyShift1] = "Shift-1" + tcell.KeyNames[KeyShift2] = "Shift-2" + tcell.KeyNames[KeyShift3] = "Shift-3" + tcell.KeyNames[KeyShift4] = "Shift-4" + tcell.KeyNames[KeyShift5] = "Shift-5" + tcell.KeyNames[KeyShift6] = "Shift-6" + tcell.KeyNames[KeyShift7] = "Shift-7" + tcell.KeyNames[KeyShift8] = "Shift-8" + tcell.KeyNames[KeyShift9] = "Shift-9" } func initShiftKeys() { - tcell.KeyNames[tcell.Key(KeyShiftA)] = "Shift-A" - tcell.KeyNames[tcell.Key(KeyShiftB)] = "Shift-B" - tcell.KeyNames[tcell.Key(KeyShiftC)] = "Shift-C" - tcell.KeyNames[tcell.Key(KeyShiftD)] = "Shift-D" - tcell.KeyNames[tcell.Key(KeyShiftE)] = "Shift-E" - tcell.KeyNames[tcell.Key(KeyShiftF)] = "Shift-F" - tcell.KeyNames[tcell.Key(KeyShiftG)] = "Shift-G" - tcell.KeyNames[tcell.Key(KeyShiftH)] = "Shift-H" - tcell.KeyNames[tcell.Key(KeyShiftI)] = "Shift-I" - tcell.KeyNames[tcell.Key(KeyShiftJ)] = "Shift-J" - tcell.KeyNames[tcell.Key(KeyShiftK)] = "Shift-K" - tcell.KeyNames[tcell.Key(KeyShiftL)] = "Shift-L" - tcell.KeyNames[tcell.Key(KeyShiftM)] = "Shift-M" - tcell.KeyNames[tcell.Key(KeyShiftN)] = "Shift-N" - tcell.KeyNames[tcell.Key(KeyShiftO)] = "Shift-O" - tcell.KeyNames[tcell.Key(KeyShiftP)] = "Shift-P" - tcell.KeyNames[tcell.Key(KeyShiftQ)] = "Shift-Q" - tcell.KeyNames[tcell.Key(KeyShiftR)] = "Shift-R" - tcell.KeyNames[tcell.Key(KeyShiftS)] = "Shift-S" - tcell.KeyNames[tcell.Key(KeyShiftT)] = "Shift-T" - tcell.KeyNames[tcell.Key(KeyShiftU)] = "Shift-U" - tcell.KeyNames[tcell.Key(KeyShiftV)] = "Shift-V" - tcell.KeyNames[tcell.Key(KeyShiftW)] = "Shift-W" - tcell.KeyNames[tcell.Key(KeyShiftX)] = "Shift-X" - tcell.KeyNames[tcell.Key(KeyShiftY)] = "Shift-Y" - tcell.KeyNames[tcell.Key(KeyShiftZ)] = "Shift-Z" + tcell.KeyNames[KeyShiftA] = "Shift-A" + tcell.KeyNames[KeyShiftB] = "Shift-B" + tcell.KeyNames[KeyShiftC] = "Shift-C" + tcell.KeyNames[KeyShiftD] = "Shift-D" + tcell.KeyNames[KeyShiftE] = "Shift-E" + tcell.KeyNames[KeyShiftF] = "Shift-F" + tcell.KeyNames[KeyShiftG] = "Shift-G" + tcell.KeyNames[KeyShiftH] = "Shift-H" + tcell.KeyNames[KeyShiftI] = "Shift-I" + tcell.KeyNames[KeyShiftJ] = "Shift-J" + tcell.KeyNames[KeyShiftK] = "Shift-K" + tcell.KeyNames[KeyShiftL] = "Shift-L" + tcell.KeyNames[KeyShiftM] = "Shift-M" + tcell.KeyNames[KeyShiftN] = "Shift-N" + tcell.KeyNames[KeyShiftO] = "Shift-O" + tcell.KeyNames[KeyShiftP] = "Shift-P" + tcell.KeyNames[KeyShiftQ] = "Shift-Q" + tcell.KeyNames[KeyShiftR] = "Shift-R" + tcell.KeyNames[KeyShiftS] = "Shift-S" + tcell.KeyNames[KeyShiftT] = "Shift-T" + tcell.KeyNames[KeyShiftU] = "Shift-U" + tcell.KeyNames[KeyShiftV] = "Shift-V" + tcell.KeyNames[KeyShiftW] = "Shift-W" + tcell.KeyNames[KeyShiftX] = "Shift-X" + tcell.KeyNames[KeyShiftY] = "Shift-Y" + tcell.KeyNames[KeyShiftZ] = "Shift-Z" } diff --git a/internal/view/pulse.go b/internal/view/pulse.go index 0c5699fd..6edfaa0a 100644 --- a/internal/view/pulse.go +++ b/internal/view/pulse.go @@ -5,6 +5,11 @@ import ( "fmt" "image" + "github.com/derailed/tview" + "github.com/gdamore/tcell/v2" + "golang.org/x/text/cases" + "golang.org/x/text/language" + "github.com/derailed/k9s/internal" "github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/config" @@ -13,10 +18,6 @@ import ( "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/tchart" "github.com/derailed/k9s/internal/ui" - "github.com/derailed/tview" - "github.com/gdamore/tcell/v2" - "golang.org/x/text/cases" - "golang.org/x/text/language" ) // Graphable represents a graphic component. @@ -208,7 +209,7 @@ func (p *Pulse) bindKeys() { for i, v := range p.charts { t := cases.Title(language.Und, cases.NoLower).String(client.NewGVR(v.ID()).R()) - p.actions[tcell.Key(ui.NumKeys[i])] = ui.NewKeyAction(t, p.sparkFocusCmd(i), true) + p.actions[ui.NumKeys[i]] = ui.NewKeyAction(t, p.sparkFocusCmd(i), true) } }