gnue/gnuef samples/tests/placement.gfd samples/...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 00/12/09 13:59:16

Modified files:
        gnuef/samples/tests: placement.gfd 
        gnuef/samples/zipcode: zipcode.gfd 
        gnuef/src      : GFObjects.py GFOptions.py UIpyncurses.py 
                         UIwxpython.py 

Log message:
        Altered char based placement removing scaling (it's messed up)
        Switched the forms height/widget from pixel to char based
        Added support for a default entry height set via GFOptions.py
        UIpyncurses.py version check modified to work on python 1.5.2

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/samples/tests/placement.gfd.diff?r1=1.1&r2=1.2
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/samples/zipcode/zipcode.gfd.diff?r1=1.3&r2=1.4
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFObjects.py.diff?r1=1.43&r2=1.44
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFOptions.py.diff?r1=1.2&r2=1.3
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIpyncurses.py.diff?r1=1.4&r2=1.5
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIwxpython.py.diff?r1=1.38&r2=1.39

Patches:
Index: gnue/gnuef/samples/tests/placement.gfd
diff -u gnue/gnuef/samples/tests/placement.gfd:1.1 
gnue/gnuef/samples/tests/placement.gfd:1.2
--- gnue/gnuef/samples/tests/placement.gfd:1.1  Fri Dec  8 17:02:49 2000
+++ gnue/gnuef/samples/tests/placement.gfd      Sat Dec  9 13:59:16 2000
@@ -3,8 +3,8 @@
 
 <options>
   <version>0.0.2</version>
-  <height>400</height>
-  <width>400</width>
+  <height>12</height>
+  <width>13</width>
 </options>
  
   <page>
Index: gnue/gnuef/samples/zipcode/zipcode.gfd
diff -u gnue/gnuef/samples/zipcode/zipcode.gfd:1.3 
gnue/gnuef/samples/zipcode/zipcode.gfd:1.4
--- gnue/gnuef/samples/zipcode/zipcode.gfd:1.3  Fri Dec  8 13:49:58 2000
+++ gnue/gnuef/samples/zipcode/zipcode.gfd      Sat Dec  9 13:59:16 2000
@@ -4,8 +4,8 @@
   <options>
     <title>ZIP Code Maintenance</title>
     <version>0.0.1</version>
-    <height>480</height>
-    <width>575</width>
+    <height>16</height>
+    <width>40</width>
   </options>
 
   <database name="gnue" provider="postgresql" dbname="gnue" host="gnue"/>
@@ -15,21 +15,21 @@
   <page>
     <block name="zip" datasource="zips">
       <label text="City" x="1" y="1"/>
-      <entry name="city" field="city" x="1" y="2" width="15" height="1" 
visibleCount="15" uppercase="">
+      <entry name="city" field="city" x="1" y="2" width="15" visibleCount="15" 
uppercase="">
        <options>
          <tip>Full name of city</tip>
        </options>
       </entry>
 
       <label text="State" x="17" y="1"/>
-      <entry name="state" field="state_code" x="17" y="2" width="15" 
height="1" visibleCount="15" uppercase="" foreign_key="validator.state" 
foreign_key_description="description" style="dropdown">
+      <entry name="state" field="state_code" x="17" y="2" width="15" 
visibleCount="15" uppercase="" foreign_key="validator.state" 
foreign_key_description="description" style="dropdown">
        <options>
          <tip>State</tip>
        </options>
       </entry>
 
-      <label text="Zip" x="35" y="1"/>
-      <entry name="zip" field="zip" x="35" y="2" width="5" height="1" 
visibleCount="15" numeric="" max_length="5" defaultValue="98765">
+      <label text="Zip" x="34" y="1"/>
+      <entry name="zip" field="zip" x="34" y="2" width="5" visibleCount="15" 
numeric="" max_length="5">
        <options>
          <tip>US Postal Zip Code</tip>
        </options>
@@ -39,4 +39,9 @@
   </page>
 
 </form>
+
+
+
+
+
 
Index: gnue/gnuef/src/GFObjects.py
diff -u gnue/gnuef/src/GFObjects.py:1.43 gnue/gnuef/src/GFObjects.py:1.44
--- gnue/gnuef/src/GFObjects.py:1.43    Tue Dec  5 20:42:58 2000
+++ gnue/gnuef/src/GFObjects.py Sat Dec  9 13:59:16 2000
@@ -333,6 +333,8 @@
     self.value=""
     self.cursorPosition = len(self.value)
 
+    self.height = GFOptions.widgetHeight
+
     # Event processing
     self.incommingEvent = {'switchRECORD': self.switchRecord
                            }
Index: gnue/gnuef/src/GFOptions.py
diff -u gnue/gnuef/src/GFOptions.py:1.2 gnue/gnuef/src/GFOptions.py:1.3
--- gnue/gnuef/src/GFOptions.py:1.2     Tue Nov 14 20:04:39 2000
+++ gnue/gnuef/src/GFOptions.py Sat Dec  9 13:59:16 2000
@@ -1,3 +1,6 @@
 DEBUG = 0
 
 _msgNOTSAVED = "Data not saved. Commit or rollback changes."
+
+widgetHeight=1 # The default height of widgets for widgets that don't specify 
height in .gfd file
+
Index: gnue/gnuef/src/UIpyncurses.py
diff -u gnue/gnuef/src/UIpyncurses.py:1.4 gnue/gnuef/src/UIpyncurses.py:1.5
--- gnue/gnuef/src/UIpyncurses.py:1.4   Sat Dec  9 04:55:27 2000
+++ gnue/gnuef/src/UIpyncurses.py       Sat Dec  9 13:59:16 2000
@@ -51,7 +51,7 @@
     #
     # Ensure program exits cleanly(only supported in Python2.0 and above)
     #
-    if sys.version_info[0]>=2:
+    if int(sys.version[0])>=2:
       import atexit
       def cleanup(self=self):
         if self.exitclean==FALSE:
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.38 gnue/gnuef/src/UIwxpython.py:1.39
--- gnue/gnuef/src/UIwxpython.py:1.38   Fri Dec  8 17:02:49 2000
+++ gnue/gnuef/src/UIwxpython.py        Sat Dec  9 13:59:16 2000
@@ -414,14 +414,21 @@
     self.charHeight = self.frame.GetCharHeight()
 
     
-    self.borderPercentage = (20.0 / 100.0)+1
-    self.textPercentage = (7.5 / 100.0)+1
+#    self.borderPercentage = (20.0 / 100.0)+1
+#    self.textPercentage = (7.5 / 100.0)+1
+    self.borderPercentage = 1
+    self.textPercentage = 1
 
     self.widgetWidth = self.charWidth * self.borderPercentage
     self.widgetHeight = self.charHeight * self.borderPercentage
     self.textWidth = self.charWidth * self.textPercentage
     self.textHeight = self.charHeight * self.textPercentage
-    
+
+    menu_sb_space=3 # the extra spaces needed by the menu and statusbar
+
+    self.frame.SetSize(wxSize(int(self.form.width)*int(self.widgetWidth),
+                              
int(int(self.form.height)+menu_sb_space)*int(self.widgetHeight)))
+
     
     self.statusBar = self.frame.CreateStatusBar()
     self.statusBar.SetFieldsCount(4)