Merge branch 'master' into windows

bamboohr/widget.go

@@ -29,7 +29,7 @@ func (widget *Widget) Refresh() {
 	)
 
 	widget.UpdateRefreshedAt()
-	widget.View.SetTitle(fmt.Sprintf("%s (%d) ", widget.Name, len(todayItems)))
+	widget.View.SetTitle(widget.ContextualTitle(widget.Name))
 
 	widget.View.SetText(widget.contentFrom(todayItems))
 }

git/display.go

@@ -15,8 +15,8 @@ func (widget *Widget) display() {
 		return
 	}
 
-	title := fmt.Sprintf("[green]%s[white]\n", repoData.Repository)
+	title := fmt.Sprintf("%s - [green]%s[white]", widget.Name, repoData.Repository)
-	widget.View.SetTitle(fmt.Sprintf("%s- %s", widget.Name, title))
+	widget.View.SetTitle(widget.ContextualTitle(title))
 
 	str := wtf.SigilStr(len(widget.Data), widget.Idx, widget.View) + "\n"
 	str = str + " [red]Branch[white]\n"

github/display.go

@@ -14,7 +14,7 @@ func (widget *Widget) display() {
 		return
 	}
 
-	widget.View.SetTitle(fmt.Sprintf("%s- %s ", widget.Name, widget.title(repo)))
+	widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s - %s", widget.Name, widget.title(repo))))
 
 	str := wtf.SigilStr(len(widget.GithubRepos), widget.Idx, widget.View) + "\n"
 	str = str + " [red]Stats[white]\n"

jira/widget.go

@@ -54,13 +54,10 @@ func (widget *Widget) display() {
 		return
 	}
 	widget.View.SetWrap(false)
-	widget.View.SetTitle(
+
-		fmt.Sprintf(
+	str := fmt.Sprintf("%s- [green]%s[white]", widget.Name, wtf.Config.UString("wtf.mods.jira.project"))
-			"%s- [green]%s[white] ",
+
-			widget.Name,
+	widget.View.SetTitle(widget.ContextualTitle(str))
-			wtf.Config.UString("wtf.mods.jira.project"),
-		),
-	)
 	widget.View.SetText(fmt.Sprintf("%s", widget.contentFrom(widget.result)))
 }
 

main.go

@@ -74,6 +74,8 @@ func initializeFocusTracker(app *tview.Application) {
 		Idx:     -1,
 		Widgets: widgets,
 	}
+
+	focusTracker.AssignHotKeys()
 }
 
 func keyboardIntercept(event *tcell.EventKey) *tcell.EventKey {
@@ -86,10 +88,12 @@ func keyboardIntercept(event *tcell.EventKey) *tcell.EventKey {
 		focusTracker.Prev()
 	case tcell.KeyEsc:
 		focusTracker.None()
-	default:
+		//default:
-		return event
+		//return event
 	}
 
+	focusTracker.FocusOn(string(event.Rune()))
+
 	return event
 }
 

textfile/widget.go

@@ -50,7 +50,7 @@ func NewWidget(app *tview.Application, pages *tview.Pages) *Widget {
 
 func (widget *Widget) Refresh() {
 	widget.UpdateRefreshedAt()
-	widget.View.SetTitle(fmt.Sprintf(" %s ", widget.fileName()))
+	widget.View.SetTitle(widget.ContextualTitle(widget.fileName()))
 
 	filePath, _ := wtf.ExpandHomeDir(widget.filePath)
 

todo/widget.go

@@ -68,6 +68,8 @@ func (widget *Widget) Refresh() {
 	widget.UpdateRefreshedAt()
 	widget.load()
 	widget.display()
+
+	widget.View.SetTitle(widget.ContextualTitle(widget.Name))
 }
 
 func (widget *Widget) SetList(newList checklist.Checklist) {

todoist/display.go

@@ -16,7 +16,10 @@ func (widget *Widget) display() {
 		return
 	}
 
-	widget.View.SetTitle(fmt.Sprintf(" [green]%s[white] ", proj.Project.Name))
+	//widget.View.SetTitle(fmt.Sprintf(" [green]%s[white] ", proj.Project.Name))
+
+	widget.View.SetTitle(widget.ContextualTitle(proj.Project.Name))
+
 	str := wtf.SigilStr(len(widget.projects), widget.idx, widget.View) + "\n"
 
 	maxLen := proj.LongestLine()

weatherservices/weather/display.go

@@ -72,5 +72,6 @@ func (widget *Widget) temperatures(cityData *owm.CurrentWeatherData) string {
 }
 
 func (widget *Widget) title(cityData *owm.CurrentWeatherData) string {
-	return fmt.Sprintf(" %s  %s ", widget.emojiFor(cityData), cityData.Name)
+	str := fmt.Sprintf("%s %s", widget.emojiFor(cityData), cityData.Name)
+	return widget.ContextualTitle(str)
 }

wtf/bargraph.go

@@ -72,10 +72,18 @@ func (widget *BarGraph) Focusable() bool {
 	return widget.enabled && widget.focusable
 }
 
+func (widget *BarGraph) FocusChar() string {
+	return ""
+}
+
 func (widget *BarGraph) RefreshInterval() int {
 	return widget.RefreshInt
 }
 
+func (widget *BarGraph) SetFocusChar(char string) {
+	return
+}
+
 func (widget *BarGraph) TextView() *tview.TextView {
 	return widget.View
 }

wtf/focus_tracker.go

@@ -22,6 +22,28 @@ type FocusTracker struct {
 
 /* -------------------- Exported Functions -------------------- */
 
+// AssignHotKeys assigns an alphabetic keyboard character to each focusable
+// widget so that the widget can be brought into focus by pressing that keyboard key
+func (tracker *FocusTracker) AssignHotKeys() {
+	i := 0
+
+	for _, focusable := range tracker.focusables() {
+		focusable.SetFocusChar(string('a' + i))
+		i++
+	}
+}
+
+func (tracker *FocusTracker) FocusOn(char string) {
+	for idx, focusable := range tracker.focusables() {
+		if focusable.FocusChar() == char {
+			tracker.blur(tracker.Idx)
+			tracker.Idx = idx
+			tracker.focus(tracker.Idx)
+			break
+		}
+	}
+}
+
 // Next sets the focus on the next widget in the widget list. If the current widget is
 // the last widget, sets focus on the first widget.
 func (tracker *FocusTracker) Next() {

wtf/text_widget.go

@@ -13,6 +13,7 @@ var Config *config.Config
 type TextWidget struct {
 	enabled   bool
 	focusable bool
+	focusChar string
 
 	Name        string
 	RefreshedAt time.Time
@@ -53,6 +54,14 @@ func (widget *TextWidget) BorderColor() string {
 	return Config.UString("wtf.colors.border.normal", "gray")
 }
 
+func (widget *TextWidget) ContextualTitle(defaultStr string) string {
+	if widget.FocusChar() == "" {
+		return fmt.Sprintf(" %s ", defaultStr)
+	} else {
+		return fmt.Sprintf(" %s [darkgray::u]%s[::-][green] ", defaultStr, widget.FocusChar())
+	}
+}
+
 func (widget *TextWidget) Disable() {
 	widget.enabled = false
 }
@@ -69,10 +78,18 @@ func (widget *TextWidget) Focusable() bool {
 	return widget.enabled && widget.focusable
 }
 
+func (widget *TextWidget) FocusChar() string {
+	return widget.focusChar
+}
+
 func (widget *TextWidget) RefreshInterval() int {
 	return widget.RefreshInt
 }
 
+func (widget *TextWidget) SetFocusChar(char string) {
+	widget.focusChar = char
+}
+
 func (widget *TextWidget) TextView() *tview.TextView {
 	return widget.View
 }
@@ -86,7 +103,7 @@ func (widget *TextWidget) addView() {
 	view.SetBorder(true)
 	view.SetBorderColor(colorFor(widget.BorderColor()))
 	view.SetDynamicColors(true)
-	view.SetTitle(widget.Name)
+	view.SetTitle(widget.ContextualTitle(widget.Name))
 	view.SetWrap(false)
 
 	widget.View = view

wtf/wtfable.go

@@ -10,6 +10,8 @@ type Wtfable interface {
 
 	BorderColor() string
 	Focusable() bool
+	FocusChar() string
+	SetFocusChar(string)
 	TextView() *tview.TextView
 
 	Top() int