[gnue] r8722 - in trunk/gnue-forms/src: input/displayHandlers uidrivers/_base uidrivers/_base/widgets uidrivers/curses/widgets uidrivers/gtk2/widgets uidrivers/qt3/widgets uidrivers/win32/widgets uidrivers/wx/widgets uidrivers/wx26/widgets

[reinhard]

Author: reinhard
Date: 2006-10-10 07:01:49 -0500 (Tue, 10 Oct 2006)
New Revision: 8722

Modified:
   trunk/gnue-forms/src/input/displayHandlers/Cursor.py
   trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
   trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/component.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/image.py
   trunk/gnue-forms/src/uidrivers/qt3/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/image.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/image.py
Log:
set_value -> _ui_set_value_
set_cursor_position -> _ui_set_cursor_position_
set_selection_area -> _ui_set_selection_area_


Modified: trunk/gnue-forms/src/input/displayHandlers/Cursor.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Cursor.py        2006-10-10 
11:30:58 UTC (rev 8721)
+++ trunk/gnue-forms/src/input/displayHandlers/Cursor.py        2006-10-10 
12:01:49 UTC (rev 8722)
@@ -163,21 +163,22 @@
     assert gDebug (5, "generateRefreshEvent on %s '%s' %s" % \
         (self, self.display, self.entry))
 
-    if (self.handleCR and type(self.display)=='str'):
-      self.dispatchEvent(events.Event('updateEntryEditor',
-           object = self.field,
-           display=self.display,
-           cursor=self._cursor + 
len(self.display[:self._cursor+1].split('\n'))-1,
-           selection=self.getSelectionArea(),
-         ))
+    if (self.handleCR and type(self.display)=='str'):
+      cursor=self._cursor + len(self.display[:self._cursor+1].split('\n'))-1
     else:
-      self.dispatchEvent(events.Event('updateEntryEditor',
-           object = self.entry,
-           display=self.display,
-           cursor=self._cursor,
-           selection=self.getSelectionArea(),
-         ))
+      cursor=self._cursor
 
+    index = self.entry._visibleIndex
+
+    self.entry.uiWidget._ui_set_value_(index, self.display)
+    self.entry.uiWidget._ui_set_cursor_position_(index, cursor)
+
+    selection = self.getSelectionArea()
+
+    if selection is not None:
+      selection1, selection2 = selection
+      self.entry.uiWidget._ui_set_selected_area_(index, selection1, selection2)
+
   def __beep(self):
     """
     Generates an event requesting that the UI beep.

Modified: trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/UIdriver.py    2006-10-10 11:30:58 UTC 
(rev 8721)
+++ trunk/gnue-forms/src/uidrivers/_base/UIdriver.py    2006-10-10 12:01:49 UTC 
(rev 8722)
@@ -183,7 +183,6 @@
     # register incomming events
     self.registerEventListeners ({
             'updateENTRY'      : self.updateEntry,
-            'updateEntryEditor': self.updateEntryEditor,
             'gotoPAGE'         : self.goto_page,
             'setTitle'         : self.setTitle,
 
@@ -347,7 +346,7 @@
       value  = handler.getDisplayFiller (record.getField (field.field))
 
       assert gDebug (5, "UPD-ENTRY %s prior: '%s' (%s)" % (entry, value, 
count))
-      uiWidget.set_value(value, count)
+      uiWidget._ui_set_value_(count, value)
 
     # Fill current spot
     # Do not execute if we were editing - would overwrite unsaved change
@@ -355,7 +354,7 @@
       value = handler.getDisplayFiller (entry.getValue ())
       assert gDebug (5, "UPD-ENTRY %s current: %s (%s)" % (entry, repr(value),
           index))
-      uiWidget.set_value(value, index)
+      uiWidget._ui_set_value_(index, value)
 
     # Fill trailing spots
     #
@@ -378,29 +377,13 @@
           value = handler.getDisplayFiller (rec.getField (field.field))
 
         assert gDebug (5, "UPD-ENTRY %s trail: '%s' (%s)" % (entry, value, 
count))
-        uiWidget.set_value(value, count, cr <= lastRow)
+        uiWidget._ui_set_value_(count, value)
 
       count += 1
 
     handler.editing = prehandling
 
-  # ---------------------------------------------------------------------------
-  # Update the displayed value and set the cursor position for a GFObject
-  # ---------------------------------------------------------------------------
 
-  def updateEntryEditor (self, event):
-
-    index  = event.object._visibleIndex
-    widget = self._gfObjToUIWidget [event.object]
-    assert gDebug (5, "UPD-ENTRY-ED %s '%s' %s" % (event.object, 
event.display, index))
-    widget.set_value (event.display, index)
-    widget.set_cursor_position (event.cursor, index)
-
-    if event.selection != None:
-      selection1, selection2 = event.selection
-      widget.set_selected_area (selection1, selection2, index)
-
-
   # ---------------------------------------------------------------------------
   # Get the clipboard contents
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py       2006-10-10 
11:30:58 UTC (rev 8721)
+++ trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py       2006-10-10 
12:01:49 UTC (rev 8722)
@@ -231,12 +231,3 @@
 
     def destroy(self):
         pass
-
-    def set_value(self, value, index=0, enabled=1):
-        pass
-
-    def set_cursor_position(self, position, index=0):
-        pass
-
-    def set_selected_area(self, selection1, selection2, index=0):
-        pass

Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py      2006-10-10 
11:30:58 UTC (rev 8721)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/entry.py      2006-10-10 
12:01:49 UTC (rev 8722)
@@ -139,7 +139,7 @@
   # Set value for entry
   # ---------------------------------------------------------------------------
 
-  def set_value (self, value, index = 0, enabled = True):
+  def _ui_set_value_ (self, index, value):
 
     if self.__style == 'listbox' and value in self.__data:
       if self.__value [index] <> value:
@@ -148,14 +148,13 @@
         self.__offset [index] = self.__index [index]
 
     self.__value [index]   = value
-    self.__enabled [index] = enabled
     self.__repaint (index)
 
   # ---------------------------------------------------------------------------
   # Set cursor position
   # ---------------------------------------------------------------------------
 
-  def set_cursor_position (self, position, index = 0):
+  def _ui_set_cursor_position_ (self, index, position):
 
     assert gDebug (2, "----- new position: %s" % position)
     assert gDebug (2, "      Value       : %r" % self.__value [index])
@@ -252,7 +251,7 @@
   # Set start and end of selection area
   # ---------------------------------------------------------------------------
 
-  def set_selected_area (self, selection1, selection2, index = 0):
+  def _ui_set_selected_area_ (self, index, selection1, selection2):
 
     if selection1 == selection2:
       self.__selection [index] = None

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py        2006-10-10 
11:30:58 UTC (rev 8721)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py        2006-10-10 
12:01:49 UTC (rev 8722)
@@ -250,7 +250,7 @@
   # Set the value of a widget
   # ---------------------------------------------------------------------------
 
-  def set_value (self, value, index = 0, enabled = True):
+  def _ui_set_value_ (self, index, value):
     """
     This function sets the value of a widget and optionally enables or disables
     the widget.
@@ -323,37 +323,6 @@
       self._blockHandler (item, '_delete_handler', True)
 
 
-    if enabled:
-      widget.set_sensitive (1)
-    else:
-      widget.set_sensitive (0)
-
-
-  # --------------------------------------------------------------------------
-  # Set the cursor's location in a widget
-  # --------------------------------------------------------------------------
-  def set_cursor_position (self, position, index = 0):
-    """
-    Sets the cursor's position to the given location inside a capable widget.
-    """
-    if hasattr (self.widgets [index], 'set_position'):
-      self.widgets [index].set_position (position)
-
-
-  # --------------------------------------------------------------------------
-  # Set the selection inside a widget
-  # --------------------------------------------------------------------------
-  def set_selected_area (self, selection1, selection2, index=0):
-    """
-    Sets the selection start/end inside a capable widget.
-    """
-    try:
-      self.widgets [index].select_region (selection1, selection2)
-
-    except (AttributeError, TypeError):
-      pass
-
-
   # ---------------------------------------------------------------------------
   # Block or unblock a given event handler of a widget
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/component.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/component.py    2006-10-10 
11:30:58 UTC (rev 8721)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/component.py    2006-10-10 
12:01:49 UTC (rev 8722)
@@ -70,7 +70,7 @@
 
 
     
-  def set_value(self, value, index=0, enabled=1):
+  def _ui_set_value_(self, index, value):
     widget = self.widgets[index]
     try:
       obj = widget.get_objref().queryInterface("IDL:Nautilus/View:1.0")

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py        2006-10-10 
11:30:58 UTC (rev 8721)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py        2006-10-10 
12:01:49 UTC (rev 8722)
@@ -231,7 +231,7 @@
   # Set the cursor position in a widget to position
   # ---------------------------------------------------------------------------
 
-  def set_cursor_position (self, position, index = 0):
+  def _ui_set_cursor_position_ (self, index, position):
 
     widget = self.widgets [index]
 
@@ -255,7 +255,7 @@
   # set the selected area
   # ---------------------------------------------------------------------------
 
-  def set_selected_area (self, selection1, selection2, index = 0):
+  def _ui_set_selected_area_ (self, index, selection1, selection2):
 
     assert gDebug (6, "Set Selected Area %s/%s in %s [%s]" % \
         (selection1, selection2, self, index))

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/image.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/image.py        2006-10-10 
11:30:58 UTC (rev 8721)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/image.py        2006-10-10 
12:01:49 UTC (rev 8722)
@@ -59,7 +59,7 @@
   # Set the widget's PIL
   # ---------------------------------------------------------------------------
 
-  def set_value (self, value, index = 0, enabled = True):
+  def _ui_set_value_(self, index, value):
     if PILImage is None:
       return
 

Modified: trunk/gnue-forms/src/uidrivers/qt3/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt3/widgets/_base.py 2006-10-10 11:30:58 UTC 
(rev 8721)
+++ trunk/gnue-forms/src/uidrivers/qt3/widgets/_base.py 2006-10-10 12:01:49 UTC 
(rev 8722)
@@ -97,7 +97,7 @@
   def indexed_focus(self, index):
     self.widgets[index].setFocus()
 
-  def set_value(self, value, index=0, enabled=1):
+  def _ui_set_value_(self, index, value):
     # These must be here or dropdown style controls
     # will get events they shouldn't and break.
     widget = self.widgets[index]
@@ -118,21 +118,15 @@
       widget.setChecked(value)
     else:
       widget.setText(value)
-    widget.setEnabled(enabled)
 
-##    if enabled:
-##      widget.setBackgroundColor(widget.__origBackgroundColor)
-##    else:
-##      widget.setBackgroundColor(self._uiDriver._disabledColour)
-##    widget.Refresh()
 
-  def set_cursor_position(self, position, index=0):
+  def _ui_set_cursor_position_(self, index, position):
     try:
       self.widgets[index].set_cursor_position(position)
     except AttributeError:
       pass  # For label-style entries
 
-  def set_selected_area(self, selection1, selection2, index=0):
+  def _ui_set_selected_area_(self, index, selection1, selection2):
     try:
       self.widgets[index].setSelection(selection1, selection2-selection1)
     except (AttributeError, TypeError):

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2006-10-10 
11:30:58 UTC (rev 8721)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2006-10-10 
12:01:49 UTC (rev 8722)
@@ -698,7 +698,7 @@
   def indexed_focus(self, index):
     self.widgets[index].SetFocus()
 
-  def set_value(self, value, index=0, enabled=1):
+  def _ui_set_value_(self, index, value):
     widget = self.widgets[index]
     # Check if foreign key changed
     gfObject = self._uiDriver._IdToGFObj[widget.GetId()]
@@ -724,13 +724,12 @@
     value=textEncode(value) #.encode('mbcs') ?
       
     widget.SetValue(value)
-    widget.Enable(enabled)
 
 
-  def set_cursor_position(self, position, index=0):
+  def _ui_set_cursor_position_(self, index, position):
     self.widgets[index].set_cursor_position(position)
 
-  def set_selected_area(self, selection1, selection2, index=0):
+  def _ui_set_selected_area_(self, index, selection1, selection2):
     self.widgets[index].set_selected_area(selection1, selection2)
 
   def create_widget(self, event, spacer):

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py  2006-10-10 11:30:58 UTC 
(rev 8721)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/_base.py  2006-10-10 12:01:49 UTC 
(rev 8722)
@@ -158,7 +158,7 @@
   # --------------------------------------------------------------------------
   # Set the value of a widget
   # --------------------------------------------------------------------------
-  def set_value(self, value, index=0, enabled=True):
+  def _ui_set_value_(self, index, value):
     """
     Sets the value of a widget and optionally enables or disables the widget.
     """
@@ -191,10 +191,9 @@
       pass
 
     widget.SetValue(wxEncode(value))
-    widget.Enable(enabled)
     widget.SetEvtHandlerEnabled(TRUE)
 
-    if enabled:
+    if widget.IsEnabled():
       widget.__color = color = widget.__origBackgroundColor
       try:
         if widget.__focused and self._uiDriver._focusColour:
@@ -211,7 +210,7 @@
   # --------------------------------------------------------------------------
   # Set the cursor's location in a widget
   # --------------------------------------------------------------------------
-  def set_cursor_position(self, position, index=0):
+  def _ui_set_cursor_position_(self, index, position):
     """
     Sets the cursor's position to the given location inside a capable widget.
     """
@@ -223,7 +222,7 @@
   # --------------------------------------------------------------------------
   # Set the selection inside a widget
   # --------------------------------------------------------------------------
-  def set_selected_area(self, selection1, selection2, index=0):
+  def _ui_set_selected_area_(self, index, selection1, selection2):
     """
     Sets the selection start/end inside a capable widget.
     """

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/image.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/image.py  2006-10-10 11:30:58 UTC 
(rev 8721)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/image.py  2006-10-10 12:01:49 UTC 
(rev 8722)
@@ -105,10 +105,23 @@
       self.pane.SetScrollbars(0, 0, 0, 0)
 
 
+  # ---------------------------------------------------------------------------
+  # Enable/disable this image
+  # ---------------------------------------------------------------------------
+
+  def _ui_enable_(self, index):
+    self.widgets[index].Enable(True)
+
+  # ---------------------------------------------------------------------------
+
+  def _ui_disable_(self, index):
+    self.widgets[index].Enable(False)
+
+
   # --------------------------------------------------------------------------
   # Set the widget's PIL
   # --------------------------------------------------------------------------
-  def set_value(self, value, index=0, enabled=1):
+  def _ui_set_value_(self, index, value):
     """
     Loads an image.
     """
@@ -161,7 +174,6 @@
 
     # Load the new image
     widget.SetBitmap(image)
-    widget.Enable(enabled)
     widget.SetEvtHandlerEnabled(TRUE)
     widget.Refresh()
 

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py        2006-10-10 
11:30:58 UTC (rev 8721)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py        2006-10-10 
12:01:49 UTC (rev 8722)
@@ -273,9 +273,10 @@
 
     # -------------------------------------------------------------------------
     # Set the value of a widget
+    # FIXME: Could this function and the next 2 be moved to entry.py?
     # -------------------------------------------------------------------------
 
-    def set_value(self, value, index=0, enabled=True):
+    def _ui_set_value_(self, index, value):
         """
         This function sets the value of a widget and optionally enables or
         disables the widget.
@@ -319,8 +320,6 @@
                 else:
                     widget.SetValue (value)
 
-            widget.Enable (enabled)
-
         finally:
             if self.in_grid and widget._gnue_label_:
                 if isinstance(widget._gnue_label_, wx.StaticText):
@@ -336,7 +335,7 @@
     # Set the cursor's location in a widget
     # ------------------------------------------------------------------------
 
-    def set_cursor_position (self, position, index = 0):
+    def _ui_set_cursor_position_(self, index, position):
         """
         Set the cursor position to the given location inside a capable widget.
 
@@ -360,7 +359,7 @@
     # Set the selection inside a widget
     # ------------------------------------------------------------------------
 
-    def set_selected_area (self, selection1, selection2, index=0):
+    def _ui_set_selected_area_(self, index, selection1, selection2):
         """
         Sets the selection start/end inside a capable widget.
 

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/image.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/image.py        2006-10-10 
11:30:58 UTC (rev 8721)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/image.py        2006-10-10 
12:01:49 UTC (rev 8722)
@@ -105,7 +105,7 @@
     # Set the widget's PIL
     # ------------------------------------------------------------------------
 
-    def set_value (self, value, index = 0, enabled = True):
+    def _ui_set_value_(self, index, value):
         """
         Loads an image.
         """