r6027 - in trunk/gnue-forms/src/uidrivers/gtk2: . widgets

[johannes]

Author: johannes
Date: 2004-07-22 10:02:28 -0500 (Thu, 22 Jul 2004)
New Revision: 6027

Modified:
   trunk/gnue-forms/src/uidrivers/gtk2/MenuBar.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
Log:
Menubar is now detachable and tooltips are displayed properly when selecting 
menu items


Modified: trunk/gnue-forms/src/uidrivers/gtk2/MenuBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/MenuBar.py      2004-07-22 14:22:30 UTC 
(rev 6026)
+++ trunk/gnue-forms/src/uidrivers/gtk2/MenuBar.py      2004-07-22 15:02:28 UTC 
(rev 6027)
@@ -38,13 +38,16 @@
   # ---------------------------------------------------------------------------
 
   def init (self):
+    self.handleBox = gtk.HandleBox ()
     self.menu = gtk.MenuBar ()
-    self.container.content_table.attach (self.menu,
+    self.handleBox.add (self.menu)
+    self.menu.show ()
+
+    self.container.content_table.attach (self.handleBox,
                                      # X direction           Y direction
                                        0, 1,                      0, 1,
                                        gtk.EXPAND | gtk.FILL,     0,
                                        0,                         0)
-    self.menu.show ()
     return self.menu
 
 
@@ -89,6 +92,8 @@
     parent.add (item)
 
     item.connect ('activate', self._menuHandler, userAction)
+    item.connect ('select', self._selectHandler, userAction)
+    item.connect ('deselect', self._deselectHandler, userAction)
 
     # Set the action icon if available
     if iconloc:
@@ -110,6 +115,23 @@
     
 
   # ---------------------------------------------------------------------------
+  # Display the tooltip in the statusbar if a menu item get's selected
+  # ---------------------------------------------------------------------------
+
+  def _selectHandler (self, menuItem, userAction):
+    self.container._setStatusBar (userAction.description, None, None, None,
+                                  None, None, None)
+
+
+  # ---------------------------------------------------------------------------
+  # Clear the tooltip in the statusbar if a menu item get's deselected
+  # ---------------------------------------------------------------------------
+
+  def _deselectHandler (self, menuItem, userAction):
+    self.container._setStatusBar ('', None, None, None, None, None, None)
+
+
+  # ---------------------------------------------------------------------------
   # Add a separator
   # ---------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py        2004-07-22 
14:22:30 UTC (rev 6026)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py        2004-07-22 
15:02:28 UTC (rev 6027)
@@ -71,7 +71,7 @@
     # Enter does NOT open the popup list
     newWidget.disable_activate ()
 
-    newWidget.set_size_request (self.itemWidth, self.itemHeight + 1)
+    newWidget.set_size_request (self.itemWidth, -1)
     event.container.put (newWidget, self.itemX, self.itemY)
     newWidget.show ()
 
@@ -179,7 +179,7 @@
 
     newWidget = gtk.Entry (maxLen)
     newWidget.modify_font (self._uiDriver.mono_font)
-    newWidget.set_size_request (self.itemWidth, self.itemHeight + 1)
+    newWidget.set_size_request (self.itemWidth, -1)
 
     newWidget._insert_handler = newWidget.connect ('insert-text',
                                                    self.insertTextHandler,