r6584 - trunk/gnue-designer/src/base

[kilo]

Author: kilo
Date: 2004-10-30 07:36:18 -0500 (Sat, 30 Oct 2004)
New Revision: 6584

Modified:
   trunk/gnue-designer/src/base/MenuBar.py
   trunk/gnue-designer/src/base/ToolBar.py
Log:
Separate tooltip text and statusbar text for toolbar icons

Modified: trunk/gnue-designer/src/base/MenuBar.py
===================================================================
--- trunk/gnue-designer/src/base/MenuBar.py     2004-10-30 12:03:13 UTC (rev 
6583)
+++ trunk/gnue-designer/src/base/MenuBar.py     2004-10-30 12:36:18 UTC (rev 
6584)
@@ -167,8 +167,8 @@
         for group, order, text, isMenu, action, canToggle, canDisable, \
           icon, hotkey, eventdata, help in menuItems:
           if action == handle:
-            return help
+            return (text, help)
     except:
       pass
 
-    return ""
+    return None

Modified: trunk/gnue-designer/src/base/ToolBar.py
===================================================================
--- trunk/gnue-designer/src/base/ToolBar.py     2004-10-30 12:03:13 UTC (rev 
6583)
+++ trunk/gnue-designer/src/base/ToolBar.py     2004-10-30 12:36:18 UTC (rev 
6584)
@@ -68,10 +68,14 @@
           handle, image  = string.split(type,',',1)
           options = ()
 
-        help = self.instance.menubar.getEventHelp(handle)
-        if not help:
+        try:
+          shortHelp, longHelp = self.instance.menubar.getEventHelp(handle)
+          shortHelp = shortHelp.replace('&','')
+          longHelp = longHelp.replace('&','')
+        except:
           print "Warning: No event tied to %s" % handle
-          help = ""
+          shortHelp = ""
+          longHelp = ""
 
         id = wxNewId()
         self.mapping[id] = handle
@@ -84,8 +88,8 @@
         self.AddTool(id,
           getIcon(image, *self.ICON_SIZE),
           isToggle=1,
-          shortHelpString=help,
-          longHelpString=help)
+          shortHelpString=shortHelp,
+          longHelpString=longHelp)
 
         self.SetToolClientData(id, handle)