gnue/forms/src GFForm.py GFInstance.py uidriver...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/12/17 19:36:09

Modified files:
        forms/src      : GFForm.py GFInstance.py 
        forms/src/uidrivers/wx: UIdriver.py 

Log message:
        * Fixed runForm support
        * Removed console print statements

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.218&tr2=1.219&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.77&tr2=1.78&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?tr1=1.223&tr2=1.224&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.218 gnue/forms/src/GFForm.py:1.219
*** gnue/forms/src/GFForm.py:1.218      Wed Dec 11 23:08:09 2002
--- gnue/forms/src/GFForm.py    Tue Dec 17 19:36:09 2002
***************
*** 201,207 ****
    #
    def primaryInit(self):
      # Initialize our events system
!     print "Init ", self
      events.EventAware.__init__(self, self._instance.eventController)
  
      # Find the logic and layout controllers
--- 201,207 ----
    #
    def primaryInit(self):
      # Initialize our events system
! ##    print "Init ", self
      events.EventAware.__init__(self, self._instance.eventController)
  
      # Find the logic and layout controllers
***************
*** 214,219 ****
--- 214,224 ----
      self.initTriggerSystem()
      self._triggerns.update(self._triggerNamespaceTree._globalNamespace)
  
+     ## TODO: This ain't right!  Fix after 0.5.0
+     self._triggerns['runForm'] = self.triggerRunForm
+     ## TODO
+ 
+ 
    #
    # Secondary init (stuff that must happen
    # after all our children have init'ed)
***************
*** 733,744 ****
      self.dispatchEvent('uiUPDATESTATUS',tip=tip)
  
    def triggerRunForm(self,fileName):
!     self._instance.addFormFromFile(fileName)
!     self._instance.activate()
  
    def triggerActivateDialog(self,dialogName):
      self._instance.activateForm(dialogName)
!     
    # Close this form.
    def close(self):
      event = events.Event('requestEXIT')
--- 738,753 ----
      self.dispatchEvent('uiUPDATESTATUS',tip=tip)
  
    def triggerRunForm(self,fileName):
!     from GFInstance import GFInstance
!     instance = GFInstance(self._instance.manager,
!                           self._instance.connections,
!                           self._instance._uimodule,  1)
!     instance.addFormFromFile(fileName)
!     instance.activate()
  
    def triggerActivateDialog(self,dialogName):
      self._instance.activateForm(dialogName)
! 
    # Close this form.
    def close(self):
      event = events.Event('requestEXIT')
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.77 gnue/forms/src/GFInstance.py:1.78
*** gnue/forms/src/GFInstance.py:1.77   Thu Dec 12 17:07:59 2002
--- gnue/forms/src/GFInstance.py        Tue Dec 17 19:36:09 2002
***************
*** 209,217 ****
      for dialog in self._formsDictionary.keys():
        self.buildForm(dialog)
  
!     for dialog in self._formsDictionary.keys():
!       print dialog
!       print self._uiinstance._uiDictionary[dialog]._formToUIWidget
  
      #
      # Bring up the main form
--- 209,217 ----
      for dialog in self._formsDictionary.keys():
        self.buildForm(dialog)
  
! ##    for dialog in self._formsDictionary.keys():
! ##      print dialog
! ##      print self._uiinstance._uiDictionary[dialog]._formToUIWidget
  
      #
      # Bring up the main form
***************
*** 219,235 ****
      self.activateForm('__main__')
      # TODO : Hard coded test case for use w/ dialog.gfd
      #self.activateForm('selector')
!     
      self._uiinstance.mainLoop()
!         
    #
!   #  Builds a UI based upon a specific form and 
    #  sets that form to active status
    #
    def activateForm(self,formName='__main__'):
      self._form = self._formsDictionary[formName]
!     
!     print "Current entry", self._form._currentEntry
      if not self._form._currentEntry:
        raise  _('There are no navigable widgets in this form.  Unable to 
display.')
  
--- 219,235 ----
      self.activateForm('__main__')
      # TODO : Hard coded test case for use w/ dialog.gfd
      #self.activateForm('selector')
! 
      self._uiinstance.mainLoop()
! 
    #
!   #  Builds a UI based upon a specific form and
    #  sets that form to active status
    #
    def activateForm(self,formName='__main__'):
      self._form = self._formsDictionary[formName]
! 
! ##    print "Current entry", self._form._currentEntry
      if not self._form._currentEntry:
        raise  _('There are no navigable widgets in this form.  Unable to 
display.')
  
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.223 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.224
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.223       Wed Dec 11 23:08:10 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Tue Dec 17 19:36:09 2002
***************
*** 861,867 ****
  
      _setDefaultEventHandlers(newWidget, event.eventHandler, event.initialize)
  
!     print "page", newWidget,event.container, event.object
      event.interface._pageList.append(newWidget)
      return newWidget
  
--- 861,867 ----
  
      _setDefaultEventHandlers(newWidget, event.eventHandler, event.initialize)
  
! ##    print "page", newWidget,event.container, event.object
      event.interface._pageList.append(newWidget)
      return newWidget