gnue/designer src/forms/wizards/AddBlock.py tem...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Branch:         designer-0-4-1-branch
Changes by:     James Thompson <address@hidden> 02/11/25 21:14:33

Modified files:
        designer/src/forms/wizards: AddBlock.py 
        designer/templates/forms: FormBuilder.py 

Log message:
        removed unneeded print statements from wizards

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/wizards/AddBlock.py.diff?only_with_tag=designer-0-4-1-branch&tr1=1.4&tr2=1.4.2.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/templates/forms/FormBuilder.py.diff?only_with_tag=designer-0-4-1-branch&tr1=1.9&tr2=1.9.2.1&r1=text&r2=text

Patches:
Index: gnue/designer/src/forms/wizards/AddBlock.py
diff -c gnue/designer/src/forms/wizards/AddBlock.py:1.3 
gnue/designer/src/forms/wizards/AddBlock.py:1.4
*** gnue/designer/src/forms/wizards/AddBlock.py:1.3     Thu Nov 14 20:01:25 2002
--- gnue/designer/src/forms/wizards/AddBlock.py Thu Nov 14 20:27:57 2002
***************
*** 36,42 ****
  
  class AddBlockWizard(FormTemplate):
  
! 
  
    ###############
    #
--- 36,46 ----
  
  class AddBlockWizard(FormTemplate):
  
!   # The first step in our wizard.
!   # The template parser will initially
!   # call GetStep(FIRST_STEP).
!   FIRST_STEP = '0'
!   
  
    ###############
    #
***************
*** 46,62 ****
      self.form = root
      self.current = current
  
! 
    ###############
    #
    # We have all the data, so generate our widget.
    #
    def Finalize(self):
  
! 
!     # Find or create parent block...
!     page = self.current.findParentOfType('GFPage')
!     block = self.AddElement('block', page)
  
      return 1
  
--- 50,84 ----
      self.form = root
      self.current = current
  
!   ###############
!   #
!   # Return the markup for a specific page
!   #
!   def GetStep(self, step):
!     print step
!     #
!     # Step #0 / Get Name
!     #
!     if step == '0':
!         
!       content = [WizardText('This will insert a new block.'),
!                  WizardInput('name',label='Object Name:',required=1,size=20)]
!         
!       return   { 'title': 'Add Block',
!                  'content': content,
!                  'prev': None,
!                  'next': None }
!                                         
    ###############
    #
    # We have all the data, so generate our widget.
    #
    def Finalize(self):
  
!     attrs = {'name': self.variables['name'] or 'Block_1'}
!     # Find form...
!     form = self.current.findParentOfType('GFForm')
!     block = self.AddElement('block', form,attrs)
  
      return 1
  
***************
*** 73,79 ****
      'Description' : 'Inserts a Block',
      'Version' : VERSION,
      'Author' : 'The GNUe Designer Team',
!     'Behavior': TEMPLATE,
      'Location' : 'Edit|Insert|Block'
  }
  
--- 95,101 ----
      'Description' : 'Inserts a Block',
      'Version' : VERSION,
      'Author' : 'The GNUe Designer Team',
!     'Behavior': WIZARD,
      'Location' : 'Edit|Insert|Block'
  }
  
Index: gnue/designer/templates/forms/FormBuilder.py
diff -c gnue/designer/templates/forms/FormBuilder.py:1.8 
gnue/designer/templates/forms/FormBuilder.py:1.9
*** gnue/designer/templates/forms/FormBuilder.py:1.8    Wed Aug 21 18:55:16 2002
--- gnue/designer/templates/forms/FormBuilder.py        Thu Nov  7 23:32:05 2002
***************
*** 62,68 ****
    #
    def Start(self, form, current):
      self.form = form
! 
      # The first table can never have a master
      self.variables['hasmaster0'] = '0'
      self.variables['newPage0'] = '0'
--- 62,68 ----
    #
    def Start(self, form, current):
      self.form = form
!     print current
      # The first table can never have a master
      self.variables['hasmaster0'] = '0'
      self.variables['newPage0'] = '0'
***************
*** 312,318 ****
                                           required=1,set=(('1','Yes'),
                                                           ('0','No')
                                                           )),
!                              WizardInput('newPage%s' % (iteration+1),
                                           label='If yes, put this table on a 
new page?',
                                           required=1,set=(('0','No'),
                                                           ('1','Yes')
--- 312,319 ----
                                           required=1,set=(('1','Yes'),
                                                           ('0','No')
                                                           )),
! #                             WizardInput('newPage%s' % (iteration+1),
!                              WizardInput('newPage',
                                           label='If yes, put this table on a 
new page?',
                                           required=1,set=(('0','No'),
                                                           ('1','Yes')
***************
*** 352,358 ****
    def Finalize(self):
      # Create a single page on which to place blocks and labels
      pageCounter = 1
!     page = self.current.findParentOfType('GFPage')
      if not page:
        page = self.AddElement('page', self.form,
         {  'name': 'pg%s' % pageCounter })
--- 353,364 ----
    def Finalize(self):
      # Create a single page on which to place blocks and labels
      pageCounter = 1
!     page = None
!     for child in self.form._children:
!       if child._type == 'GFPage':
!         page = child
!         break
!                             
      if not page:
        page = self.AddElement('page', self.form,
         {  'name': 'pg%s' % pageCounter })