gnue/designer/src TemplateParser.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/11/04 12:06:14

Modified files:
        designer/src   : TemplateParser.py 

Log message:
        Made the wizard entry fields larger

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/TemplateParser.py.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnue/designer/src/TemplateParser.py
diff -u gnue/designer/src/TemplateParser.py:1.6 
gnue/designer/src/TemplateParser.py:1.7
--- gnue/designer/src/TemplateParser.py:1.6     Sun Sep 16 19:43:53 2001
+++ gnue/designer/src/TemplateParser.py Sun Nov  4 12:06:14 2001
@@ -132,17 +132,17 @@
   def GetPrev(self, parent):
     if self.prevStep != None:
       return self
-    else: 
+    else:
       return None
 
-  def GetNext(self, parent): 
-    if self.nextStep != None: 
+  def GetNext(self, parent):
+    if self.nextStep != None:
       self.setStep(self.stepInfo['next'])
       return self
-    else: 
+    else:
       return None
 
-  def setStep(self, step): 
+  def setStep(self, step):
     self.step = step
     self.stepInfo = self.parser.template.GetStep(step)
     self.nextStep = self.stepInfo['next']
@@ -179,7 +179,7 @@
   def OnCancel(self, event):
     self.parser.wizard.EndModal(0)
 
-  def buildPage(self): 
+  def buildPage(self):
     for child in self.GetChildren():
       child.Destroy()
 
@@ -191,12 +191,12 @@
     ySpacing = 6
     nextY = yMargin
 
-    if self.nextStep == None: 
+    if self.nextStep == None:
       self.parser.nextButton.SetLabel('Finished')
-    else: 
+    else:
       self.parser.nextButton.SetLabel('Continue >')
 
-    if self.prevStep == None: 
+    if self.prevStep == None:
       self.parser.prevButton.Enable(0)
     else:
       self.parser.prevButton.Enable(1)
@@ -205,78 +205,80 @@
     self.parser.title2.SetLabel(self.stepInfo['title'])
 
     xMargin = xMargin
-    nextY = yMargin   
+    nextY = yMargin
 
     self.editorMappings = {}
 
-    for object in self.stepInfo['content']: 
+    for object in self.stepInfo['content']:
 
-      if isinstance(object, TemplateBase.WizardText): 
+      if isinstance(object, TemplateBase.WizardText):
 
-        # TODO: WizardText should automagically be wrapped. 
-        # TODO: Currently, we must embed \n in the text to 
-        # TODO: perform our own wrapping. Of course, this is 
+        # TODO: WizardText should automagically be wrapped.
+        # TODO: Currently, we must embed \n in the text to
+        # TODO: perform our own wrapping. Of course, this is
         # TODO: not at all portable!
 
         o = wxStaticText(self, -1, object.text, pos=wxPoint(xMargin, nextY))
         nextY = nextY + ySpacing + o.GetSize().y
 
+      elif isinstance(object, TemplateBase.WizardInput):
 
-      elif isinstance(object, TemplateBase.WizardInput): 
-        
         x = xMarginInput
-        if object.label != None: 
+        if object.label != None:
           o = wxStaticText(self, -1, object.label, pos=wxPoint(x, nextY+3))
           x = x + xSpacing + o.GetSize().x
+
+        size = (self.GetClientSize().x - x - xMarginInput,-1)
 
-        if object.set != None and len(object.set): 
-          if object.maxSelections != 1 and object.orderable: 
+        if object.set != None and len(object.set):
+          if object.maxSelections != 1 and object.orderable:
             x = xMarginInput
             nextY = nextY + ySpacing + o.GetSize().y
-            o = SortableListField(object, self, pos=wxPoint(x, nextY))
-          elif  object.lines > 1 or object.maxSelections != 1: 
-            o = ListField(object, self, pos=wxPoint(x, nextY))
-          else: 
-            o = ComboField(object, self, pos=wxPoint(x, nextY))
+            size = (self.GetClientSize().x - x - xMarginInput,-1)
+            o = SortableListField(object, self, pos=wxPoint(x, nextY), 
size=size)
+          elif  object.lines > 1 or object.maxSelections != 1:
+            o = ListField(object, self, pos=wxPoint(x, nextY), size=size)
+          else:
+            o = ComboField(object, self, pos=wxPoint(x, nextY), size=size)
         else:
-          o = TextField(object, self, pos=wxPoint(x, nextY))
+          o = TextField(object, self, pos=wxPoint(x, nextY), size=size)
 
 
         self.editorMappings[o] = object
         nextY = nextY + ySpacing + o.GetSize().y
 
-        if self.parser.template.variables.has_key(object.variable): 
+        if self.parser.template.variables.has_key(object.variable):
           o.set(self.parser.template.variables[object.variable])
 
 
-class TextField(wxTextCtrl): 
-  def __init__(self, source, parent, 
+class TextField(wxTextCtrl):
+  def __init__(self, source, parent,
                pos=wxDefaultPosition, size=wxDefaultSize):
     wxTextCtrl.__init__(self, parent, -1, pos=pos, size=size)
     self.source = source
     self.parent = parent
-    
+
     self.forceupper = self.source.forceupper
     self.forcelower = self.source.forcelower
 
-    if self.forceupper: 
+    if self.forceupper:
       EVT_CHAR(wxTextCtrl, self.OnCharUpper)
-    if self.forcelower: 
+    if self.forcelower:
       EVT_CHAR(wxTextCtrl, self.OnCharUpper)
 
 
-  def get(self): 
+  def get(self):
     return self.GetValue()
 
-  def set(self, value): 
+  def set(self, value):
     self.SetValue(value)
 
   # TODO: This EVT_CHAR should convert the text to uppercase
-  def OnCharUpper(self, event): 
+  def OnCharUpper(self, event):
     event.Skip()
 
   # TODO: This EVT_CHAR should convert the text to lowercase
-  def OnCharLower(self, event): 
+  def OnCharLower(self, event):
     event.Skip()