From: Tobias Schlitt <toby@php.net>
Date: Sat, 4 Feb 2012 10:05:26 +0000 (+0100)
Subject: Support for optional sub-menu titles.
X-Git-Url: https://adrianiainlam.tk/git/?p=indicator-chars.git;a=commitdiff_plain;h=1b39c416514c6bfb07f79a6cc2c851944f0ea779

Support for optional sub-menu titles.

Thanks to David Goodger <goodger@python.org>.
---

diff --git a/README.rst b/README.rst
index 8d26226..bd44bb8 100644
--- a/README.rst
+++ b/README.rst
@@ -7,18 +7,28 @@ indicator-chars
 App indicator to provide a menu with (potentially funny UTF-8) characters for
 simple copying them to clipboard (similar to original characters applet).
 
-Create a file .indicator-chars in your home dir with lines of characters to be
-selectable.
+Create a file .indicator-chars in your home directory with lines of
+characters to be selectable.
 
 -------
 Install
 -------
 
 - Checkout source code
+
 - Create ~/.indicator-chars
+
   - Each row corresponds to a set of chars
-  - Spaces also count as chars
+
+  - Optional submenu title prefix: "[title]" (trailing spaces stripped)
+
+  - Optional descriptions after chars: "(description)" (leading &
+    trailing spaces stripped)
+
+  - Spaces (apart from above) also count as chars
+
   - Make sure to use UTF-8 encoding
+
 - Put indicator-chars.py into auto start
 
 -----------
@@ -26,5 +36,7 @@ Open issues
 -----------
 
 - If anyone could design a nice, unity style indicator icon?
+
 - Maybe there is a way to use multiple click buttons in menu items?
+
   - No standard Gtk way does not work.
diff --git a/indicator-chars.py b/indicator-chars.py
index 7111568..545c2d9 100755
--- a/indicator-chars.py
+++ b/indicator-chars.py
@@ -31,6 +31,7 @@
 # DAMAGE.
 
 import os
+import re
 import gtk
 import gio
 import signal
@@ -38,14 +39,19 @@ import subprocess
 import appindicator
 
 APP_NAME = 'indicator-chars'
-APP_VERSION = '0.1'
+APP_VERSION = '0.2'
 
 class IndicatorChars:
-    CHARS_PATH = os.getenv('HOME') + '/.indicator-chars'
+    CHARS_PATH = os.path.join(os.getenv('HOME'), '.indicator-chars')
     SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
+    submenu_title_pattern = re.compile(r'\[([^]]+)\] *')
+    description_pattern = re.compile(r' *(\([^)]+\)) *')
+
     def __init__(self):
-        self.ind = appindicator.Indicator("Chars", self.SCRIPT_DIR + '/light16x16.png', appindicator.CATEGORY_APPLICATION_STATUS)
+        self.ind = appindicator.Indicator(
+            "Chars", os.path.join(self.SCRIPT_DIR, 'light16x16.png'),
+            appindicator.CATEGORY_APPLICATION_STATUS)
         self.ind.set_status(appindicator.STATUS_ACTIVE)        
 
         self.update_menu()
@@ -73,15 +79,37 @@ class IndicatorChars:
         for charLine in charDef:
             charLine = unicode(charLine)
             charLine = charLine.strip()
-            parentItem = self.create_menu_item(charLine)
+            submenu_match = self.submenu_title_pattern.match(charLine)
+            if submenu_match:
+                submenu_title = submenu_match.group(1)
+                # remove title part from remainder:
+                charLine = charLine[submenu_match.end():]
+            else:
+                submenu_title = ''.join(
+                    self.description_pattern.split(charLine)[::2])
+            parentItem = self.create_menu_item(submenu_title)
             subMenu = gtk.Menu()
-            for char in charLine:
-                subItem = self.create_menu_item(char)
+            while charLine:
+                char = charLine[0]
+                charLine = charLine[1:]
+                description_match = self.description_pattern.match(charLine)
+                if description_match:
+                    item_title = char + ' ' + description_match.group(1)
+                    # remove description part from remainder:
+                    charLine = charLine[description_match.end():]
+                else:
+                    item_title = char
+                subItem = self.create_menu_item(item_title)
                 subItem.connect("activate", self.on_char_click, char)
                 subMenu.append(subItem)
             parentItem.set_submenu(subMenu)
             menu.append(parentItem)
 
+        menu.append(gtk.SeparatorMenuItem())
+        quit_item = self.create_menu_item('Quit')
+        quit_item.connect("activate", self.on_quit)
+        menu.append(quit_item)
+
         # Show the menu
         menu.show_all()
 
@@ -89,6 +117,10 @@ class IndicatorChars:
         cb = gtk.Clipboard(selection="PRIMARY")
         cb.set_text(char)
 
+    def on_quit(self, widget):
+        gtk.main_quit()
+
+
 if __name__ == "__main__":
     # Catch CTRL-C
     signal.signal(signal.SIGINT, lambda signal, frame: gtk.main_quit())