[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r7960 - in trunk/gnue-forms/src/uidrivers/gtk2: . widgets
From: |
johannes |
Subject: |
[gnue] r7960 - in trunk/gnue-forms/src/uidrivers/gtk2: . widgets |
Date: |
Wed, 28 Sep 2005 12:35:33 -0500 (CDT) |
Author: johannes
Date: 2005-09-21 23:22:08 -0500 (Wed, 21 Sep 2005)
New Revision: 7960
Modified:
trunk/gnue-forms/src/uidrivers/gtk2/ToolBar.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
Log:
Removed old code (< pygtk2.4)
Modified: trunk/gnue-forms/src/uidrivers/gtk2/ToolBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/ToolBar.py 2005-09-22 04:13:32 UTC
(rev 7959)
+++ trunk/gnue-forms/src/uidrivers/gtk2/ToolBar.py 2005-09-22 04:22:08 UTC
(rev 7960)
@@ -37,7 +37,7 @@
# ---------------------------------------------------------------------------
def init (self):
- handlebox = gtk.HandleBox ()
+ handlebox = gtk.HandleBox ()
self.toolbar = gtk.Toolbar ()
self.toolbar.set_orientation (gtk.ORIENTATION_HORIZONTAL)
@@ -53,12 +53,8 @@
self.toolbar.show ()
handlebox.show ()
- self._useNewGTKAPI = gtk.pygtk_version >= (2, 4, 0)
- if self._useNewGTKAPI:
- # If we're using the new Toolbar-API turn off 'Overflow menus' and create
- # a new tootip group
- self.toolbar.set_show_arrow (False)
- self.tooltips = gtk.Tooltips ()
+ self.toolbar.set_show_arrow (False)
+ self.tooltips = gtk.Tooltips ()
return handlebox
@@ -78,38 +74,26 @@
# Set the action icon if available
if not iconloc:
- assert gDebug (1, "Cannot add '%s' to toolbar; no icon" %
userAction.event)
+ assert gDebug (1, "Can't add '%s' to toolbar; no icon" %
userAction.event)
return
icon = gtk.Image ()
icon.set_from_file (iconloc)
- # Create PyGTK 2.4.* style buttons
- if self._useNewGTKAPI:
- if userAction.canToggle:
- button = gtk.ToggleToolButton ()
- button._toggleHandler = button.connect ('toggled', self._toggleEvent,
+ if userAction.canToggle:
+ button = gtk.ToggleToolButton ()
+ button._toggleHandler = button.connect ('toggled', self._toggleEvent,
userAction)
- else:
- button = gtk.ToolButton ()
- button.connect ('clicked', self._buttonPress, userAction)
- button._toggleHandler = None
-
- button.set_icon_widget (icon)
- button.set_label (label)
- button.set_tooltip (self.tooltips, toolTip, None)
-
- self.toolbar.insert (button, -1)
-
- # just stick with PyGTK 2.2.*
else:
- if userAction.canToggle:
- button = self.toolbar.append_element (gtk.TOOLBAR_CHILD_TOGGLEBUTTON,
- None, label, toolTip, None, icon, self._toggleEvent, userAction)
- else:
- button = self.toolbar.append_item (label, toolTip, None, icon,
- self._buttonPress, userAction)
+ button = gtk.ToolButton ()
+ button.connect ('clicked', self._buttonPress, userAction)
button._toggleHandler = None
+
+ button.set_icon_widget (icon)
+ button.set_label (label)
+ button.set_tooltip (self.tooltips, toolTip, None)
+
+ self.toolbar.insert (button, -1)
return button
@@ -144,11 +128,8 @@
def addSeparator (self):
- if self._useNewGTKAPI:
- sep = gtk.SeparatorToolItem ()
- self.toolbar.insert (sep, -1)
- else:
- self.toolbar.append_space ()
+ sep = gtk.SeparatorToolItem ()
+ self.toolbar.insert (sep, -1)
# ---------------------------------------------------------------------------
@@ -156,6 +137,7 @@
# ---------------------------------------------------------------------------
def enableItem (self, item):
+
if item is not None:
item.set_sensitive (1)
@@ -165,6 +147,7 @@
# ---------------------------------------------------------------------------
def disableItem (self, item):
+
if item is not None:
item.set_sensitive (0)
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py 2005-09-22
04:13:32 UTC (rev 7959)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py 2005-09-22
04:22:08 UTC (rev 7960)
@@ -41,16 +41,6 @@
"""
# ---------------------------------------------------------------------------
- # Create a new GTK2 widget
- # ---------------------------------------------------------------------------
-
- def __init__ (self, *args, **kwargs):
-
- UIWidget.__init__ (self, *args, **kwargs)
- self._useNewGTKAPI = gtk.pygtk_version >= (2, 4, 0)
-
-
- # ---------------------------------------------------------------------------
# Create a new GTK widget
# ---------------------------------------------------------------------------
@@ -209,13 +199,7 @@
widget = self.widgets [index]
assert gDebug (6, "indexedFocus: %s [%s]" % (widget, index))
- isCombo = False
- if self._useNewGTKAPI and isinstance (widget, gtk.ComboBoxEntry):
- item = widget.child
- isCombo = True
- else:
- isCombo = isinstance (widget, gtk.Combo)
- item = isCombo and widget.entry or widget
+ item = isinstance (widget, gtk.ComboBoxEntry) and widget.child or widget
self._blockHandler (item, '_focusHandler')
@@ -238,7 +222,7 @@
# To avoid the automatic select-all in a combo box, we explicitly set the
# selection to the current position only
- if isCombo:
+ if isinstance (widget, gtk.ComboBoxEntry):
pos = item.get_position ()
item.select_region (pos, pos)
@@ -253,10 +237,7 @@
for widget in self.widgets:
assert gDebug (6, "Lose focus: %s" % widget)
- if self._useNewGTKAPI and isinstance (widget, gtk.ComboBoxEntry):
- item = widget.child
- else:
- item = isinstance (widget, gtk.Combo) and widget.entry or widget
+ item = isinstance (widget, gtk.ComboBoxEntry) and widget.child or widget
if hasattr (item, '_color'):
item._setback (gtk.STATE_NORMAL, item._color)
@@ -284,8 +265,7 @@
value = unicode (value, gConfigForms ('textEncoding'))
- # Once we change to PyGTK 2.4.* we can remove the gtk.Combo stuff
- if isinstance (widget, gtk.Combo):
+ if isinstance (widget, gtk.ComboBoxEntry):
gfObject = self._uiDriver._WidgetToGFObj [widget]
# Check if list of allowed value (~= foreign keys, ~= dropdown content)
@@ -293,22 +273,6 @@
if gfObject.style == "dropdown":
self._updateChoices (widget, gfObject)
- self._blockHandler (widget.entry, '_insert_handler')
- self._blockHandler (widget.entry, '_delete_handler')
-
- widget.entry.set_text (value)
-
- self._blockHandler (widget.entry, '_insert_handler', True)
- self._blockHandler (widget.entry, '_delete_handler', True)
-
- elif self._useNewGTKAPI and isinstance (widget, gtk.ComboBoxEntry):
- gfObject = self._uiDriver._WidgetToGFObj [widget]
-
- # Check if list of allowed value (~= foreign keys, ~= dropdown content)
- # changed
- if gfObject.style == "dropdown":
- self._updateChoices (widget, gfObject)
-
self._blockHandler (widget.child, '_insert_handler')
self._blockHandler (widget.child, '_delete_handler')
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py 2005-09-22
04:13:32 UTC (rev 7959)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py 2005-09-22
04:22:08 UTC (rev 7960)
@@ -40,10 +40,7 @@
style = gfObject.style
if style == 'dropdown':
- if self._useNewGTKAPI:
- newWidget = self.__createDropDown (gfObject, event)
- else:
- newWidget = self.__createOldDropDown (gfObject, event)
+ newWidget = self.__createDropDown (gfObject, event)
elif style == 'label':
newWidget = self.__createLabel (gfObject, event)
@@ -66,43 +63,6 @@
# ---------------------------------------------------------------------------
- # Create a dropdown widget
- # ---------------------------------------------------------------------------
-
- def __createOldDropDown (self, gfObject, event):
- newWidget = gtk.Combo ()
- maxLen = hasattr (gfObject, 'maxLength') and gfObject.maxLength or 0
- newWidget.entry.set_max_length (maxLen)
-
- newWidget._origAllowedValues = None
- self._updateChoices (newWidget, gfObject)
-
- # Enter does NOT open the popup list
- newWidget.disable_activate ()
-
- newWidget.set_size_request (self.itemWidth, self.itemHeight)
- event.container.put (newWidget, self.itemX, self.itemY)
- newWidget.show ()
-
- if event.initialize:
- self._addDefaultEventHandler (newWidget)
- self._addFocusHandler (newWidget.entry, newWidget)
- self._addDefaultEventHandler (newWidget.entry, newWidget)
-
- entry = newWidget.entry
- entry._insert_handler = entry.connect ('insert-text',
- self.insertTextHandler,
- gfObject)
-
- entry._delete_handler = entry.connect ('delete-text',
- self.deleteTextHandler,
- gfObject)
- entry.connect ('button-release-event', self._buttonRelease)
-
- return newWidget
-
-
- # ---------------------------------------------------------------------------
#
# ---------------------------------------------------------------------------
@@ -258,15 +218,13 @@
# ---------------------------------------------------------------------------
# Set the cursor position in a widget to position
- # -------------------------------------------------------------------------
+ # ---------------------------------------------------------------------------
def setCursorPosition (self, position, index = 0):
+
widget = self.widgets [index]
- if self.__isCombo (widget):
- entry = isinstance (widget, gtk.Combo) and widget.entry or widget.child
- else:
- entry = widget
+ entry = isinstance (widget, gtk.ComboBox) and widget.child or widget
assert gDebug (6, "setCursorPosition to %s in %s [%s] (%s)" % \
(position, entry, index, widget))
@@ -306,12 +264,10 @@
tBuffer.move_mark (insert, tBuffer.get_iter_at_offset (left))
tBuffer.move_mark (selbound, tBuffer.get_iter_at_offset (right))
- elif self.__isCombo (widget):
- entry = isinstance (widget, gtk.Combo) and widget.entry or widget.child
- entry.select_region (selection1, selection2)
+ elif isinstance (widget, gtk.ComboBox):
+ widget.child.select_region (selection1, selection2)
-
# ---------------------------------------------------------------------------
# insert text into gtk.Entry widgets
# ---------------------------------------------------------------------------
@@ -461,18 +417,15 @@
def _updateChoices (self, widget, gfObject):
- if self.__isCombo (widget):
+ if isinstance (widget, gtk.ComboBox):
if widget._origAllowedValues != gfObject._field._allowedValues:
(self.reverse, self.choices) = gfObject._field.allowedValues ()
self.choices.sort ()
widget._origAllowedValues = gfObject._field._allowedValues
- if self._useNewGTKAPI:
- widget.get_model ().clear ()
- map (widget.append_text, self.choices)
- else:
- widget.set_popdown_strings (self.choices)
+ widget.get_model ().clear ()
+ map (widget.append_text, self.choices)
elif isinstance (widget, gtk.TreeView):
if widget._origAllowedValues != gfObject._field._allowedValues:
@@ -629,16 +582,6 @@
self._blockHandler (widget, '_sfc_handler', True)
- # ---------------------------------------------------------------------------
- # Check if a widget is a drop down
- # ---------------------------------------------------------------------------
-
- def __isCombo (self, widget):
-
- return isinstance (widget, gtk.Combo) or \
- (self._useNewGTKAPI and isinstance (widget, gtk.ComboBox))
-
-
# -----------------------------------------------------------------------------
# Determine the minimum size of a button widget
# -----------------------------------------------------------------------------
@@ -652,20 +595,15 @@
e = gtk.Entry ()
(w, eHeight) = e.size_request ()
- if gtk.pygtk_version < (2, 4, 0):
- c = gtk.Combo ()
- else:
- c = gtk.ComboBoxEntry ()
- (w, cHeight) = e.size_request ()
+ c = gtk.ComboBoxEntry ()
+ (w, cHeight) = c.size_request ()
return (None, max (eHeight, cHeight))
-
-
-# -----------------------------------------------------------------------------
+# =============================================================================
# Base configuration data
-# -----------------------------------------------------------------------------
+# =============================================================================
configuration = {
'baseClass' : UIEntry,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r7960 - in trunk/gnue-forms/src/uidrivers/gtk2: . widgets,
johannes <=