Improve digitalclock module

modules/digitalclock/display.go

@@ -7,7 +7,7 @@ func mergeLines(outString []string) string {
 }
 
 func renderWidget(widgetSettings Settings) string {
- outputStrings := []string{}
+ var outputStrings []string
 
  clockString, needBorder := renderClock(widgetSettings)
  if needBorder {
@@ -17,14 +17,26 @@ func renderWidget(widgetSettings Settings) string {
  }
 
  if widgetSettings.withDate {
- outputStrings = append(outputStrings, getDate(widgetSettings.dateFormat, widgetSettings.withDatePrefix), getUTC(), getEpoch())
+ outputStrings = append(outputStrings, getDate(widgetSettings.dateFormat, widgetSettings.withDatePrefix))
+ }
+
+ if widgetSettings.withUTC {
+ outputStrings = append(outputStrings, getUTC())
+ }
+
+ if widgetSettings.withEpoch {
+ outputStrings = append(outputStrings, getEpoch())
  }
 
  return mergeLines(outputStrings)
 }
 
 func (widget *Widget) display() {
  widget.Redraw(func() (string, string, bool) {
- return widget.CommonSettings().Title, renderWidget(*widget.settings), false
+ title := widget.CommonSettings().Title
+ if widget.settings.dateTitle {
+ title = getDate(widget.settings.dateFormat, false)
+ }
+ return title, renderWidget(*widget.settings), false
  })
 }

modules/digitalclock/fonts.go

@@ -79,10 +79,36 @@ func getBigFont() ClockFont {
  return bigFont
 }
 
+func getBoldFont() ClockFont {
+ fontsMap := map[string][]string{
+ "1": {"██", "██", "██", "██", "██"},
+ "2": {"██████", " ██", "██████", "██ ", "██████"},
+ "3": {"██████", " ██", "██████", " ██", "██████"},
+ "4": {"██ ██", "██ ██", "██████", " ██", " ██"},
+ "5": {"██████", "██ ", "██████", " ██", "██████"},
+ "6": {"██████", "██ ", "██████", "██ ██", "██████"},
+ "7": {"██████", " ██", " ██", " ██", " ██"},
+ "8": {"██████", "██ ██", "██████", "██ ██", "██████"},
+ "9": {"██████", "██ ██", "██████", " ██", "██████"},
+ "0": {"██████", "██ ██", "██ ██", "██ ██", "██████"},
+ ":": {" ", "██", " ", "██", " "},
+ " ": {" ", " ", " ", " ", " "},
+ "A": {"", "", "", "", "AM"},
+ "P": {"", "", "", "", "PM"},
+ }
+
+ boldFont := ClockFont{fontRows: 5, fonts: fontsMap}
+ return boldFont
+}
+
 // getFont returns appropriate font map based on the font settings
 func getFont(widgetSettings Settings) ClockFont {
- if strings.ToLower(widgetSettings.font) == "digitalfont" {
+ switch strings.ToLower(widgetSettings.font) {
+ case "digitalfont":
  return getDigitalFont()
+ case "boldfont":
+ return getBoldFont()
+ default:
+ return getBigFont()
  }
- return getBigFont()
 }

modules/digitalclock/settings.go

@@ -18,8 +18,12 @@ type Settings struct {
  font string `help:"The font of the clock." values:"bigfont or digitalfont"`
  hourFormat string `help:"The format of the clock." values:"12 or 24"`
  dateFormat string `help:"The format of the date."`
+ dateTitle bool `help:"Whether or not to display date as widget title"`
  withDate bool `help:"Whether or not to display date information"`
+ withUTC bool `help:"Whether or not to display UTC information"`
+ withEpoch bool `help:"Whether or not to display Epoch information"`
  withDatePrefix bool `help:"Whether or not to display Date: prefix"`
+ centerAlign bool `help:"Whether or not to use center align in widget"`
 }
 
 // NewSettingsFromYAML creates a new settings instance from a YAML config block
@@ -31,8 +35,12 @@ func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *co
  font: ymlConfig.UString("font"),
  hourFormat: ymlConfig.UString("hourFormat", "24"),
  dateFormat: ymlConfig.UString("dateFormat", "Monday January 02 2006"),
+ dateTitle: ymlConfig.UBool("dateTitle", false),
  withDate: ymlConfig.UBool("withDate", true),
+ withUTC: ymlConfig.UBool("withUTC", true),
+ withEpoch: ymlConfig.UBool("withEpoch", true),
  withDatePrefix: ymlConfig.UBool("withDatePrefix", true),
+ centerAlign: ymlConfig.UBool("centerAlign", false),
  }
 
  return &settings

modules/digitalclock/widget.go

@@ -19,6 +19,9 @@ func NewWidget(tviewApp *tview.Application, redrawChan chan bool, settings *Sett
 
  settings: settings,
  }
+ if settings.centerAlign {
+ widget.View.SetTextAlign(tview.AlignCenter)
+ }
 
  return &widget
 }