gnue/designer/templates/forms FormBuilder.py

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/04/01 21:31:54

Modified files:
        designer/templates/forms: FormBuilder.py 

Log message:
        Added page support to the multi-table wizard

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/templates/forms/FormBuilder.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnue/designer/templates/forms/FormBuilder.py
diff -c gnue/designer/templates/forms/FormBuilder.py:1.3 
gnue/designer/templates/forms/FormBuilder.py:1.4
*** gnue/designer/templates/forms/FormBuilder.py:1.3    Thu Feb 28 22:13:51 2002
--- gnue/designer/templates/forms/FormBuilder.py        Mon Apr  1 21:31:54 2002
***************
*** 62,70 ****
--- 62,72 ----
    #
    def Start(self, form):
      self.form = form
+     self.form.height = 0
  
      # The first table can never have a master
      self.variables['hasmaster0'] = '0'
+     self.variables['newPage0'] = '0'
  
  
    ###############
***************
*** 82,87 ****
--- 84,90 ----
      # Add another? loop logic
      if step == '1or8':
  
+       self.variables['newPage%s' % iteration] = self.variables['newPage']
        # If continue is set to 1, then go to step 1; otherwise, step 8
        if self.variables['continue'] == '1':
  
***************
*** 91,96 ****
--- 94,100 ----
          if self.variables['singleconnection'] == '1':
            self.variables['connection%s' % iteration] = 
self.variables['connection0']
            step = '2'
+             
  
        else:
          # We are done... record the total number of children
***************
*** 308,313 ****
--- 312,321 ----
                   'content': (WizardInput('continue', label='Add Another 
Table?',
                                           required=1,set=(('1','Yes'),
                                                           ('0','No')
+                                                          )),
+                              WizardInput('newPage', label='If yes, put this 
table on a new page?',
+                                          required=1,set=(('0','No'),
+                                                          ('1','Yes')
                                                           )),),
                   'prev': '%s:%s' % (prev,iteration),
                   'next': '1or8:%s' % (iteration+1) }
***************
*** 348,355 ****
      self.form.title = self.variables['title']
  
      # Create a single page on which to place blocks and labels
      page = self.AddElement('page', self.form,
!        {  'name': 'pg%s' % '1' })
  
      #
      # Add datasources
--- 356,364 ----
      self.form.title = self.variables['title']
  
      # Create a single page on which to place blocks and labels
+     pageCounter = 1
      page = self.AddElement('page', self.form,
!        {  'name': 'pg%s' % pageCounter })
  
      #
      # Add datasources
***************
*** 357,362 ****
--- 366,377 ----
      basey = 0
      dataSourceArray = []
      for count in range(self.variables['iterations']):
+       if self.variables['newPage%s' % count] == '1':
+         pageCounter += 1
+         page = self.AddElement('page', self.form,
+                                {  'name': 'pg%s' % pageCounter })
+         basey=0
+             
        tableKey = string.upper(self.variables['table%s' % count])
        datasource = self.AddElement('datasource', self.form,
                                     {  'database': 
self.variables['connection%s' % count],
***************
*** 506,512 ****
                                   or largestLabel)
  
          # Rearrange
!         self.form.height = fy+2-fdy
          for i in range(len(entryQueue)):
            entryQueue[i].x = fx
            entryQueue[i].y = fy
--- 521,529 ----
                                   or largestLabel)
  
          # Rearrange
!         if self.form.height < fy+2-fdy:
!           self.form.height = fy+2-fdy
!           
          for i in range(len(entryQueue)):
            entryQueue[i].x = fx
            entryQueue[i].y = fy
***************
*** 516,522 ****
            lx = lx + ldx
            fy = fy + fdy
            fx = fx + fdx
!           self.form.height = self.form.height + fdy
            
        basey = self.form.height - 1
  
--- 533,541 ----
            lx = lx + ldx
            fy = fy + fdy
            fx = fx + fdx
!           
!           if self.form.height < self.form.height + fdy:
!             self.form.height += fdy
            
        basey = self.form.height - 1