[gnue] r8293 - in trunk/gnue-forms/src: GFObjects uidrivers/curses/widgets uidrivers/gtk2/widgets uidrivers/win32/widgets uidrivers/wx/widgets uidrivers/wx26/widgets

[johannes]

Author: johannes
Date: 2006-03-30 12:10:18 -0600 (Thu, 30 Mar 2006)
New Revision: 8293

Modified:
   trunk/gnue-forms/src/GFObjects/GFBlock.py
   trunk/gnue-forms/src/GFObjects/GFScrollBar.py
   trunk/gnue-forms/src/uidrivers/curses/widgets/scrollbar.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/scrollbar.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/scrollbar.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/scrollbar.py
Log:
Use new naming schema for ui/gf-events 


Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2006-03-30 17:51:05 UTC (rev 
8292)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2006-03-30 18:10:18 UTC (rev 
8293)
@@ -481,7 +481,7 @@
 
     # Adjusting scrollbars
     for sb in self._scrollbars:
-      sb.adjustScrollbar (self.__visibleStart,
+      sb.doAdjustScrollbar (self.__visibleStart,
           max (self._recordCount, self.__visibleStart + self._rows))
 
 
@@ -829,7 +829,7 @@
 
     # Adjusting scrollbars
     for sb in self._scrollbars:
-      sb.adjustScrollbar (self._currentRecord, self._recordCount)
+      sb.doAdjustScrollbar (self._currentRecord, self._recordCount)
 
 
   def registerScrollbar (self, sb):

Modified: trunk/gnue-forms/src/GFObjects/GFScrollBar.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFScrollBar.py       2006-03-30 17:51:05 UTC 
(rev 8292)
+++ trunk/gnue-forms/src/GFObjects/GFScrollBar.py       2006-03-30 18:10:18 UTC 
(rev 8293)
@@ -38,7 +38,9 @@
   # ---------------------------------------------------------------------------
 
   def __init__ (self, parent = None):
+
     GFObj.__init__ (self, parent)
+
     self._type = "GFScrollBar"
     self.label = ""
     self._scrollrows  = 1
@@ -77,11 +79,12 @@
       # let designer start
       return (0, 0, 1)
 
+
   # ---------------------------------------------------------------------------
-  # Adjust the ui scrollbar to reflect new position and/or record-cound
+  # Call the UI widget to adjust the scrollbar to a given position
   # ---------------------------------------------------------------------------
 
-  def adjustScrollbar (self, current, count):
+  def doAdjustScrollbar (self, current, count):
     """
     Update the UI scrollbar to reflect a new position or record-count.
 
@@ -90,31 +93,29 @@
     """
 
     if self.uiWidget is not None:
-      self.uiWidget.adjustScrollbar (current, count)
+      self.uiWidget.doAdjustScrollbar (current, count)
 
 
   # ---------------------------------------------------------------------------
   # Jump to a record relative to the current record
   # ---------------------------------------------------------------------------
 
-  def scrollRecords (self, adjustment):
+  def _event_scrollDelta (self, delta):
     """
-    Move the current record by a given adjustment
-
-    @param adjustment: number of records to be moved (can be negative)
+    Move the record pointer of the block relative to the current record.
+    @param delta: number of records to be moved (can be negative)
     """
 
-    self._block.scrollRecords (adjustment)
+    self._block.scrollRecords (delta)
 
 
   # ---------------------------------------------------------------------------
   # Jump to a given record number
   # ---------------------------------------------------------------------------
 
-  def scrollToRecord (self, recordNumber):
+  def _event_scrollToRecord (self, recordNumber):
     """
-    Jump to the given record in the underlying block.
-
+    Move the record pointer of the block to an absolute position.
     @param recordNumber: number of record to jump to.
     """
 

Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/scrollbar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/scrollbar.py  2006-03-30 
17:51:05 UTC (rev 8292)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/scrollbar.py  2006-03-30 
18:10:18 UTC (rev 8293)
@@ -32,7 +32,7 @@
   def _init (self, index):
     pass
 
-  def adjustScrollbar (self, position, count):
+  def doAdjustScrollbar (self, position, count):
     pass
 
 # =============================================================================

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/scrollbar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/scrollbar.py    2006-03-30 
17:51:05 UTC (rev 8292)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/scrollbar.py    2006-03-30 
18:10:18 UTC (rev 8293)
@@ -60,7 +60,7 @@
   # adjust the scrollbar to a new position
   # ---------------------------------------------------------------------------
 
-  def adjustScrollbar (self, position, count):
+  def doAdjustScrollbar (self, position, count):
 
     if int (self.adjustment.upper) != count - 1:
       self.adjustment.upper = float (count - 1)
@@ -77,7 +77,7 @@
   def _scrollHandler (self, adjustment):
 
     assert gDebug (6, "Adjust to %s" % int (adjustment.value))
-    self._gfObject.scrollToRecord (int (adjustment.value))
+    self._gfObject._event_scrollToRecord (int (adjustment.value))
 
     return True
 

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2006-03-30 
17:51:05 UTC (rev 8292)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2006-03-30 
18:10:18 UTC (rev 8293)
@@ -588,25 +588,25 @@
       win32gui.SendMessage(lParam, win32con.SBM_GETSCROLLINFO, 0, scrollinfo)
       size, mask, min, max, page, pos, trackpos = struct.unpack (format,
           scrollinfo)
-      gfObject.scrollToRecord (int (trackpos))
+      gfObject._event_scrollToRecord (int (trackpos))
 
     elif scrollCode == win32con.SB_PAGEUP:
-      gfObject.scrollRecords (- uiObject.pageSize)
+      gfObject._event_scrollDelta (- uiObject.pageSize)
 
     elif scrollCode == win32con.SB_PAGEDOWN:
-      gfObject.scrollRecords (uiObject.pageSize)
+      gfObject._event_scrollDelta (uiObject.pageSize)
 
     elif scrollCode == win32con.SB_LINEDOWN:
-      gfObject.scrollRecords (1)
+      gfObject._event_scrollDelta (1)
 
     elif scrollCode == win32con.SB_LINEUP:
-      gfObject.scrollRecords (-1)
+      gfObject._event_scrollDelta (-1)
 
     elif scrollCode == win32con.SB_BOTTOM:
-      gfObject.scrollToRecord (uiObject.lastRecord)
+      gfObject._event_scrollToRecord (uiObject.lastRecord)
 
     elif scrollCode == win32con.SB_TOP:
-      gfObject.scrollToRecord (0)
+      gfObject._event_scrollToRecord (0)
 
 
 class Win32Image(Win32Base):

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py   2006-03-30 
17:51:05 UTC (rev 8292)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py   2006-03-30 
18:10:18 UTC (rev 8293)
@@ -61,7 +61,7 @@
     if event.initialize:
       (crec, self.lastRecord, self.pageSize) = object.getRecordAndPageCount ()
       self._hwnd = newWidget.GetHwnd ()
-      self.adjustScrollbar (crec, self.lastRecord)
+      self.doAdjustScrollbar (crec, self.lastRecord)
 
     return newWidget
 
@@ -70,7 +70,7 @@
   # Adjust the scrollbar to reflect changed record or record-cound
   # ---------------------------------------------------------------------------
 
-  def adjustScrollbar (self, current, count):
+  def doAdjustScrollbar (self, current, count):
 
     format = "IIiiIii"
     size = struct.calcsize (format)

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/scrollbar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/scrollbar.py      2006-03-30 
17:51:05 UTC (rev 8292)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/scrollbar.py      2006-03-30 
18:10:18 UTC (rev 8293)
@@ -67,7 +67,7 @@
           event.initialize,self._uiDriver)
 
     (crec, recs, self.pageSize) = gfObject.getRecordAndPageCount ()
-    self.adjustScrollbar (crec, recs)
+    self.doAdjustScrollbar (crec, recs)
 
     return newWidget
 
@@ -82,13 +82,13 @@
     object = _eventObjTowxWindow(event)
     id = object.GetId ()
 
-    self._gfObject.scrollToRecord (int (object.GetThumbPosition ()))
+    self._gfObject._event_scrollToRecord (int (object.GetThumbPosition ()))
 
 
   # --------------------------------------------------------------------------
   # Adjusts scrollbar pos and size
   # --------------------------------------------------------------------------
-  def adjustScrollbar (self, current, count):
+  def doAdjustScrollbar (self, current, count):
     """
     Adjusts the scrollbar's position and size
     """

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/scrollbar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/scrollbar.py    2006-03-30 
17:51:05 UTC (rev 8292)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/scrollbar.py    2006-03-30 
18:10:18 UTC (rev 8293)
@@ -42,7 +42,7 @@
 
     (crec, recs, self.pageSize) = self._gfObject.getRecordAndPageCount ()
     wx.EVT_COMMAND_SCROLL (newWidget, newWidget.GetId (), self.__scrollEvent)
-    self.adjustScrollbar (crec, recs)
+    self.doAdjustScrollbar (crec, recs)
 
     return newWidget
 
@@ -51,7 +51,7 @@
   # adjust the scrollbar to a new position
   # ---------------------------------------------------------------------------
 
-  def adjustScrollbar (self, position, count):
+  def doAdjustScrollbar (self, position, count):
 
     self.widget.SetScrollbar (position, self.pageSize, count,
         self.pageSize - 1, True)
@@ -63,7 +63,7 @@
 
   def __scrollEvent (self, event):
 
-    self._gfObject.scrollToRecord (event.GetPosition ())
+    self._gfObject._event_scrollToRecord (event.GetPosition ())
     event.Skip ()