aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2019-05-17 11:42:34 -0400
committerDrew DeVault <sir@cmpwn.com>2019-05-17 11:42:34 -0400
commit89ffd8653dfec30f66875bde71c997b511e2466c (patch)
treef83c433e6ffc08c2f99983d42ef0923cd6112820
parent2ffbe7a6cd7882ce50163725104c8d9ea72102a8 (diff)
Implement ui.empty-message config option
Also removes some options that aren't going to be supported any time soon.
-rw-r--r--config/aerc.conf13
-rw-r--r--config/config.go4
-rw-r--r--widgets/msglist.go2
3 files changed, 1 insertions, 18 deletions
diff --git a/config/aerc.conf b/config/aerc.conf
index 1211764..5db4cf0 100644
--- a/config/aerc.conf
+++ b/config/aerc.conf
@@ -16,25 +16,12 @@ index-format=%4C %Z %D %-17.17n %s
timestamp-format=%F %l:%M %p
#
-# The frames of animation to use in the UI for things that are still loading.
-# Seperate each frame with a comma.
-#
-# Default: "[..] , [..] , [..], [..] " (note extra spaces)
-loading-frames=[..] , [..] , [..], [..]
-
-#
# Width of the sidebar, including the border.
#
# Default: 20
sidebar-width=20
#
-# Height of the message preview, including the border.
-#
-# Default: 12
-preview-height=12
-
-#
# Message to display when viewing an empty folder.
#
# Default: (no messages)
diff --git a/config/config.go b/config/config.go
index aee326f..aef796c 100644
--- a/config/config.go
+++ b/config/config.go
@@ -17,7 +17,6 @@ type UIConfig struct {
IndexFormat string `ini:"index-format"`
TimestampFormat string `ini:"timestamp-format"`
ShowHeaders []string `delim:","`
- LoadingFrames []string `delim:","`
RenderAccountTabs string `ini:"render-account-tabs"`
SidebarWidth int `ini:"sidebar-width"`
PreviewHeight int `ini:"preview-height"`
@@ -171,9 +170,6 @@ func LoadConfig(root *string) (*AercConfig, error) {
ShowHeaders: []string{
"From", "To", "Cc", "Bcc", "Subject", "Date",
},
- LoadingFrames: []string{
- "[..] ", " [..] ", " [..]", " [..] ",
- },
RenderAccountTabs: "auto",
SidebarWidth: 20,
PreviewHeight: 12,
diff --git a/widgets/msglist.go b/widgets/msglist.go
index eeadec7..944bad8 100644
--- a/widgets/msglist.go
+++ b/widgets/msglist.go
@@ -89,7 +89,7 @@ func (ml *MessageList) Draw(ctx *ui.Context) {
}
if len(store.Uids) == 0 {
- msg := "(no messages)"
+ msg := ml.conf.Ui.EmptyMessage
ctx.Printf((ctx.Width()/2)-(len(msg)/2), 0,
tcell.StyleDefault, "%s", msg)
}