Reverse beep on shutdown

[naja.git] / naja / widgets / text.py

diff --git a/naja/widgets/text.py b/naja/widgets/text.py
index ca653e89c5e512e816a3032d6f1295162baebd16..4343d015e2519f77b48accf314f1d99bf21fe65d 100644 (file)
--- a/naja/widgets/text.py
+++ b/naja/widgets/text.py
@@ -16,9 +16,14 @@ MARKUP_MAP = {
     'WINTOKEN': ('glyphs/win.png', PALETTE.DARK_OLIVE),
     'KEY': ('glyphs/key.png', None),
     'MSB': ('glyphs/msb.png', None),
-    'REDKEY': ('glyphs/key.png', PALETTE.ORANGE),
-    'GREENKEY': ('glyphs/key.png', PALETTE.GREEN),
-    'BLUEKEY': ('glyphs/key.png', PALETTE.BLUE),
+    'RED': ('glyphs/key.png', PALETTE.ORANGE),
+    'GREEN': ('glyphs/key.png', PALETTE.GREEN),
+    'BLUE': ('glyphs/key.png', PALETTE.BLUE),
+    'CLOCKWISE': ('glyphs/clockwise.png', None),
+    'ANTICLOCKWISE': ('glyphs/anticlockwise.png', None),
+
+    'HEALTH_NOCOLOUR': ('glyphs/health.png', None),
+    'WINTOKEN_NOCOLOUR': ('glyphs/win.png', None),
 }
 
 
@@ -58,7 +63,7 @@ class TextWidget(Widget):
 
 class TextBoxWidget(TextWidget):
     def __init__(self, *args, **kwargs):
-        self.padding = kwargs.pop('padding', 5)
+        self.padding = kwargs.pop('padding', 4)
         self.border = kwargs.pop('border', 2)
         self.bg_colour = convert_colour(kwargs.pop('bg_colour',
                                                    PALETTE.LIGHT_VIOLET))
@@ -97,8 +102,6 @@ class TextBoxWidget(TextWidget):
             subwords = word[1:-1].split(',')
             if all(subword in MARKUP_MAP for subword in subwords):
                 return Glyph(word + suffix, subwords, suffix)
-        elif word in MARKUP_MAP:
-            return Glyph(word + suffix, [word], suffix)
 
         return None