gnue/gnuef/src GFParser.py UIbase.py UIcurses.p...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/07/31 16:22:30

Modified files:
        gnuef/src      : GFParser.py UIbase.py UIcurses.py 
                         UIpyncurses.py 
        gnuef/src/GFObjects: GFEntry.py GFLabel.py GFObj.py 

Log message:
        Fixed problem w/visibleCount vs rows that was causing designer to 
always write a rows value for entries

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFParser.py.diff?cvsroot=OldCVS&tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIbase.py.diff?cvsroot=OldCVS&tr1=1.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIcurses.py.diff?cvsroot=OldCVS&tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIpyncurses.py.diff?cvsroot=OldCVS&tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects/GFEntry.py.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects/GFLabel.py.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects/GFObj.py.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnue/gnuef/src/GFObjects/GFEntry.py
diff -u gnue/gnuef/src/GFObjects/GFEntry.py:1.6 
gnue/gnuef/src/GFObjects/GFEntry.py:1.7
--- gnue/gnuef/src/GFObjects/GFEntry.py:1.6     Wed Jul 18 15:45:01 2001
+++ gnue/gnuef/src/GFObjects/GFEntry.py Tue Jul 31 16:22:30 2001
@@ -53,15 +53,18 @@
     self._uppercase = 0
     self._lowercase = 0
     self._numeric = 0
+    self._rows = 1
     self.typecast="text"
     self.case="mixed"
 
 
   def buildObject(self): 
+
     # Convert deprecated attributes
     if hasattr(self,'numeric') and self.numeric: 
       del self.numeric
       self.typecast = 'number'
+
     if hasattr(self,'uppercase') and self.uppercase: 
       del self.uppercase
       self.case = 'upper' 
@@ -69,6 +72,11 @@
       del self.lowercase
       self.case = 'lower' 
 
+    if not hasattr(self, 'rows') and hasattr(self,'visibleCount'): 
+      self.rows = self.visibleCount
+      del self.visibleCount
+
+
 
   def initialize(self):
 
@@ -91,12 +99,11 @@
       datasourceName,self.fieldName = string.split(self.foreign_key,'.')
       self.datasource = self._block._form._datasourceDictionary[datasourceName]
 
-    #if not hasattr(self,'visibleCount'):
     if not hasattr(self,'rows'):
       if hasattr(self._block,'rows'):
-        self.visibleCount = self._block.rows
+        self._rows = self._block.rows
     else:
-      self.visibleCount = self.rows
+      self._rows = self.rows
       
     if not hasattr(self,'rowSpacer'):
       if hasattr(self._block,'rowSpacer'):
Index: gnue/gnuef/src/GFObjects/GFLabel.py
diff -u gnue/gnuef/src/GFObjects/GFLabel.py:1.3 
gnue/gnuef/src/GFObjects/GFLabel.py:1.4
--- gnue/gnuef/src/GFObjects/GFLabel.py:1.3     Wed Jul 18 15:45:01 2001
+++ gnue/gnuef/src/GFObjects/GFLabel.py Tue Jul 31 16:22:30 2001
@@ -43,25 +43,33 @@
     self._type = "GFLabel"
     self.alignment = "left"
     self.height = float(GConfig.get('widgetHeight'))
+    self._rows = 1
 
+  def buildObject(self): 
+    if not hasattr(self, 'rows') and hasattr(self,'visibleCount'): 
+      self.rows = self.visibleCount
+      del self.visibleCount
+
   def setValue(self, value):
     if not self._value:
       GFValue.setValue(self,value)
 
   def initialize(self):
     self._block = self.findParentOfType('GFBlock')
-    if not hasattr(self,'visibleCount'):
-      if not hasattr(self,'rows'):
-        if hasattr(self._block,'rows'):
-          self.visibleCount = self._block.rows
+    if not hasattr(self,'rows'):
+      if not hasattr(self,'_rows'):
+        if hasattr(self._block,'_rows'):
+          self._rows = self._block._rows
         else:
-          self.visibleCount = self.rows
+          self._rows = self._rows
 
         if not hasattr(self,'rowSpacer'):
           if hasattr(self._block,'rowSpacer'):
             self.gap = self._block.rowSpacer
           else:
             self.gap = self.rowSpacer
+    else: 
+      self._rows = self.rows
 
 
 
Index: gnue/gnuef/src/GFObjects/GFObj.py
diff -u gnue/gnuef/src/GFObjects/GFObj.py:1.3 
gnue/gnuef/src/GFObjects/GFObj.py:1.4
--- gnue/gnuef/src/GFObjects/GFObj.py:1.3       Wed Jul 18 15:45:01 2001
+++ gnue/gnuef/src/GFObjects/GFObj.py   Tue Jul 31 16:22:30 2001
@@ -72,8 +72,8 @@
       if index < 0 : index = 0
 
       # Don't let index pass the number of widgets on screen
-      if index >= int(self.visibleCount):
-        index = int(self.visibleCount)-1
+      if index >= int(self._rows):
+        index = int(self._rows)-1
 
       # Don't let the index past the number of records in the
       # system
@@ -92,8 +92,8 @@
       # bottom to top then flip to bottom keeping
       # in mind the number of records in memory
       if currentRecord == recordCount:
-        if recordCount > int(self.visibleCount)-1:
-          index = int(self.visibleCount)-1
+        if recordCount > int(self._rows)-1:
+          index = int(self._rows)-1
         else:
           index = recordCount
         
Index: gnue/gnuef/src/GFParser.py
diff -u gnue/gnuef/src/GFParser.py:1.49 gnue/gnuef/src/GFParser.py:1.50
--- gnue/gnuef/src/GFParser.py:1.49     Wed Jul 18 15:45:01 2001
+++ gnue/gnuef/src/GFParser.py  Tue Jul 31 16:22:30 2001
@@ -238,8 +238,7 @@
                'Typecast': GTypecast.whole }, 
             'visibleCount':{
                'Typecast': GTypecast.whole, 
-               'Deprecated': 'Use the block "rows" attribute instead.', 
-               'Default': 1 }, 
+               'Deprecated': 'Use the block "rows" attribute instead.' }, 
             'rows': {
                'Typecast': GTypecast.whole},
             'rowSpacer': {
Index: gnue/gnuef/src/UIbase.py
diff -u gnue/gnuef/src/UIbase.py:1.41 gnue/gnuef/src/UIbase.py:1.42
--- gnue/gnuef/src/UIbase.py:1.41       Sat Jul 21 16:33:49 2001
+++ gnue/gnuef/src/UIbase.py    Tue Jul 31 16:22:30 2001
@@ -321,7 +321,7 @@
     # you do not want to just add 1 to count
     # as the formulas would then be off
     count = index
-    while count < int(event.data.rows):
+    while count < int(event.data._rows):
       if count != index:
         if currentRecord+(count-index) > block._recordCount:
           if style == 'checkbox':
@@ -352,11 +352,10 @@
 class UIWidget:
   def __init__(self, object, container, textWidth, textHeight, widgetWidth, 
widgetHeight, interface, initialize=1):
     self.widgets = []
-
-    if not hasattr(object,'rows'):
-      object.rows = 1
+    if not hasattr(object,'_rows'):
+      object._rows = 1
     else:
-      object.rows = int(object.rows)
+      object._rows = int(object._rows)
 
     if hasattr(object,'gap'):
       object.gap = int(object.gap)
@@ -371,7 +370,7 @@
       self.itemHeight = -1
       
     if not object.hidden:
-      for spacer in range(int(object.rows)):
+      for spacer in range(int(object._rows)):
         newWidget = self.createWidget(object, container, textWidth, 
textHeight, widgetWidth, widgetHeight, interface, spacer, initialize)
         self.widgets.append(newWidget)
         
Index: gnue/gnuef/src/UIcurses.py
diff -u gnue/gnuef/src/UIcurses.py:1.9 gnue/gnuef/src/UIcurses.py:1.10
--- gnue/gnuef/src/UIcurses.py:1.9      Sun Jun 10 22:16:27 2001
+++ gnue/gnuef/src/UIcurses.py  Tue Jul 31 16:22:30 2001
@@ -179,10 +179,10 @@
     widget = []
     if not hasattr(object,'hidden'):
       
-      if not hasattr(object,'visibleCount'):
-        object.visibleCount = 1
+      if not hasattr(object,'_rows'):
+        object._rows = 1
       
-      count = int(object.visibleCount)
+      count = int(object._rows)
 
       if hasattr(object,'style'):
         style = object.style
@@ -266,8 +266,8 @@
       if index < 0 : index = 0
 
       # Don't let index pass the number of widgets on screen
-      if index >= int(entry.visibleCount):
-        index = int(entry.visibleCount)-1
+      if index >= int(entry._rows):
+        index = int(entry._rows)-1
 
       # Don't let the index past the number of records in the
       # system
@@ -286,8 +286,8 @@
       # bottom to top then flip to bottom keeping
       # in mind the number of records in memory
       if currentRecord == block._recordCount:
-        if block._recordCount > int(entry.visibleCount)-1:
-          index = int(entry.visibleCount)-1
+        if block._recordCount > int(entry._rows)-1:
+          index = int(entry._rows)-1
         else:
           index = block._recordCount
 
@@ -348,7 +348,7 @@
     # you do not want to just add 1 to count
     # as the formulas would then be off                
     count = index
-    while count < int(event.data.visibleCount):
+    while count < int(event.data._rows):
       if count != index:
         if currentRecord+(count-index) > block._recordCount:
           value = ""
Index: gnue/gnuef/src/UIpyncurses.py
diff -u gnue/gnuef/src/UIpyncurses.py:1.19 gnue/gnuef/src/UIpyncurses.py:1.20
--- gnue/gnuef/src/UIpyncurses.py:1.19  Sun Jun 10 22:16:27 2001
+++ gnue/gnuef/src/UIpyncurses.py       Tue Jul 31 16:22:30 2001
@@ -240,10 +240,10 @@
   def entryHandler(self):
     object    = self._currentObject[0]
     widget = []
-    if not hasattr(object,'visibleCount'):
-      object.visibleCount = 1
+    if not hasattr(object,'_rows'):
+      object._rows = 1
       
-    count = int(object.visibleCount)
+    count = int(object._rows)
 
     if hasattr(object,'style'):
       style = object.style
@@ -302,8 +302,8 @@
       if index < 0 : index = 0
 
       # Don't let index pass the number of widgets on screen
-      if index >= int(entry.visibleCount):
-        index = int(entry.visibleCount)-1
+      if index >= int(entry._rows):
+        index = int(entry._rows)-1
 
       # Don't let the index past the number of records in the
       # system
@@ -322,8 +322,8 @@
       # bottom to top then flip to bottom keeping
       # in mind the number of records in memory
       if currentRecord == block._recordCount:
-        if block._recordCount > int(entry.visibleCount)-1:
-          index = int(entry.visibleCount)-1
+        if block._recordCount > int(entry._rows)-1:
+          index = int(entry._rows)-1
         else:
           index = block._recordCount
 
@@ -371,7 +371,7 @@
     self.panel.draw()
 
     count = index
-    while count < int(event.data.visibleCount):
+    while count < int(event.data._rows):
       if count != index:
         if currentRecord+(count-index) > block._recordCount:
           value = ""