gnue/designer/templates/forms Simple.py SimpleD...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/09/28 10:48:03

Modified files:
        designer/templates/forms: Simple.py SimpleDetail.py 

Log message:
        updated designer's simple wizards to reflect new wizard architecture

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/templates/forms/Simple.py.diff?cvsroot=OldCVS&tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/templates/forms/SimpleDetail.py.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnue/designer/templates/forms/Simple.py
diff -c gnue/designer/templates/forms/Simple.py:1.11 
gnue/designer/templates/forms/Simple.py:1.12
*** gnue/designer/templates/forms/Simple.py:1.11        Fri Aug 16 00:51:28 2002
--- gnue/designer/templates/forms/Simple.py     Sat Sep 28 10:48:03 2002
***************
*** 178,186 ****
            'type': 'object',
            'name': 'dts%s' %  tableKey })
  
!     # Create a single page on which to place blocks and labels
!     page = self.AddElement('page', self.form,
!        {  'name': 'pg%s' % tableKey })
  
  
      # We will need a block to hold our entries...
--- 178,193 ----
            'type': 'object',
            'name': 'dts%s' %  tableKey })
  
!     page = None
!     for child in self.form._children:
!       if child._type == 'GFPage':
!         page = child
!         break
! 
!     if not page:
!       # Create a single page on which to place blocks and labels
!       page = self.AddElement('page', self.form,
!          {  'name': 'pg%s' % tableKey })
  
  
      # We will need a block to hold our entries...
***************
*** 251,257 ****
        attrs={'x':1, 'y': 1,
               'name': "inp%s" % fieldKey,
               'field': field.name,
!              'typecast': field.datatype, 
               'width': 10}
  
        # If we have a length for the field, use this as the max_length
--- 258,264 ----
        attrs={'x':1, 'y': 1,
               'name': "inp%s" % fieldKey,
               'field': field.name,
!              'typecast': field.datatype,
               'width': 10}
  
        # If we have a length for the field, use this as the max_length
***************
*** 282,296 ****
        x = 1
  
        for i in range(len(entryQueue)):
!         labelQueue[i].x = x
!         labelQueue[i].y = 1
!         entryQueue[i].x = x
!         entryQueue[i].y = 2
  
          # If label width is larger than entry width, center the entry
          if entryQueue[i].width < labelQueue[i].width:
!           entryQueue[i].x = entryQueue[i].x + \
!               int((labelQueue[i].width - entryQueue[i].width)/2)
  
  
          # Calculate the starting x for the next label/entry
--- 289,301 ----
        x = 1
  
        for i in range(len(entryQueue)):
!         self.ModifyElement(labelQueue[i],x=x,y=1)
!         self.ModifyElement(entryQueue[i],x=x,y=2)
  
          # If label width is larger than entry width, center the entry
          if entryQueue[i].width < labelQueue[i].width:
!           self.ModifyElement(entryQueue[i],x=entryQueue[i].x + \
!               int((labelQueue[i].width - entryQueue[i].width)/2))
  
  
          # Calculate the starting x for the next label/entry
***************
*** 326,340 ****
        # Rearrange
        height = fy+2-fdy
        for i in range(len(entryQueue)):
!         entryQueue[i].x = fx
!         entryQueue[i].y = fy
!         labelQueue[i].x = lx
!         labelQueue[i].y = ly
          ly = ly + ldy
          lx = lx + ldx
          fy = fy + fdy
          fx = fx + fdx
!         height = self.form.height + fdy
  
      self.ModifyElement(self.form, width=width, height=height)
  
--- 331,343 ----
        # Rearrange
        height = fy+2-fdy
        for i in range(len(entryQueue)):
!         self.ModifyElement(labelQueue[i],x=lx,y=ly)
!         self.ModifyElement(entryQueue[i],x=fx,y=fy)
          ly = ly + ldy
          lx = lx + ldx
          fy = fy + fdy
          fx = fx + fdx
!         height += fdy
  
      self.ModifyElement(self.form, width=width, height=height)
  
Index: gnue/designer/templates/forms/SimpleDetail.py
diff -c gnue/designer/templates/forms/SimpleDetail.py:1.6 
gnue/designer/templates/forms/SimpleDetail.py:1.7
*** gnue/designer/templates/forms/SimpleDetail.py:1.6   Fri Aug 16 00:51:28 2002
--- gnue/designer/templates/forms/SimpleDetail.py       Sat Sep 28 10:48:03 2002
***************
*** 359,373 ****
        x = 1
  
        for i in range(len(entryQueue)):
!         labelQueue[i].x = x
!         labelQueue[i].y = 1
!         entryQueue[i].x = x
!         entryQueue[i].y = 2
  
          # If label width is larger than entry width, center the entry
          if entryQueue[i].width < labelQueue[i].width:
!           entryQueue[i].x = entryQueue[i].x + \
!               int((labelQueue[i].width - entryQueue[i].width)/2)
  
  
          # Calculate the starting x for the next label/entry
--- 359,371 ----
        x = 1
  
        for i in range(len(entryQueue)):
!         self.ModifyElement(labelQueue[i],x=x,y=1)
!         self.ModifyElement(entryQueue[i],x=x,y=2)
  
          # If label width is larger than entry width, center the entry
          if entryQueue[i].width < labelQueue[i].width:
!           self.ModifyElement(entryQueue[i],x=entryQueue[i].x + \
!               int((labelQueue[i].width - entryQueue[i].width)/2))
  
  
          # Calculate the starting x for the next label/entry
***************
*** 403,412 ****
        # Rearrange
        height = fy+2-fdy
        for i in range(len(entryQueue)):
!         entryQueue[i].x = fx
!         entryQueue[i].y = fy
!         labelQueue[i].x = lx
!         labelQueue[i].y = ly
          ly = ly + ldy
          lx = lx + ldx
          fy = fy + fdy
--- 401,408 ----
        # Rearrange
        height = fy+2-fdy
        for i in range(len(entryQueue)):
!         self.ModifyElement(labelQueue[i],x=lx,y=ly)
!         self.ModifyElement(entryQueue[i],x=fx,y=fy)
          ly = ly + ldy
          lx = lx + ldx
          fy = fy + fdy