Merge pull request #457 from Seanstoppable/multisourcefuncrename

Rename Prev/Next in MultiSourceWidget
wtfutil · May 18, 2019 · bc31e25 · bc31e25
2 parents bca6772 + 34bf319
commit bc31e25
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 26 deletions.
diff --git a/modules/git/keyboard.go b/modules/git/keyboard.go
@@ -4,11 +4,11 @@ import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
 	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help window")
-	widget.SetKeyboardChar("h", widget.Prev, "Select previous item")
-	widget.SetKeyboardChar("l", widget.Next, "Select next item")
+	widget.SetKeyboardChar("h", widget.PrevSource, "Select previous item")
+	widget.SetKeyboardChar("l", widget.NextSource, "Select next item")
 	widget.SetKeyboardChar("p", widget.Pull, "Pull repo")
 	widget.SetKeyboardChar("c", widget.Checkout, "Checkout branch")
 
-	widget.SetKeyboardKey(tcell.KeyLeft, widget.Prev, "Select previous item")
-	widget.SetKeyboardKey(tcell.KeyRight, widget.Next, "Select next item")
+	widget.SetKeyboardKey(tcell.KeyLeft, widget.PrevSource, "Select previous item")
+	widget.SetKeyboardKey(tcell.KeyRight, widget.NextSource, "Select next item")
 }
diff --git a/modules/github/keyboard.go b/modules/github/keyboard.go
@@ -6,12 +6,12 @@ import (
 
 func (widget *Widget) initializeKeyboardControls() {
 	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
-	widget.SetKeyboardChar("h", widget.Prev, "Select previous item")
-	widget.SetKeyboardChar("l", widget.Next, "Select next item")
+	widget.SetKeyboardChar("h", widget.PrevSource, "Select previous item")
+	widget.SetKeyboardChar("l", widget.NextSource, "Select next item")
 	widget.SetKeyboardChar("o", widget.openRepo, "Open item in browser")
 	widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget")
 
 	widget.SetKeyboardKey(tcell.KeyEnter, widget.openRepo, "Open item in browser")
-	widget.SetKeyboardKey(tcell.KeyLeft, widget.Prev, "Select previous item")
-	widget.SetKeyboardKey(tcell.KeyRight, widget.Next, "Select next item")
+	widget.SetKeyboardKey(tcell.KeyLeft, widget.PrevSource, "Select previous item")
+	widget.SetKeyboardKey(tcell.KeyRight, widget.NextSource, "Select next item")
 }
diff --git a/modules/mercurial/keyboard.go b/modules/mercurial/keyboard.go
@@ -4,11 +4,11 @@ import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
 	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
-	widget.SetKeyboardChar("h", widget.Prev, "Select previous item")
-	widget.SetKeyboardChar("l", widget.Next, "Select next item")
+	widget.SetKeyboardChar("h", widget.PrevSource, "Select previous item")
+	widget.SetKeyboardChar("l", widget.NextSource, "Select next item")
 	widget.SetKeyboardChar("p", widget.Pull, "Pull repo")
 	widget.SetKeyboardChar("c", widget.Checkout, "Checkout branch")
 
-	widget.SetKeyboardKey(tcell.KeyLeft, widget.Prev, "Select previous item")
-	widget.SetKeyboardKey(tcell.KeyRight, widget.Next, "Select next item")
+	widget.SetKeyboardKey(tcell.KeyLeft, widget.PrevSource, "Select previous item")
+	widget.SetKeyboardKey(tcell.KeyRight, widget.NextSource, "Select next item")
 }
diff --git a/modules/textfile/keyboard.go b/modules/textfile/keyboard.go
@@ -7,12 +7,12 @@ import (
 
 func (widget *Widget) initializeKeyboardControls() {
 	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
-	widget.SetKeyboardChar("h", widget.Prev, "Select previous item")
-	widget.SetKeyboardChar("l", widget.Next, "Select next item")
+	widget.SetKeyboardChar("h", widget.PrevSource, "Select previous item")
+	widget.SetKeyboardChar("l", widget.NextSource, "Select next item")
 	widget.SetKeyboardChar("o", widget.openFile, "Open item")
 
-	widget.SetKeyboardKey(tcell.KeyLeft, widget.Prev, "Select previous item")
-	widget.SetKeyboardKey(tcell.KeyRight, widget.Next, "Select next item")
+	widget.SetKeyboardKey(tcell.KeyLeft, widget.PrevSource, "Select previous item")
+	widget.SetKeyboardKey(tcell.KeyRight, widget.NextSource, "Select next item")
 }
 
 func (widget *Widget) openFile() {

diff --git a/modules/todoist/keyboard.go b/modules/todoist/keyboard.go
@@ -6,14 +6,14 @@ func (widget *Widget) initializeKeyboardControls() {
 	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
 	widget.SetKeyboardChar("c", widget.Close, "Close item")
 	widget.SetKeyboardChar("d", widget.Delete, "Delete item")
-	widget.SetKeyboardChar("h", widget.Prev, "Select previous project")
+	widget.SetKeyboardChar("h", widget.PrevSource, "Select previous project")
 	widget.SetKeyboardChar("j", widget.Up, "Select previous item")
 	widget.SetKeyboardChar("k", widget.Down, "Select next item")
-	widget.SetKeyboardChar("l", widget.Next, "Select next project")
+	widget.SetKeyboardChar("l", widget.NextSource, "Select next project")
 	widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget")
 
 	widget.SetKeyboardKey(tcell.KeyDown, widget.Down, "Select next item")
-	widget.SetKeyboardKey(tcell.KeyLeft, widget.Prev, "Select previous project")
-	widget.SetKeyboardKey(tcell.KeyRight, widget.Next, "Select next project")
+	widget.SetKeyboardKey(tcell.KeyLeft, widget.PrevSource, "Select previous project")
+	widget.SetKeyboardKey(tcell.KeyRight, widget.NextSource, "Select next project")
 	widget.SetKeyboardKey(tcell.KeyUp, widget.Up, "Select previous item")
 }
diff --git a/modules/twitter/keyboard.go b/modules/twitter/keyboard.go
@@ -7,13 +7,13 @@ import (
 
 func (widget *Widget) initializeKeyboardControls() {
 	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
-	widget.SetKeyboardChar("h", widget.Prev, "Select previous item")
-	widget.SetKeyboardChar("l", widget.Next, "Select next item")
+	widget.SetKeyboardChar("h", widget.PrevSource, "Select previous item")
+	widget.SetKeyboardChar("l", widget.NextSource, "Select next item")
 	widget.SetKeyboardChar("o", widget.openFile, "Open item")
 
 	widget.SetKeyboardKey(tcell.KeyEnter, widget.openFile, "Open item")
-	widget.SetKeyboardKey(tcell.KeyLeft, widget.Prev, "Select previous item")
-	widget.SetKeyboardKey(tcell.KeyRight, widget.Next, "Select next item")
+	widget.SetKeyboardKey(tcell.KeyLeft, widget.PrevSource, "Select previous item")
+	widget.SetKeyboardKey(tcell.KeyRight, widget.NextSource, "Select next item")
 }
 
 func (widget *Widget) openFile() {

diff --git a/wtf/multisource_widget.go b/wtf/multisource_widget.go
@@ -1,7 +1,9 @@
 package wtf
 
 import (
+	"fmt"
 	"github.com/wtfutil/wtf/cfg"
+	"github.com/wtfutil/wtf/logger"
 )
 
 type MultiSourceWidget struct {
@@ -24,6 +26,8 @@ func NewMultiSourceWidget(moduleConfig *cfg.Common, singular, plural string) Mul
 
 	widget.loadSources()
 
+	logger.Log(fmt.Sprintf("%+v", widget.Sources))
+
 	return widget
 }
 
@@ -40,7 +44,7 @@ func (widget *MultiSourceWidget) CurrentSource() string {
 
 // Next displays the next source in the source list. If the current source is the last
 // source it wraps around to the first source
-func (widget *MultiSourceWidget) Next() {
+func (widget *MultiSourceWidget) NextSource() {
 	widget.Idx = widget.Idx + 1
 	if widget.Idx == len(widget.Sources) {
 		widget.Idx = 0
@@ -53,7 +57,7 @@ func (widget *MultiSourceWidget) Next() {
 
 // Prev displays the previous source in the source list. If the current source is the first
 // source, it wraps around to the last source
-func (widget *MultiSourceWidget) Prev() {
+func (widget *MultiSourceWidget) PrevSource() {
 	widget.Idx = widget.Idx - 1
 	if widget.Idx < 0 {
 		widget.Idx = len(widget.Sources) - 1