Merge branch '0.3.1-feature-statusline-474'

1 files changed, 21 insertions, 6 deletions

diff --git a/alot/ui.py b/alot/ui.py
index 9d321ceb..9e5e81b0 100644
--- a/alot/ui.py
+++ b/alot/ui.py
@@ -11,6 +11,7 @@ from buffers import BufferlistBuffer
 import commands
 from commands import commandfactory
 from alot.commands import CommandParseError
+from alot.helper import string_decode
 import widgets
 
 
@@ -416,13 +417,27 @@ class UI(object):
 
     def build_statusbar(self):
         """construct and return statusbar widget"""
-        if self.current_buffer is not None:
-            idx = self.buffers.index(self.current_buffer)
-            lefttxt = '%d: %s' % (idx, self.current_buffer)
-        else:
-            lefttxt = '[no buffers]'
+        info = {}
+        cb = self.current_buffer
+        btype = None
+
+        if cb is not None:
+            info = cb.get_info()
+            btype = cb.modename
+            info['buffer_no'] = self.buffers.index(cb)
+            info['buffer_type'] = btype
+        info['total_messages'] = self.dbman.count_messages('*')
+        info['pending_writes'] = len(self.dbman.writequeue)
+
+        lefttxt = righttxt = u''
+        if cb is not None:
+            lefttxt, righttxt = settings.get(btype + '_statusbar', (u'', u''))
+            lefttxt = string_decode(lefttxt, 'UTF-8')
+            lefttxt = lefttxt.format(**info)
+            righttxt = string_decode(righttxt, 'UTF-8')
+            righttxt = righttxt.format(**info)
+
         footerleft = urwid.Text(lefttxt, align='left')
-        righttxt = 'total messages: %d' % self.dbman.count_messages('*')
         pending_writes = len(self.dbman.writequeue)
         if pending_writes > 0:
             righttxt = ('|' * pending_writes) + ' ' + righttxt