diff options
| -rw-r--r-- | pkg/gui/gui-util.go | 11 | ||||
| -rw-r--r-- | pkg/gui/keybindings.go | 20 | ||||
| -rw-r--r-- | pkg/gui/textstyle.go | 18 |
3 files changed, 27 insertions, 22 deletions
diff --git a/pkg/gui/gui-util.go b/pkg/gui/gui-util.go index 0f2252c..d1c8637 100644 --- a/pkg/gui/gui-util.go +++ b/pkg/gui/gui-util.go @@ -1,22 +1,11 @@ package gui import ( - "github.com/fatih/color" "github.com/isacikgoz/gitbatch/pkg/git" "github.com/isacikgoz/gitbatch/pkg/utils" "github.com/jroimartin/gocui" ) -var ( - blue = color.New(color.FgBlue) - green = color.New(color.FgGreen) - red = color.New(color.FgRed) - cyan = color.New(color.FgCyan) - yellow = color.New(color.FgYellow) - white = color.New(color.FgWhite) - magenta = color.New(color.FgMagenta) -) - func (gui *Gui) refreshViews(g *gocui.Gui, entity *git.RepoEntity) error { if err := gui.updateRemotes(g, entity); err != nil { diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 55e90cc..5999092 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -76,10 +76,10 @@ func (gui *Gui) generateKeybindings() error { Vital: false, }, { View: mainViewFeature.Name, - Key: 'z', + Key: 'e', Modifier: gocui.ModNone, Handler: gui.nextRemoteBranch, - Display: "z", + Display: "e", Description: "Iterate over remote branches", Vital: false, }, { @@ -92,10 +92,10 @@ func (gui *Gui) generateKeybindings() error { Vital: false, }, { View: mainViewFeature.Name, - Key: 'x', + Key: 'd', Modifier: gocui.ModNone, Handler: gui.showCommitDetail, - Display: "x", + Display: "d", Description: "Show commit diff", Vital: false, }, { @@ -186,25 +186,25 @@ func (gui *Gui) updateKeyBindingsView(g *gocui.Gui, viewName string) error { v.FgColor = gocui.ColorBlack v.Frame = false fmt.Fprint(v, ws) - + modeLabel := "" switch mode := gui.State.Mode.ModeID; mode { case FetchMode: v.BgColor = gocui.ColorBlue v.FgColor = gocui.ColorWhite - fmt.Fprint(v, "↓ Fetch Mode") + modeLabel = fetchSymbol + ws + bold.Sprint("FETCH") case PullMode: v.BgColor = gocui.ColorMagenta v.FgColor = gocui.ColorWhite - fmt.Fprint(v, "↓↳ Pull Mode") + modeLabel = pullSymbol + ws + bold.Sprint("PULL") case MergeMode: v.BgColor = gocui.ColorCyan v.FgColor = gocui.ColorBlack - fmt.Fprint(v, "↳ Merge Mode") + modeLabel = mergeSymbol + ws + black.Sprint(bold.Sprint("MERGE")) default: - writeRightHandSide(v, "No-Mode", 0, 0) + modeLabel = "No mode selected" } - fmt.Fprint(v, ws + modeSeperator) + fmt.Fprint(v, ws + modeLabel + ws + modeSeperator) for _, k := range gui.KeyBindings { if k.View == viewName && k.Vital { diff --git a/pkg/gui/textstyle.go b/pkg/gui/textstyle.go index 1514b46..6820f1c 100644 --- a/pkg/gui/textstyle.go +++ b/pkg/gui/textstyle.go @@ -3,11 +3,23 @@ package gui import ( "regexp" + "github.com/fatih/color" "github.com/isacikgoz/gitbatch/pkg/git" "github.com/isacikgoz/gitbatch/pkg/job" ) var ( + black = color.New(color.FgBlack) + blue = color.New(color.FgBlue) + green = color.New(color.FgGreen) + red = color.New(color.FgRed) + cyan = color.New(color.FgCyan) + yellow = color.New(color.FgYellow) + white = color.New(color.FgWhite) + magenta = color.New(color.FgMagenta) + + bold = color.New(color.Bold) + maxBranchLength = 15 maxRepositoryLength = 20 @@ -24,7 +36,11 @@ var ( successSymbol = "✔" failSymbol = "✗" - modeSeperator = "▓▒" + fetchSymbol = "↓" + pullSymbol = "↓↳" + mergeSymbol = "↳" + + modeSeperator = "" keyBindingSeperator = "░" selectionIndicator = string(green.Sprint("→")) + ws |