[gnue] r8104 - in trunk/gnue-forms/src: . GFObjects uidrivers/win32/widgets

[btami]

Author: btami
Date: 2005-11-24 02:54:44 -0600 (Thu, 24 Nov 2005)
New Revision: 8104

Modified:
   trunk/gnue-forms/src/GFObjects/GFScrollBar.py
   trunk/gnue-forms/src/GFParser.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py
Log:
added optional scrollrows attrib to scrollbar

Modified: trunk/gnue-forms/src/GFObjects/GFScrollBar.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFScrollBar.py       2005-11-22 12:41:44 UTC 
(rev 8103)
+++ trunk/gnue-forms/src/GFObjects/GFScrollBar.py       2005-11-24 08:54:44 UTC 
(rev 8104)
@@ -51,7 +51,7 @@
     GFObj.__init__ (self, parent)
     self._type = "GFScrollBar"
     self.label = ""
-    self.rows  = 1
+    self._scrollrows  = 1
 
     self._inits = [self.__initialize]
 
@@ -71,7 +71,12 @@
     self._block = self._form._logic._blockMap [self.block]
     self._block.registerScrollbar (self)
 
+    if hasattr(self, 'scrollrows'):
+      self._scrollrows = self.scrollrows
+    else:
+      self._scrollrows = self.block._rows
 
+
   # ---------------------------------------------------------------------------
   # Get the number of records and rows of the wrapped block
   # ---------------------------------------------------------------------------
@@ -86,7 +91,7 @@
 
     try:
       return (self._block._currentRecord, self._block._recordCount,
-        self._block._rows)
+        self._scrollrows)
     except AttributeError:
       # let designer start
       return (0, 0, 1)

Modified: trunk/gnue-forms/src/GFParser.py
===================================================================
--- trunk/gnue-forms/src/GFParser.py    2005-11-22 12:41:44 UTC (rev 8103)
+++ trunk/gnue-forms/src/GFParser.py    2005-11-24 08:54:44 UTC (rev 8104)
@@ -595,6 +595,10 @@
                'Unique': True,
                'Typecast': GTypecast.name,
                'Description': 'The unique name of the scrollbar.' },
+            'scrollrows': {
+               'Typecast': GTypecast.whole,
+               'Description': 'Defaults to the rows setting defined at the '
+                              'block level.'},
             'block': {
                'Required': True,
                'Typecast': GTypecast.name,

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py   2005-11-22 
12:41:44 UTC (rev 8103)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/scrollbar.py   2005-11-24 
08:54:44 UTC (rev 8104)
@@ -60,7 +60,6 @@
 
     if event.initialize:
       (crec, self.lastRecord, self.pageSize) = object.getRecordAndPageCount ()
-      self._rows = self.pageSize
       self._hwnd = newWidget.GetHwnd ()
       self.adjustScrollbar (crec, self.lastRecord)