summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIbrahim Serdar Acikgoz <serdaracikgoz86@gmail.com>2018-12-14 02:52:17 +0300
committerIbrahim Serdar Acikgoz <serdaracikgoz86@gmail.com>2018-12-14 02:52:17 +0300
commit1fb01f7086f0b508b30904cf283d3c3a65578c79 (patch)
tree95b65edb40b0e67008ea4b6c4a938890b682854c
parentminor fix (diff)
downloadgitbatch-1fb01f7086f0b508b30904cf283d3c3a65578c79.tar.gz
added new screen cast and minor bugfixes
-rw-r--r--README.md2
-rw-r--r--pkg/gui/commitview.go8
-rw-r--r--pkg/gui/keybindings.go22
3 files changed, 11 insertions, 21 deletions
diff --git a/README.md b/README.md
index ed085d0..7e6f592 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
This tool is beening built to make your local repositories synchronized with remotes easily. Although the focus is batch jobs, you can still do de facto micro management of your git repositories (e.g *add/reset, stash, commit etc.*)
Here is the screencast of the app:
-[![asciicast](https://asciinema.org/a/eXgXpzZfuHxMpZqGMVODUipyc.svg)](https://asciinema.org/a/eXgXpzZfuHxMpZqGMVODUipyc)
+[![asciicast](https://asciinema.org/a/QQPVDWVxUR3bvJhIZY3c4PTuG.svg)](https://asciinema.org/a/QQPVDWVxUR3bvJhIZY3c4PTuG)
## Installation
For now, installation requires golang compiler and minimum golang 1.10 is recommended. (binary distribution will be provided on minimum viable product)
diff --git a/pkg/gui/commitview.go b/pkg/gui/commitview.go
index 8fdd63f..94ef574 100644
--- a/pkg/gui/commitview.go
+++ b/pkg/gui/commitview.go
@@ -11,13 +11,13 @@ import (
var (
commitFrameViewFeature = viewFeature{Name: "commitframe", Title: " Frame "}
- commitUserNameLabelFeature = viewFeature{Name: "commitusername", Title: " Name: "}
- commitUserEmailLabelViewFeature = viewFeature{Name: "commituseremail", Title: " E-Mail: "}
+ commitUserNameLabelFeature = viewFeature{Name: "commitusernamelabel", Title: " Name: "}
+ commitUserEmailLabelViewFeature = viewFeature{Name: "commituseremaillabel", Title: " E-Mail: "}
// these views used as a input for the credentials
commitMessageViewFeature = viewFeature{Name: "commitmessage", Title: " Commit Mesage "}
- commitUserUserViewFeature = viewFeature{Name: "authuser", Title: " Name "}
- commitUserEmailViewFeature = viewFeature{Name: "authpasswd", Title: " E-Mail "}
+ commitUserUserViewFeature = viewFeature{Name: "commitusername", Title: " Name "}
+ commitUserEmailViewFeature = viewFeature{Name: "commituseremail", Title: " E-Mail "}
commitViews = []viewFeature{commitMessageViewFeature, commitUserUserViewFeature, commitUserEmailViewFeature}
commitLabelViews = []viewFeature{commitFrameViewFeature, commitUserNameLabelFeature, commitUserEmailLabelViewFeature}
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go
index 63c0c8b..936c7c6 100644
--- a/pkg/gui/keybindings.go
+++ b/pkg/gui/keybindings.go
@@ -65,9 +65,7 @@ func (gui *Gui) generateKeybindings() error {
Vital: false,
},
}
- for _, binding := range mainKeybindings {
- gui.KeyBindings = append(gui.KeyBindings, binding)
- }
+ gui.KeyBindings = append(gui.KeyBindings, mainKeybindings...)
}
// Statusviews common keybindings
for _, view := range statusViews {
@@ -138,9 +136,7 @@ func (gui *Gui) generateKeybindings() error {
Vital: true,
},
}
- for _, binding := range statusKeybindings {
- gui.KeyBindings = append(gui.KeyBindings, binding)
- }
+ gui.KeyBindings = append(gui.KeyBindings, statusKeybindings...)
}
for _, view := range authViews {
authKeybindings := []*KeyBinding{
@@ -170,9 +166,7 @@ func (gui *Gui) generateKeybindings() error {
Vital: true,
},
}
- for _, binding := range authKeybindings {
- gui.KeyBindings = append(gui.KeyBindings, binding)
- }
+ gui.KeyBindings = append(gui.KeyBindings, authKeybindings...)
}
for _, view := range commitViews {
commitKeybindings := []*KeyBinding{
@@ -194,7 +188,7 @@ func (gui *Gui) generateKeybindings() error {
Vital: true,
}, {
View: view.Name,
- Key: gocui.KeyEnter, //TODO: enter should be replaced with a better option
+ Key: gocui.KeyEnter,
Modifier: gocui.ModNone,
Handler: gui.submitCommitMessageView,
Display: "enter",
@@ -202,9 +196,7 @@ func (gui *Gui) generateKeybindings() error {
Vital: true,
},
}
- for _, binding := range commitKeybindings {
- gui.KeyBindings = append(gui.KeyBindings, binding)
- }
+ gui.KeyBindings = append(gui.KeyBindings, commitKeybindings...)
}
individualKeybindings := []*KeyBinding{
// stash view
@@ -662,9 +654,7 @@ func (gui *Gui) generateKeybindings() error {
Vital: false,
},
}
- for _, binding := range individualKeybindings {
- gui.KeyBindings = append(gui.KeyBindings, binding)
- }
+ gui.KeyBindings = append(gui.KeyBindings, individualKeybindings...)
return nil
}