gnue/gnuef samples/po/sc_po_entry.gfd samples/t...

[Derek Neighbors]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Derek Neighbors <address@hidden>        01/07/21 16:33:49

Modified files:
        gnuef/samples/po: sc_po_entry.gfd 
        gnuef/samples/track/forms: contact_manager.gfd 
        gnuef/samples/zipcode: states.gfd 
        gnuef/src      : UIbase.py 

Log message:
        sc_po_entry.gfd
        ** Replaced visibleCount with rows because of visibleCount deprication.
        
        contact_manager.gfd
        ** Replaced visibleCount with rows because of visibleCount deprication.
        
        UIbase.py
        ** Finished implementation of rows to replace visible count
        Seems to work in designer and with and without data...

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/samples/po/sc_po_entry.gfd.diff?cvsroot=OldCVS&tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/samples/track/forms/contact_manager.gfd.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/samples/zipcode/states.gfd.diff?cvsroot=OldCVS&tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIbase.py.diff?cvsroot=OldCVS&tr1=1.40&tr2=1.41&r1=text&r2=text

Patches:
Index: gnue/gnuef/samples/po/sc_po_entry.gfd
diff -u gnue/gnuef/samples/po/sc_po_entry.gfd:1.7 
gnue/gnuef/samples/po/sc_po_entry.gfd:1.8
--- gnue/gnuef/samples/po/sc_po_entry.gfd:1.7   Mon Jun 25 14:42:19 2001
+++ gnue/gnuef/samples/po/sc_po_entry.gfd       Sat Jul 21 16:33:49 2001
@@ -143,15 +143,15 @@
       <label text="Amount" x="69" y="1"/>
 
 
-      <entry name="ntryItemNo" field="item_number" value="" x="1" y="2" 
width="15" visibleCount="15"/>
-      <entry name="ntryDescription" field="desc" value="" x="17" y="2" 
width="35" visibleCount="15"/>
-      <entry name="ntryQuantity" field="qty" value="" x="53" y="2" width="4" 
visibleCount="15">
+      <entry name="ntryItemNo" field="item_number" value="" x="1" y="2" 
width="15" rows="15"/>
+      <entry name="ntryDescription" field="desc" value="" x="17" y="2" 
width="35" rows="15"/>
+      <entry name="ntryQuantity" field="qty" value="" x="53" y="2" width="4" 
rows="15">
         <trigger type="Pre-FocusOut" src="trggrAmount" />
       </entry>
-      <entry name="ntryUnitPrice" field="unit_price" value="" x="58" y="2" 
width="10" visibleCount="15">
+      <entry name="ntryUnitPrice" field="unit_price" value="" x="58" y="2" 
width="10" rows="15">
         <trigger type="Pre-FocusOut" src="trggrAmount" />
       </entry>
-      <entry name="ntryAmount" field="amt" value="" x="69" y="2" width="10" 
visibleCount="15" readonly="true"/>
+      <entry name="ntryAmount" field="amt" value="" x="69" y="2" width="10" 
rows="15" readonly="true"/>
 
 
       <label text="Comments/Shipping Notes" x="1" y="17"/>
Index: gnue/gnuef/samples/track/forms/contact_manager.gfd
diff -u gnue/gnuef/samples/track/forms/contact_manager.gfd:1.4 
gnue/gnuef/samples/track/forms/contact_manager.gfd:1.5
--- gnue/gnuef/samples/track/forms/contact_manager.gfd:1.4      Mon Jun 25 
21:40:12 2001
+++ gnue/gnuef/samples/track/forms/contact_manager.gfd  Sat Jul 21 16:33:49 2001
@@ -29,22 +29,21 @@
 ]]>
 </trigger>
 
-<!--
 
 <trigger type="named" name="phoneNew">
-blckPersonPhone.helper.object.newRecord()
+blckPhone.helper.object.newRecord()
 </trigger>
 
 <trigger type="named" name="phoneDelete">
-blckPersonPhone.helper.object.deleteRecord()
+blckPhone.helper.object.deleteRecord()
 </trigger>
 
 <trigger type="named" name="phonePrev">
-blckPersonPhone.helper.object.prevRecord()
+blckPhone.helper.object.prevRecord()
 </trigger>
 
 <trigger type="named" name="phoneNext">
-blckPersonPhone.helper.object.nextRecord()
+blckPhone.helper.object.nextRecord()
 </trigger>
 
 <trigger type="named" name="recordTrigger">
@@ -52,37 +51,36 @@
 </trigger>
 
 <trigger type="named" name="addrNew">
-blckPersonAddress.helper.object.newRecord()
+blckAddress.helper.object.newRecord()
 </trigger>
 
 <trigger type="named" name="addrDelete">
-blckPersonAddress.helper.object.deleteRecord()
+blckAddress.helper.object.deleteRecord()
 </trigger>
 
 <trigger type="named" name="addrPrev">
-blckPersonAddress.helper.object.prevRecord()
+blckAddress.helper.object.prevRecord()
 </trigger>
 
 <trigger type="named" name="addrNext">
-blckPersonAddress.helper.object.nextRecord()
+blckAddress.helper.object.nextRecord()
 </trigger>
 
 <trigger type="named" name="emailNew">
-blckPersonEmail.helper.object.newRecord()
+blckEmail.helper.object.newRecord()
 </trigger>
 
 <trigger type="named" name="emailDelete">
-blckPersonEmail.helper.object.deleteRecord()
+blckEmail.helper.object.deleteRecord()
 </trigger>
 
 <trigger type="named" name="emailPrev">
-blckPersonEmail.helper.object.prevRecord()
+blckEmail.helper.object.prevRecord()
 </trigger>
 
 <trigger type="named" name="emailNext">
-blckPersonEmail.helper.object.nextRecord()
+blckEmail.helper.object.nextRecord()
 </trigger>
--->
 
   <database name="dtbsGNUe" provider="postgresql" dbname="gnue" host="gnue"/>
   <datasource name="dtsrcPerson" database="dtbsGNUe" table="person" 
order_by="last_name" prequery=""/>
Index: gnue/gnuef/samples/zipcode/states.gfd
diff -u gnue/gnuef/samples/zipcode/states.gfd:1.13 
gnue/gnuef/samples/zipcode/states.gfd:1.14
--- gnue/gnuef/samples/zipcode/states.gfd:1.13  Wed Apr 25 16:24:44 2001
+++ gnue/gnuef/samples/zipcode/states.gfd       Sat Jul 21 16:33:49 2001
@@ -15,22 +15,22 @@
   <page>
     <block name="blkstate" datasource="dsstate">
       <label text="Code" x="2" y="1"/>
-      <entry name="entstate" field="state" x="2" y="2" width="4" height="1" 
visibleCount="5"/>
+      <entry name="entstate" field="state" x="2" y="2" width="4" height="1" 
rows="5"/>
       <label text="Description" x="7" y="1"/>
-      <entry name="entdesc" field="description" x="7" y="2" width="30" 
height="1" visibleCount="5"/>
+      <entry name="entdesc" field="description" x="7" y="2" width="30" 
height="1" rows="5"/>
     </block>
 
 
     <!-- Block of cities -->
     <block name="cities"  datasource="dscities" master="blkstate.state" 
detail="state_code">
       <label text="City" x="2" y="9"/>
-      <entry name="city" field="city" x="2" y="10" width="20" visibleCount="5" 
/>
+      <entry name="city" field="city" x="2" y="10" width="20" rows="5" />
 
       <label text="ST" x="23" y="9"/>
-      <entry name="state" field="state_code" x="23" y="10" width="3" 
visibleCount="5" />
+      <entry name="state" field="state_code" x="23" y="10" width="3" rows="5" 
/>
 
       <label text="Zip" x="27" y="9"/>
-      <entry name="zip" field="zip" x="27" y="10" width="10" visibleCount="5" 
/>
+      <entry name="zip" field="zip" x="27" y="10" width="10" rows="5" />
 
       <box x="1" y="8" width="37" height="8" label="State Cities"/>
 
Index: gnue/gnuef/src/UIbase.py
diff -u gnue/gnuef/src/UIbase.py:1.40 gnue/gnuef/src/UIbase.py:1.41
--- gnue/gnuef/src/UIbase.py:1.40       Wed Jun 20 16:34:50 2001
+++ gnue/gnuef/src/UIbase.py    Sat Jul 21 16:33:49 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.visibleCount):
+    while count < int(event.data.rows):
       if count != index:
         if currentRecord+(count-index) > block._recordCount:
           if style == 'checkbox':
@@ -353,10 +353,10 @@
   def __init__(self, object, container, textWidth, textHeight, widgetWidth, 
widgetHeight, interface, initialize=1):
     self.widgets = []
 
-    if not hasattr(object,'visibleCount'):
-      object.visibleCount = 1
+    if not hasattr(object,'rows'):
+      object.rows = 1
     else:
-      object.visibleCount = int(object.visibleCount)
+      object.rows = int(object.rows)
 
     if hasattr(object,'gap'):
       object.gap = int(object.gap)
@@ -371,7 +371,7 @@
       self.itemHeight = -1
       
     if not object.hidden:
-      for spacer in range(int(object.visibleCount)):
+      for spacer in range(int(object.rows)):
         newWidget = self.createWidget(object, container, textWidth, 
textHeight, widgetWidth, widgetHeight, interface, spacer, initialize)
         self.widgets.append(newWidget)