Author: jan
Date: 2007-04-26 03:22:22 -0500 (Thu, 26 Apr 2007)
New Revision: 9524
Modified:
trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/toolbar.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/toolbutton.py
Log:
fix suppressed toolbar for gtk2 uidriver
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py 2007-04-25 20:37:25 UTC (rev 9523)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py 2007-04-26 08:22:22 UTC (rev 9524)
@@ -139,7 +139,7 @@
newWidget = self._wrapper.pane
self._container = newWidget
- # Add Statusbar, Toolbar and Menubar as requested and/or allowed
+ # Add Statusbar as requested and/or allowed
if self._form.style != 'dialog':
if not self._form._features ['GUI:STATUSBAR:SUPPRESS']:
self.createStatusBar ()
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/toolbar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/toolbar.py 2007-04-25 20:37:25 UTC (rev 9523)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/toolbar.py 2007-04-26 08:22:22 UTC (rev 9524)
@@ -63,7 +63,8 @@
gtk.EXPAND | gtk.FILL, 0,
0, 0)
- self._uiForm._tooltips = gtk.Tooltips()
+ if hasattr(self._uiForm,"_tooltips"):
+ self._uiForm._tooltips = gtk.Tooltips()
self._container = widget
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/toolbutton.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/toolbutton.py 2007-04-25 20:37:25 UTC (rev 9523)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/toolbutton.py 2007-04-26 08:22:22 UTC (rev 9524)
@@ -50,28 +50,34 @@
description = self._gfObject.description
check = (self._gfObject.action_off is not None)
- if label is not None:
- if icon_file:
- image = gtk.Image()
- image.set_from_file(icon_file)
- else:
- image = None
+ if event.container is not None:
+ if label is not None:
+ if icon_file:
+ image = gtk.Image()
+ image.set_from_file(icon_file)
+ else:
+ image = None
- if check:
- widget = gtk.ToggleToolButton()
- self.__h_toggled = widget.connect('toggled', self.__on_clicked)
+ if check:
+ widget = gtk.ToggleToolButton()
+ self.__h_toggled = widget.connect('toggled', self.__on_clicked)
+ else:
+ widget = gtk.ToolButton()
+ widget.connect('clicked', self.__on_clicked)
+
+ widget.set_icon_widget(image)
+ widget.set_label(label)
+ widget.set_tooltip(self._uiForm._tooltips, label, None)
+
+ event.container.insert(widget, -1)
+
else:
- widget = gtk.ToolButton()
- widget.connect('clicked', self.__on_clicked)
+ widget = None
+ event.container.insert(gtk.SeparatorToolItem(), -1)
- widget.set_icon_widget(image)
- widget.set_label(label)
- widget.set_tooltip(self._uiForm._tooltips, label, None)
-
- event.container.insert(widget, -1)
else:
+ # TOOLBAR:SUPPRESS was set
widget = None
- event.container.insert(gtk.SeparatorToolItem(), -1)
self.__widget = widget
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.