gnue/gnuef/src GFOptions.py UIwxpython.py

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 00/12/14 11:18:52

Modified files:
        gnuef/src      : GFOptions.py UIwxpython.py 

Log message:
        More placement edits

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFOptions.py.diff?r1=1.9&r2=1.10
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIwxpython.py.diff?r1=1.45&r2=1.46

Patches:
Index: gnue/gnuef/src/GFOptions.py
diff -u gnue/gnuef/src/GFOptions.py:1.9 gnue/gnuef/src/GFOptions.py:1.10
--- gnue/gnuef/src/GFOptions.py:1.9     Thu Dec 14 08:50:00 2000
+++ gnue/gnuef/src/GFOptions.py Thu Dec 14 11:18:52 2000
@@ -15,7 +15,7 @@
 _msgNOTSAVED = "Data not saved. Commit or rollback changes."
 
 
-pointSize = 8
+pointSize = 14
 borderPercentage = 100
 textPercentage = 100
 
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.45 gnue/gnuef/src/UIwxpython.py:1.46
--- gnue/gnuef/src/UIwxpython.py:1.45   Thu Dec 14 08:50:00 2000
+++ gnue/gnuef/src/UIwxpython.py        Thu Dec 14 11:18:52 2000
@@ -400,6 +400,7 @@
       for spacer in range(count):
         spacer = int(spacer)
         newWidget = eval(self.widgetConstructor[object.getObjectType()])
+       
newWidget.SetFont(wxFont(GFOptions.pointSize,wxMODERN,wxNORMAL,wxNORMAL))
 
         widget.append(newWidget)
         EVT_CHAR(newWidget, self.uiEventTrap)
@@ -415,6 +416,7 @@
     widget.Show(FALSE)
     
     EVT_CHAR(widget, self.uiEventTrap)
+    widget.SetFont(wxFont(GFOptions.pointSize,wxMODERN,wxNORMAL,wxNORMAL))
     self.pageList.append(widget)
     return widget
 
@@ -424,15 +426,19 @@
 
 
     # Got to be a bettwe way
+    self.frame.SetFont(wxFont(GFOptions.pointSize,wxMODERN,wxNORMAL,wxNORMAL))
     maxWidth, maxHeight, maxDescent, maxLeading = [0,0,0,0]
     for letter in "WOyg-\|":
+      descent,leading= [0,0] # temp hack
+      tempWidget = wxTextCtrl(self.frame, -1, letter)
+#      width,height,descent,leading = tempWidget.GetFullTextExtent(letter)
+
       width,height,descent,leading = self.frame.GetFullTextExtent(letter)
       maxWidth = maxWidth > width and maxWidth or width
       maxHeight = maxHeight > height and maxHeight or height
       maxDescent = maxDescent > descent and maxDescent or descent
       maxLeading = maxLeading > leading and maxLeading or leading
-     
-    self.frame.SetFont(wxFont(GFOptions.pointSize,wxMODERN,wxNORMAL,wxNORMAL))
+      print       maxWidth,maxHeight,maxDescent,maxLeading 
 
     self.charWidth = maxWidth+maxLeading
     self.charHeight = maxHeight+maxDescent
@@ -448,8 +454,8 @@
     self.borderPercentage = (GFOptions.borderPercentage / 100.0)
     self.textPercentage = (GFOptions.textPercentage / 100.0)
 
-    self.widgetWidth = self.charWidth * self.borderPercentage
-    self.widgetHeight = self.charHeight * self.borderPercentage
+    self.widgetWidth = (self.charWidth * self.borderPercentage)
+    self.widgetHeight = (self.charHeight * self.borderPercentage) + 3
     self.textWidth = self.charWidth * self.textPercentage
     self.textHeight = self.charHeight * self.textPercentage
 
@@ -592,6 +598,7 @@
                                         
int(object.height)*int(self.textHeight)),
                                  choices, wxCB_READONLY)
           newWidget.SetValue("")
+
           EVT_CHAR(newWidget, self.uiEventTrap)
           EVT_COMBOBOX(newWidget, newWidget.GetId(), self.uiEventTrap)         
         else:
@@ -605,6 +612,7 @@
           EVT_CHAR(newWidget, self.uiEventTrap)
           EVT_MOUSE_EVENTS(newWidget, self.uiEventTrap)
       
+        
newWidget.SetFont(wxFont(GFOptions.pointSize-1,wxMODERN,wxNORMAL,wxNORMAL))
         widget.append(newWidget)
 
     return widget