Merge pull request #537 from wtfutil/20190823-universal-info-modal

20190823 universal info modal

modules/datadog/keyboard.go

@@ -5,8 +5,8 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
+	widget.InitializeCommonControls(widget.Refresh)
-	widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget")
+
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")
 	widget.SetKeyboardChar("o", widget.openItem, "Open item in browser")

modules/feedreader/keyboard.go

@@ -3,8 +3,8 @@ package feedreader
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help widget")
+	widget.InitializeCommonControls(widget.Refresh)
-	widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget")
+
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")
 	widget.SetKeyboardChar("o", widget.openStory, "Open story in browser")

modules/gerrit/keyboard.go

@@ -5,8 +5,8 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help window")
+	widget.InitializeCommonControls(widget.Refresh)
-	widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget")
+
 	widget.SetKeyboardChar("h", widget.prevProject, "Select previous project")
 	widget.SetKeyboardChar("l", widget.nextProject, "Select next project")
 	widget.SetKeyboardChar("j", widget.nextReview, "Select next review")

modules/git/keyboard.go

@@ -3,8 +3,8 @@ package git
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help window")
+	widget.InitializeCommonControls(widget.Refresh)
-	widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget")
+
 	widget.SetKeyboardChar("l", widget.NextSource, "Select next source")
 	widget.SetKeyboardChar("h", widget.PrevSource, "Select previous source")
 	widget.SetKeyboardChar("p", widget.Pull, "Pull repo")

modules/github/keyboard.go

@@ -5,8 +5,8 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
+	widget.InitializeCommonControls(widget.Refresh)
-	widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget")
+
 	widget.SetKeyboardChar("l", widget.NextSource, "Select next source")
 	widget.SetKeyboardChar("h", widget.PrevSource, "Select previous source")
 	widget.SetKeyboardChar("o", widget.openRepo, "Open item in browser")

modules/gitlab/keyboard.go

@@ -3,8 +3,8 @@ package gitlab
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
+	widget.InitializeCommonControls(widget.Refresh)
-	widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget")
+
 	widget.SetKeyboardChar("h", widget.PrevSource, "Select previous project")
 	widget.SetKeyboardChar("l", widget.NextSource, "Select next project")
 

modules/gitter/keyboard.go

@@ -3,8 +3,8 @@ package gitter
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
+	widget.InitializeCommonControls(widget.Refresh)
-	widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget")
+
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")
 

modules/hackernews/keyboard.go

@@ -3,8 +3,8 @@ package hackernews
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help widget")
+	widget.InitializeCommonControls(widget.Refresh)
-	widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget")
+
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")
 	widget.SetKeyboardChar("o", widget.openStory, "Open story in browser")

modules/jenkins/keyboard.go

@@ -3,8 +3,8 @@ package jenkins
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
+	widget.InitializeCommonControls(widget.Refresh)
-	widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget")
+
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")
 	widget.SetKeyboardChar("o", widget.openJob, "Open job in browser")

modules/jira/keyboard.go

@@ -5,8 +5,8 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
+	widget.InitializeCommonControls(widget.Refresh)
-	widget.SetKeyboardChar("r", widget.openItem, "Refresh widget")
+
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")
 	widget.SetKeyboardChar("o", widget.openItem, "Open item in browser")

modules/mercurial/keyboard.go

@@ -3,8 +3,8 @@ package mercurial
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
+	widget.InitializeCommonControls(widget.Refresh)
-	widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget")
+
 	widget.SetKeyboardChar("l", widget.NextSource, "Select next source")
 	widget.SetKeyboardChar("h", widget.PrevSource, "Select previous source")
 	widget.SetKeyboardChar("p", widget.Pull, "Pull repo")

modules/nbascore/keyboard.go

@@ -3,8 +3,8 @@ package nbascore
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
+	widget.InitializeCommonControls(widget.Refresh)
-	widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget")
+
 	widget.SetKeyboardChar("l", widget.next, "Select next item")
 	widget.SetKeyboardChar("h", widget.prev, "Select previous item")
 	widget.SetKeyboardChar("c", widget.center, "Center on item")

modules/rollbar/keyboard.go

@@ -3,8 +3,8 @@ package rollbar
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
+	widget.InitializeCommonControls(widget.Refresh)
-	widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget")
+
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")
 	widget.SetKeyboardChar("o", widget.openBuild, "Open item in browser")

modules/spotify/keyboard.go

@@ -7,8 +7,8 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
+	widget.InitializeCommonControls(widget.Refresh)
-	widget.SetKeyboardChar("r", widget.Refresh, "Refresh widgett")
+
 	widget.SetKeyboardChar("l", widget.next, "Select next item")
 	widget.SetKeyboardChar("h", widget.previous, "Select previous item")
 	widget.SetKeyboardChar(" ", widget.playPause, "Play/pause song")

modules/spotifyweb/keyboard.go

@@ -7,8 +7,8 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
+	widget.InitializeCommonControls(widget.Refresh)
-	widget.SetKeyboardChar("/", widget.Refresh, "Refresh widget")
+
 	widget.SetKeyboardChar("h", widget.selectPrevious, "Select previous item")
 	widget.SetKeyboardChar("l", widget.selectNext, "Select next item")
 	widget.SetKeyboardChar(" ", widget.playPause, "Play/pause")

modules/textfile/keyboard.go

@@ -6,7 +6,8 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
+	widget.InitializeCommonControls(nil)
+
 	widget.SetKeyboardChar("l", widget.NextSource, "Select next file")
 	widget.SetKeyboardChar("h", widget.PrevSource, "Select previous file")
 	widget.SetKeyboardChar("o", widget.openFile, "Open file")

modules/todo/keyboard.go

@@ -9,8 +9,8 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
+	widget.InitializeCommonControls(widget.Refresh)
-	widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget")
+
 	widget.SetKeyboardChar("j", widget.displayNext, "Select next item")
 	widget.SetKeyboardChar("k", widget.displayPrev, "Select previous item")
 	widget.SetKeyboardChar(" ", widget.toggleChecked, "Toggle checkmark")
@@ -24,6 +24,7 @@ func (widget *Widget) initializeKeyboardControls() {
 	widget.SetKeyboardKey(tcell.KeyCtrlJ, widget.demoteSelected, "Demote item")
 	widget.SetKeyboardKey(tcell.KeyCtrlK, widget.promoteSelected, "Promote item")
 	widget.SetKeyboardKey(tcell.KeyEnter, widget.editSelected, "Edit item")
+
 }
 
 func (widget *Widget) deleteSelected() {

modules/todoist/keyboard.go

@@ -3,8 +3,8 @@ package todoist
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
+	widget.InitializeCommonControls(widget.Refresh)
-	widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget")
+
 	widget.SetKeyboardChar("d", widget.Delete, "Delete item")
 	widget.SetKeyboardChar("j", widget.Prev, "Select previous item")
 	widget.SetKeyboardChar("k", widget.Next, "Select next item")

modules/transmission/keyboard.go

@@ -3,7 +3,8 @@ package transmission
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
+	widget.InitializeCommonControls(nil)
+
 	widget.SetKeyboardChar("j", widget.Prev, "Select previous item")
 	widget.SetKeyboardChar("k", widget.Next, "Select next item")
 	widget.SetKeyboardChar("u", widget.Unselect, "Clear selection")

modules/travisci/keyboard.go

@@ -3,8 +3,8 @@ package travisci
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
+	widget.InitializeCommonControls(widget.Refresh)
-	widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget")
+
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")
 	widget.SetKeyboardChar("o", widget.openBuild, "Open item in browser")

modules/twitter/keyboard.go

@@ -6,8 +6,8 @@ import (
 )
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
+	widget.InitializeCommonControls(widget.Refresh)
-	widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget")
+
 	widget.SetKeyboardChar("l", widget.NextSource, "Select next source")
 	widget.SetKeyboardChar("h", widget.PrevSource, "Select previous source")
 	widget.SetKeyboardChar("o", widget.openFile, "Open source")

modules/weatherservices/weather/keyboard.go

@@ -3,8 +3,8 @@ package weather
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
+	widget.InitializeCommonControls(widget.Refresh)
-	widget.SetKeyboardChar("r", widget.Refresh, "Refresh Widget")
+
 	widget.SetKeyboardChar("h", widget.PrevSource, "Select previous city")
 	widget.SetKeyboardChar("l", widget.NextSource, "Select next city")
 

modules/zendesk/keyboard.go

@@ -3,8 +3,8 @@ package zendesk
 import "github.com/gdamore/tcell"
 
 func (widget *Widget) initializeKeyboardControls() {
-	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
+	widget.InitializeCommonControls(widget.Refresh)
-	widget.SetKeyboardChar("r", widget.ShowHelp, "Refresh widget")
+
 	widget.SetKeyboardChar("j", widget.Next, "Select next item")
 	widget.SetKeyboardChar("k", widget.Prev, "Select previous item")
 	widget.SetKeyboardChar("o", widget.openTicket, "Open item")

view/keyboard_widget.go

@@ -31,7 +31,7 @@ type KeyboardWidget struct {
 
 // NewKeyboardWidget creates and returns a new instance of KeyboardWidget
 func NewKeyboardWidget(app *tview.Application, pages *tview.Pages, settings *cfg.Common) KeyboardWidget {
-	return KeyboardWidget{
+	keyWidget := KeyboardWidget{
 		app:      app,
 		pages:    pages,
 		settings: settings,
@@ -40,6 +40,8 @@ func NewKeyboardWidget(app *tview.Application, pages *tview.Pages, settings *cfg
 		charHelp: []helpItem{},
 		keyHelp:  []helpItem{},
 	}
+
+	return keyWidget
 }
 
 // SetKeyboardChar sets a character/function combination that responds to key presses
@@ -70,6 +72,16 @@ func (widget *KeyboardWidget) SetKeyboardKey(key tcell.Key, fn func(), helpText
 	}
 }
 
+// InitializeCommonControls sets up the keyboard controls that are common to
+// all widgets that accept keyboard input
+func (widget *KeyboardWidget) InitializeCommonControls(refreshFunc func()) {
+	widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt")
+
+	if refreshFunc != nil {
+		widget.SetKeyboardChar("r", refreshFunc, "Refresh widget")
+	}
+}
+
 // InputCapture is the function passed to tview's SetInputCapture() function
 // This is done during the main widget's creation process using the following code:
 //