commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: johannes
Subject: r6010 - in trunk/gnue-forms/src: . uidrivers/gtk2 uidrivers/gtk2/widgets uidrivers/gtk2/widgets/form
Date: Wed, 21 Jul 2004 08:56:53 -0500 (CDT)

Author: johannes
Date: 2004-07-21 08:56:52 -0500 (Wed, 21 Jul 2004)
New Revision: 6010

Modified:
   trunk/gnue-forms/src/GFKeyMapper.py
   trunk/gnue-forms/src/uidrivers/gtk2/UILoginHandler.py
   trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
   trunk/gnue-forms/src/uidrivers/gtk2/about.py
   trunk/gnue-forms/src/uidrivers/gtk2/common.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/box.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/button.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/wrappers.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/label.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/page.py
Log:
Fixed selection and cursor-positioning in dropdowns, fixed auto-selection for 
dropdowns. Fixed reverse-lookup in GFKeyMapper


Modified: trunk/gnue-forms/src/GFKeyMapper.py
===================================================================
--- trunk/gnue-forms/src/GFKeyMapper.py 2004-07-21 13:41:49 UTC (rev 6009)
+++ trunk/gnue-forms/src/GFKeyMapper.py 2004-07-21 13:56:52 UTC (rev 6010)
@@ -275,6 +275,8 @@
   for key in dir(vk):
     if getattr(vk,key) == keyvalue:
       return key
+  if keyvalue >= 0 and keyvalue <= 255:
+    return chr (keyvalue)
   return None
 
 

Modified: trunk/gnue-forms/src/uidrivers/gtk2/UILoginHandler.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/UILoginHandler.py       2004-07-21 
13:41:49 UTC (rev 6009)
+++ trunk/gnue-forms/src/uidrivers/gtk2/UILoginHandler.py       2004-07-21 
13:56:52 UTC (rev 6010)
@@ -1,6 +1,9 @@
+# GNU Enterprise Forms - GTK UI Driver - Login Handler
 #
-# This file is part of GNU Enterprise.
+# Copyright 2001-2004 Free Software Foundation
 #
+# This file is part of GNU Enterprise
+#
 # GNU Enterprise is free software; you can redistribute it
 # and/or modify it under the terms of the GNU General Public
 # License as published by the Free Software Foundation; either
@@ -16,9 +19,7 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# Copyright 2000-2004 Free Software Foundation
-#
-# $Id: $
+# $Id$
 
 import gtk
 import os.path

Modified: trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py     2004-07-21 13:41:49 UTC 
(rev 6009)
+++ trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py     2004-07-21 13:56:52 UTC 
(rev 6010)
@@ -1,6 +1,9 @@
+# GNU Enterprise Forms - GTK UI Driver - User Interface
 #
-# This file is part of GNU Enterprise.
+# Copyright 2001-2004 Free Software Foundation
 #
+# This file is part of GNU Enterprise
+#
 # GNU Enterprise is free software; you can redistribute it
 # and/or modify it under the terms of the GNU General Public
 # License as published by the Free Software Foundation; either
@@ -16,16 +19,8 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# Copyright 2000-2004 Free Software Foundation
-#
-# FILE:
-# gtk2/UIdriver.py
-#
-# DESCRIPTION:
-# A gtk2 based user interface driver for GNUe forms.
-#
-# NOTES:
-#
+# $Id$
+
 import sys
 import string
 import types


Property changes on: trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
___________________________________________________________________
Name: svn:keywords
   - +Id
   + Id

Modified: trunk/gnue-forms/src/uidrivers/gtk2/about.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/about.py        2004-07-21 13:41:49 UTC 
(rev 6009)
+++ trunk/gnue-forms/src/uidrivers/gtk2/about.py        2004-07-21 13:56:52 UTC 
(rev 6010)
@@ -1,6 +1,9 @@
+# GNU Enterprise Forms - GTK UI Driver - About Box
 #
-# This file is part of GNU Enterprise CD Database.
+# Copyright 2001-2004 Free Software Foundation
 #
+# This file is part of GNU Enterprise
+#
 # GNU Enterprise is free software; you can redistribute it
 # and/or modify it under the terms of the GNU General Public
 # License as published by the Free Software Foundation; either
@@ -16,9 +19,7 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# Copyright 2001-2004 Free Software Foundation
-#
-# $Id: $
+# $Id$
 
 import gtk
 import types
@@ -47,8 +48,8 @@
     tbl.set_border_width (8)
     tbl.set_col_spacings (8)
 
-    self._newLabel (_("Version:"), tbl, 0, 1, 0, 1)
-    self._newLabel (_("Driver:"), tbl, 0, 1, 1, 2)
+    self._newLabel (u_("Version:"), tbl, 0, 1, 0, 1)
+    self._newLabel (u_("Driver:"), tbl, 0, 1, 1, 2)
     self._newLabel (params ['appversion'], tbl, 1, 2, 0, 1)
     self._newLabel (params ['ui_driver'], tbl, 1, 2, 1, 2)
 
@@ -58,15 +59,15 @@
     self.vbox.pack_start (box)
     box.show ()
 
-    box = gtk.Frame (_(" Form Information "))
+    box = gtk.Frame (u_(" Form Information "))
     tbl = gtk.Table (4, 2)
     tbl.set_border_width (8)
     tbl.set_col_spacings (8)
 
-    self._newLabel (_("Name:"),        tbl, 0, 1, 0, 1)
-    self._newLabel (_("Version:"),     tbl, 0, 1, 1, 2)
-    self._newLabel (_("Author:"),      tbl, 0, 1, 2, 3)
-    self._newLabel (_("Description:"), tbl, 0, 1, 3, 4)
+    self._newLabel (u_("Name:"),        tbl, 0, 1, 0, 1)
+    self._newLabel (u_("Version:"),     tbl, 0, 1, 1, 2)
+    self._newLabel (u_("Author:"),      tbl, 0, 1, 2, 3)
+    self._newLabel (u_("Description:"), tbl, 0, 1, 3, 4)
 
     self._newLabel (params ['name'],        tbl, 1, 2, 0, 1)
     self._newLabel (params ['formversion'], tbl, 1, 2, 1, 2)

Modified: trunk/gnue-forms/src/uidrivers/gtk2/common.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/common.py       2004-07-21 13:41:49 UTC 
(rev 6009)
+++ trunk/gnue-forms/src/uidrivers/gtk2/common.py       2004-07-21 13:56:52 UTC 
(rev 6010)
@@ -1,6 +1,9 @@
+# GNU Enterprise Forms - GTK UI Driver - common signal handler
 #
-# This file is part of GNU Enterprise.
+# Copyright 2001-2004 Free Software Foundation
 #
+# This file is part of GNU Enterprise
+#
 # GNU Enterprise is free software; you can redistribute it
 # and/or modify it under the terms of the GNU General Public
 # License as published by the Free Software Foundation; either
@@ -16,9 +19,7 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# Copyright 2000-2004 Free Software Foundation
-#
-# $Id: $
+# $Id$
 
 import gtk
 
@@ -30,10 +31,13 @@
 # Set all default event handlers for GTK widgets
 # -----------------------------------------------------------------------------
 
-def _setDefaultEventHandlers (newWidget, eventHandler, initialize, uiDriver):
+def _setDefaultEventHandlers (newWidget, eventHandler, initialize, uiDriver,
+                              lookup = None):
   if initialize:
+    lookup = lookup is None and newWidget or lookup
+
     newWidget.connect ("key-press-event", _keyPressHandler, uiDriver,
-                             eventHandler)
+                             eventHandler, lookup)
     GDebug.printMesg (1, "Added key-press-event to %s" % newWidget)
 
 
@@ -41,7 +45,7 @@
 # Key press handler
 # -----------------------------------------------------------------------------
 
-def _keyPressHandler (widget, event, uiDriver, eventHandler):
+def _keyPressHandler (widget, event, uiDriver, eventHandler, lookup):
   GDebug.printMesg (2, "Common-keypress: %s %s" % (event.type, event.keyval))
 
   if event.type != gtk.gdk.KEY_PRESS:
@@ -50,19 +54,20 @@
   action  = None
   keycode = event.keyval
 
-  isShift = event.state & gtk.gdk.SHIFT_MASK > 0
-  isLock  = event.state & gtk.gdk.LOCK_MASK > 0
+  isShift = event.state & gtk.gdk.SHIFT_MASK   > 0
+  isLock  = event.state & gtk.gdk.LOCK_MASK    > 0
   isCtrl  = event.state & gtk.gdk.CONTROL_MASK > 0
-  isMod1  = event.state & gtk.gdk.MOD1_MASK > 0
+  isMod1  = event.state & gtk.gdk.MOD1_MASK    > 0
 
   if keycode == gtk.keysyms.ISO_Left_Tab:
     GDebug.printMesg (3, "Mapping Shit-Tab to Tab")
     keycode = gtk.keysyms.Tab
 
-  if not uiDriver._WidgetToGFObj.has_key (widget):
+  if not uiDriver._WidgetToGFObj.has_key (lookup):
+    GDebug.printMesg (2, "can't find widget %s" % lookup)
     return False
 
-  gfObject = uiDriver._WidgetToGFObj [widget]
+  gfObject = uiDriver._WidgetToGFObj [lookup]
 
   #
   # Sigh... a hack for using <enter> in multiline entries
@@ -91,6 +96,7 @@
     action = events.Event ('request%s' % command)
 
   elif gfObject._type == 'GFButton':
+    GDebug.printMesg (1, "Foo pressed button")
     action = events.Event ('buttonActivated', gfObject)
 
   elif gfObject.style == 'checkbox' and gfObject._type == 'GFEntry':
@@ -100,6 +106,8 @@
     else:
       pass
 
+  GDebug.printMesg (1, "Action= %s " % action)
+
   if action is not None:
     # Add the gfObject's _form to the outgoing event
     # rather than every event in the function
@@ -107,6 +115,8 @@
     action.__dict__.update ({'_form': gfObject._form})
     eventHandler (action)
     return True
+  else:
+    GDebug.printMesg (3, "Key dropped!")
 
 
 

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py        2004-07-21 
13:41:49 UTC (rev 6009)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py        2004-07-21 
13:56:52 UTC (rev 6010)
@@ -1,6 +1,9 @@
+# GNU Enterprise Forms - GTK UI Driver - base class for UI widgets
 #
-# This file is part of GNU Enterprise.
+# Copyright 2001-2004 Free Software Foundation
 #
+# This file is part of GNU Enterprise
+#
 # GNU Enterprise is free software; you can redistribute it
 # and/or modify it under the terms of the GNU General Public
 # License as published by the Free Software Foundation; either
@@ -16,9 +19,7 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# Copyright 2000-2004 Free Software Foundation
-#
-# $Id: $
+# $Id$
 
 import gtk
 import types
@@ -30,26 +31,6 @@
 from gnue.forms.uidrivers.gtk2.common import _setDefaultEventHandlers
 
 
-#############################################################################
-#############################################################################
-#
-# UI Objects
-#
-# A set of standard UI objects that allow us to move more code into UIbase
-# These map generic functionality to the specific UI widget set in use by
-# this driver.
-#
-#############################################################################
-#############################################################################
-     
-#
-# UIHelper
-#
-# Provides a UI widget set of std functions to reduce the number of functions
-# require in each UIclass listed below.
-#
-
-
 # =============================================================================
 # This class implements the common behaviour of GTK2 widgets
 # =============================================================================
@@ -106,8 +87,9 @@
   # Add all default event handler to the widget
   # ---------------------------------------------------------------------------
 
-  def _addDefaultEventHandler (self, widget):
-    _setDefaultEventHandlers (widget, self._eventHandler, True, self._uiDriver)
+  def _addDefaultEventHandler (self, widget, lookup = None):
+    _setDefaultEventHandlers (widget, self._eventHandler, True, self._uiDriver,
+                              lookup)
 
 
 
@@ -208,15 +190,25 @@
     item    = isinstance (widget, gtk.Combo) and widget.entry or widget
     handler = hasattr (item, '_focusHandler') and item._focusHandler or None
 
-    self.__blockHandler (item, '_focusHandler')
+    self._blockHandler (item, '_focusHandler')
 
     GDebug.printMesg (3, "Grab focus to %s for %s" % (item, widget))
     item.grab_focus ()
 
-    self.__blockHandler (item, '_focusHandler', True)
+    self._blockHandler (item, '_focusHandler', True)
 
 
+  # ---------------------------------------------------------------------------
+  # On lose of the focus we un-select ComboBox-Entries
+  # ---------------------------------------------------------------------------
 
+  def loseFocus (self):
+    for widget in self.widgets:
+      if isinstance (widget, gtk.Combo):
+        GDebug.printMesg (3, "Lose focus: %s" % widget)
+        widget.entry.select_region (0, 0)
+
+
   # ---------------------------------------------------------------------------
   # Set the value of a widget
   # ---------------------------------------------------------------------------
@@ -244,24 +236,34 @@
       if gfObject.style == "dropdown":
         self._updateChoices (widget, gfObject)
         
+      self._blockHandler (widget.entry, '_insert_handler')
+      self._blockHandler (widget.entry, '_delete_handler')
+      self._blockHandler (widget.list , '_selectHandler')
+
       widget.entry.set_text (value)
+
+      self._blockHandler (widget.entry, '_insert_handler', True)
+      self._blockHandler (widget.entry, '_delete_handler', True)
+      self._blockHandler (widget.list , '_selectHandler' , True)
+
+
       
     elif isinstance (widget, gtk.CheckButton):
-      self.__blockHandler (widget, '_clickedHandler')
+      self._blockHandler (widget, '_clickedHandler')
       widget.set_active (value)
-      self.__blockHandler (widget, '_clickedHandler', True)
+      self._blockHandler (widget, '_clickedHandler', True)
 
     else:
       item = isinstance (widget, gtk.TextView) and widget.get_buffer () or \
           widget
 
-      self.__blockHandler (item, '_insert_handler')
-      self.__blockHandler (item, '_delete_handler')
+      self._blockHandler (item, '_insert_handler')
+      self._blockHandler (item, '_delete_handler')
 
       item.set_text (value)
 
-      self.__blockHandler (item, '_insert_handler', True)
-      self.__blockHandler (item, '_delete_handler', True)
+      self._blockHandler (item, '_insert_handler', True)
+      self._blockHandler (item, '_delete_handler', True)
 
 
     if enabled:
@@ -290,7 +292,7 @@
   # Block or unblock a given event handler of a widget
   # ---------------------------------------------------------------------------
 
-  def __blockHandler (self, widget, handlerName, unblock = False):
+  def _blockHandler (self, widget, handlerName, unblock = False):
     """
     This function blocks or unblocks an event handler of a widget it is
     assigned.

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/box.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/box.py  2004-07-21 13:41:49 UTC 
(rev 6009)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/box.py  2004-07-21 13:56:52 UTC 
(rev 6010)
@@ -1,6 +1,9 @@
+# GNU Enterprise Forms - GTK UI Driver - UIbox widget
 #
-# This file is part of GNU Enterprise.
+# Copyright 2001-2004 Free Software Foundation
 #
+# This file is part of GNU Enterprise
+#
 # GNU Enterprise is free software; you can redistribute it
 # and/or modify it under the terms of the GNU General Public
 # License as published by the Free Software Foundation; either
@@ -16,9 +19,7 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# Copyright 2000-2004 Free Software Foundation
-#
-# $Id: $
+# $Id$
 
 import gtk
 

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/button.py       2004-07-21 
13:41:49 UTC (rev 6009)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/button.py       2004-07-21 
13:56:52 UTC (rev 6010)
@@ -1,6 +1,9 @@
+# GNU Enterprise Forms - GTK UI Driver - button widget
 #
-# This file is part of GNU Enterprise.
+# Copyright 2001-2004 Free Software Foundation
 #
+# This file is part of GNU Enterprise
+#
 # GNU Enterprise is free software; you can redistribute it
 # and/or modify it under the terms of the GNU General Public
 # License as published by the Free Software Foundation; either
@@ -16,9 +19,7 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# Copyright 2000-2004 Free Software Foundation
-#
-# $Id: $
+# $Id$
 
 import gtk
 

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py        2004-07-21 
13:41:49 UTC (rev 6009)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py        2004-07-21 
13:56:52 UTC (rev 6010)
@@ -1,6 +1,9 @@
+# GNU Enterprise Forms - GTK UI Driver - entry widgets
 #
-# This file is part of GNU Enterprise.
+# Copyright 2001-2004 Free Software Foundation
 #
+# This file is part of GNU Enterprise
+#
 # GNU Enterprise is free software; you can redistribute it
 # and/or modify it under the terms of the GNU General Public
 # License as published by the Free Software Foundation; either
@@ -16,9 +19,7 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# Copyright 2000-2004 Free Software Foundation
-#
-# $Id: $
+# $Id$
 
 import gtk
 
@@ -78,11 +79,19 @@
       newWidget._origAllowedValues = gfObject._field._allowedValues
       self._addDefaultEventHandler (newWidget)
       self._addFocusHandler (newWidget.entry, newWidget)
-      newWidget._selectHandler = newWidget.list.connect ('select-child',
+      newWidget.list._selectHandler = newWidget.list.connect ('select-child',
                                                   self.comboHandler, newWidget)
-      newWidget._keypressHandler = newWidget.entry.connect ('key-press-event',
-                                                  self.comboEntryKeyPress)
+      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)
+
     return newWidget
 
 
@@ -173,10 +182,12 @@
     newWidget.set_size_request (self.itemWidth, self.itemHeight + 1)
 
     newWidget._insert_handler = newWidget.connect ('insert-text',
-                                                   self.insertTextHandler)
+                                                   self.insertTextHandler,
+                                                   gfObject)
 
     newWidget._delete_handler = newWidget.connect ('delete-text',
-                                                   self.deleteTextHandler)
+                                                   self.deleteTextHandler,
+                                                   gfObject)
     if event.initialize:
       self._addFocusHandler (newWidget)
       self._addDefaultEventHandler (newWidget)
@@ -194,12 +205,16 @@
   def setCursorPosition (self, position, index = 0):
     widget = self.widgets [index]
     GDebug.printMesg (1, "setCursorPosition to %s in %s [%s]" % \
-        (position, self, index))
+        (position, widget, index))
 
     if isinstance (widget, gtk.Entry):
       if len (widget.get_text ()):
         widget.set_position (position)
 
+    elif isinstance (widget, gtk.Combo):
+      if len (widget.entry.get_text ()):
+        widget.entry.set_position (position)
+
     elif isinstance (widget, gtk.TextView):
       tBuffer = widget.get_buffer ()
       tBuffer.place_cursor (tBuffer.get_iter_at_offset (position))
@@ -235,13 +250,11 @@
   # insert text into gtk.Entry widgets
   # ---------------------------------------------------------------------------
 
-  def insertTextHandler (self, widget, newtext, length, pos):
+  def insertTextHandler (self, widget, newtext, length, pos, gfObject):
 
     GDebug.printMesg (1, "insert gtk.Entry () '%s' at %d (%s) into %s" % \
         (newtext, widget.get_position (), pos, widget))
 
-    gfObject = self._uiDriver._WidgetToGFObj [widget]
-
     text   = unicode (newtext, 'utf-8')
     action = events.Event ('requestINSERTAT', text, text = text,
                            position = widget.get_position (),
@@ -255,8 +268,7 @@
   # delete a portion of text from a gtk.Entry () widget
   # ---------------------------------------------------------------------------
 
-  def deleteTextHandler (self, widget, start_pos, end_pos):
-    gfObject = self._uiDriver._WidgetToGFObj [widget]
+  def deleteTextHandler (self, widget, start_pos, end_pos, gfObject):
     GDebug.printMesg (1, "Delete %s to %s in %s" % (start_pos, end_pos, 
widget))
 
     action = events.Event ('requestDELETERANGE',
@@ -383,25 +395,6 @@
 
 
   # ---------------------------------------------------------------------------
-  # Handle special keypress signals in gtk.Combo.Entry widgets
-  # ---------------------------------------------------------------------------
-
-  def comboEntryKeyPress (self, widget, event):
-    """
-    This handler traps the enter key in the entry widget of a combo box and
-    fires a 'requestNEXTENTRY' event. All other keys are passed through.
-    """
-    gfObject  = self._uiDriver._WidgetToGFObj [widget.get_parent ()]
-
-    if event.keyval == gtk.keysyms.Return:
-      action = events.Event ('requestNEXTENTRY', _form = gfObject._form)
-      self._eventHandler (action)
-      return gtk.TRUE
-
-    return gtk.FALSE
-
-
-  # ---------------------------------------------------------------------------
   # Handle the toggled event on a checkbox
   # ---------------------------------------------------------------------------
 
@@ -436,14 +429,10 @@
       (self.reverse, self.choices) = gfObject._field.allowedValues ()
       self.choices.sort ()
 
-      GDebug.printMesg (1, "ALLOW-CHANGED: from '%s' to '%s'" % \
-          (combo._origAllowedValues, gfObject._field._allowedValues))
       combo._origAllowedValues = gfObject._field._allowedValues
-      if hasattr (combo, '_selectHandler'):
-        combo.list.handler_block (combo._selectHandler)
+      self._blockHandler (combo.list, '_selectHandler')
       combo.set_popdown_strings (self.choices)
-      if hasattr (combo, '_selectHandler'):
-        combo.list.handler_unblock (combo._selectHandler)
+      self._blockHandler (combo.list, '_selectHandler', True)
 
 
 

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py  2004-07-21 
13:41:49 UTC (rev 6009)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py  2004-07-21 
13:56:52 UTC (rev 6010)
@@ -1,6 +1,9 @@
+# GNU Enterprise Forms - GTK UI Driver - Form widget
 #
-# This file is part of GNU Enterprise.
+# Copyright 2001-2004 Free Software Foundation
 #
+# This file is part of GNU Enterprise
+#
 # GNU Enterprise is free software; you can redistribute it
 # and/or modify it under the terms of the GNU General Public
 # License as published by the Free Software Foundation; either
@@ -16,9 +19,7 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# Copyright 2000-2004 Free Software Foundation
-#
-# $Id: $
+# $Id$
 
 import gtk
 import string

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/wrappers.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/wrappers.py        
2004-07-21 13:41:49 UTC (rev 6009)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/wrappers.py        
2004-07-21 13:56:52 UTC (rev 6010)
@@ -1,6 +1,9 @@
+# GNU Enterprise Forms - GTK UI Driver - wrapper for form wigets
 #
-# This file is part of GNU Enterprise.
+# Copyright 2001-2004 Free Software Foundation
 #
+# This file is part of GNU Enterprise
+#
 # GNU Enterprise is free software; you can redistribute it
 # and/or modify it under the terms of the GNU General Public
 # License as published by the Free Software Foundation; either
@@ -16,9 +19,7 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# Copyright 2000-2004 Free Software Foundation
-#
-# $Id: $
+# $Id$
 
 import gtk
 

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/label.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/label.py        2004-07-21 
13:41:49 UTC (rev 6009)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/label.py        2004-07-21 
13:56:52 UTC (rev 6010)
@@ -1,6 +1,9 @@
+# GNU Enterprise Forms - GTK UI Driver - label widget
 #
-# This file is part of GNU Enterprise.
+# Copyright 2001-2004 Free Software Foundation
 #
+# This file is part of GNU Enterprise
+#
 # GNU Enterprise is free software; you can redistribute it
 # and/or modify it under the terms of the GNU General Public
 # License as published by the Free Software Foundation; either
@@ -16,9 +19,7 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# Copyright 2000-2004 Free Software Foundation
-#
-# $Id: $
+# $Id$
 
 import gtk
 

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/page.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/page.py 2004-07-21 13:41:49 UTC 
(rev 6009)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/page.py 2004-07-21 13:56:52 UTC 
(rev 6010)
@@ -1,6 +1,9 @@
+# GNU Enterprise Forms - GTK UI Driver - page widget
 #
-# This file is part of GNU Enterprise.
+# Copyright 2001-2004 Free Software Foundation
 #
+# This file is part of GNU Enterprise
+#
 # GNU Enterprise is free software; you can redistribute it
 # and/or modify it under the terms of the GNU General Public
 # License as published by the Free Software Foundation; either
@@ -16,9 +19,7 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# Copyright 2000-2004 Free Software Foundation
-#
-# $Id: $
+# $Id$
 
 import gtk
 





reply via email to

[Prev in Thread] Current Thread [Next in Thread]