r6581 - trunk/gnue-designer/src/base

[kilo]

Author: kilo
Date: 2004-10-29 19:05:44 -0500 (Fri, 29 Oct 2004)
New Revision: 6581

Modified:
   trunk/gnue-designer/src/base/Instance.py
   trunk/gnue-designer/src/base/MenuBar.py
   trunk/gnue-designer/src/base/ToolBar.py
Log:
Added support for toolbar icon tooltips

Modified: trunk/gnue-designer/src/base/Instance.py
===================================================================
--- trunk/gnue-designer/src/base/Instance.py    2004-10-29 12:32:30 UTC (rev 
6580)
+++ trunk/gnue-designer/src/base/Instance.py    2004-10-30 00:05:44 UTC (rev 
6581)
@@ -208,8 +208,6 @@
     self.statusbar = self.CreateStatusBar()
     self.SetStatusText(_('Welcome to GNUe Designer -- Do not expose to direct 
sunlight, do not feed after midnight, and do not get wet.'))
     self.menubar = MenuBar(self)
-    self.toolbar = PrimaryToolBar(self, self)
-    self.SetToolBar(self.toolbar)
 
 
     gStartupStatus(_('Inventorying Document Objects'))
@@ -227,12 +225,15 @@
     self.createTools()
     self._initTools()
     self.createWizards()
-    self.initToolBar()
 
     # Finalize menu bar
     self.menubar.finalize()
     self._app.mru.addMenu(self.menubar.getMenu('File|Open Recent|'), self)
 
+    self.toolbar = PrimaryToolBar(self, self)
+    self.SetToolBar(self.toolbar)
+    self.initToolBar()
+
     # TODO: This is a hack to disable any menu items
     # TODO: for actions we've yet to implement
     for action in ('RequestRevert','RequestRedo','RequestCopy',

Modified: trunk/gnue-designer/src/base/MenuBar.py
===================================================================
--- trunk/gnue-designer/src/base/MenuBar.py     2004-10-29 12:32:30 UTC (rev 
6580)
+++ trunk/gnue-designer/src/base/MenuBar.py     2004-10-30 00:05:44 UTC (rev 
6581)
@@ -156,3 +156,19 @@
     self.Append(menu, text)
 
 
+  def getEventHelp(self, handle):
+    """
+    Return the help string of a menu event,
+    so that it could be used for toolbar icon tooltips too.
+    (Two to two too...)
+    """
+    try:
+      for menuItems in self._menuItems.values():
+        for group, order, text, isMenu, action, canToggle, canDisable, \
+          icon, hotkey, eventdata, help in menuItems:
+          if action == handle:
+            return help
+    except:
+      pass
+
+    return ""

Modified: trunk/gnue-designer/src/base/ToolBar.py
===================================================================
--- trunk/gnue-designer/src/base/ToolBar.py     2004-10-29 12:32:30 UTC (rev 
6580)
+++ trunk/gnue-designer/src/base/ToolBar.py     2004-10-30 00:05:44 UTC (rev 
6581)
@@ -68,13 +68,11 @@
           handle, image  = string.split(type,',',1)
           options = ()
 
-        help=""
-##        help = self.instance.menubar.getEventHelp(handle)
+        help = self.instance.menubar.getEventHelp(handle)
+        if not help:
+          print "Warning: No event tied to %s" % handle
+          help = ""
 
-##        if not help:
-##          print "Warning: No event tied to %s" % handle
-##          help = ""
-
         id = wxNewId()
         self.mapping[id] = handle
         self.mapping[handle] = id