gnue/designer/src base/Instance.py forms/Instan...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Branch:         
Changes by:     Jason Cater <address@hidden>    03/06/10 16:07:12

Modified files:
        designer/src/base: Instance.py 
        designer/src/forms: Instance.py 

Log message:
        added a Set Debug Level menu option for the Run Form option; also, 
added Run Form icon to main toolbar

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/Instance.py.diff?tr1=1.107&tr2=1.108&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/Instance.py.diff?tr1=1.48&tr2=1.49&r1=text&r2=text

Patches:
Index: gnue/designer/src/base/Instance.py
diff -c gnue/designer/src/base/Instance.py:1.107 
gnue/designer/src/base/Instance.py:1.108
*** gnue/designer/src/base/Instance.py:1.107    Tue Jun 10 15:48:22 2003
--- gnue/designer/src/base/Instance.py  Tue Jun 10 16:07:11 2003
***************
*** 200,207 ****
      self.statusbar = self.CreateStatusBar()
      self.SetStatusText('Welcome to GNUe Designer -- Do not expose to direct 
sunlight, do not feed after midnight, and do not get wet.')
      self.menubar = MenuBar(self)
!     self._toolbar = PrimaryToolBar(self, self)
!     self.SetToolBar(self._toolbar)
  
  
      self.rootObject.walk(self.__inventory)
--- 200,207 ----
      self.statusbar = self.CreateStatusBar()
      self.SetStatusText('Welcome to GNUe Designer -- Do not expose to direct 
sunlight, do not feed after midnight, and do not get wet.')
      self.menubar = MenuBar(self)
!     self.toolbar = PrimaryToolBar(self, self)
!     self.SetToolBar(self.toolbar)
  
  
      self.rootObject.walk(self.__inventory)
Index: gnue/designer/src/forms/Instance.py
diff -c gnue/designer/src/forms/Instance.py:1.48 
gnue/designer/src/forms/Instance.py:1.49
*** gnue/designer/src/forms/Instance.py:1.48    Tue Jun 10 15:48:22 2003
--- gnue/designer/src/forms/Instance.py Tue Jun 10 16:07:12 2003
***************
*** 69,74 ****
--- 69,75 ----
      self.incubator = Incubator(self)
      self.properties = formProperties
      self.wizardRunner = WizardRunner
+     self.debugLevel = 1
  
      # TODO: Can we make it so the GFInstance is not
      # TODO: part of the main Instance class, but an
***************
*** 97,103 ****
      self.registerEventListeners({
                         'ObjectModified' : self.__onModifyObject,
                         'ObjectDeleted' :  self.__onDeleteObject,
!                        'RunForm': self.__onRunForm
                        })
  
      # Convenience list to keep track of datasources and blocks
--- 98,105 ----
      self.registerEventListeners({
                         'ObjectModified' : self.__onModifyObject,
                         'ObjectDeleted' :  self.__onDeleteObject,
!                        'Forms:RunForm': self.__onRunForm,
!                        'Forms:RequestDebugLevel': self.__onSetDebugLevel
                        })
  
      # Convenience list to keep track of datasources and blocks
***************
*** 220,225 ****
--- 222,231 ----
    def createWizards(self):
      self.loadWizards(wizards)
  
+   # Instances can add to the primary toolbar
+   def initToolBar(self):
+     self.toolbar.addToolbarMapping(';RunForm,tb_exec;')
+ 
  
    def initMenu(self):
      # Add the [sub]menus
***************
*** 232,238 ****
         ('View', 'LayoutEditor:ZoomIn', _("Zoom In"), None, _("Zoom in"), 
11.1, 0),
         ('View', 'LayoutEditor:ZoomOut', _("Zoom Out"), None, _("Zoom out"), 
11.2, 0),
         ('View', 'LayoutEditor:ShowFocus', _("Show Focus Order"), None, 
_("Show the navigation order on the layout editor"), 21, 1),
!        ('Tools','RunForm', _("Run Current Form..."), None, _("Display and run 
the current form"), 101.1, 0),
         ('Modify|Align Items','LayoutEditor:AlignLeft', _("&Align Left 
Edges"), None, _("Horizontally align the currently selected items along their 
left edges"),101.1, 0),
         ('Modify|Align Items','LayoutEditor:AlignRight', _("&Align Right 
Edges"), None, _("Horizontally align the currently selected items along their 
right edges"),101.2, 0),
         ('Modify|Align Items','LayoutEditor:AlignHCenter', _("&Align 
Horizontally on Center"), None, _("Horizontally align the currently selected 
items along their centers"),101.2, 0),
--- 238,245 ----
         ('View', 'LayoutEditor:ZoomIn', _("Zoom In"), None, _("Zoom in"), 
11.1, 0),
         ('View', 'LayoutEditor:ZoomOut', _("Zoom Out"), None, _("Zoom out"), 
11.2, 0),
         ('View', 'LayoutEditor:ShowFocus', _("Show Focus Order"), None, 
_("Show the navigation order on the layout editor"), 21, 1),
!        ('Tools','Forms:RunForm', _("Run Form"), None, _("Display and run the 
current form"), 101.1, 0),
!        ('Tools','Forms:RequestDebugLevel', _("Change debugging level..."), 
None, _("Change the debugging output level for the Run Form option"), 101.2, 0),
         ('Modify|Align Items','LayoutEditor:AlignLeft', _("&Align Left 
Edges"), None, _("Horizontally align the currently selected items along their 
left edges"),101.1, 0),
         ('Modify|Align Items','LayoutEditor:AlignRight', _("&Align Right 
Edges"), None, _("Horizontally align the currently selected items along their 
right edges"),101.2, 0),
         ('Modify|Align Items','LayoutEditor:AlignHCenter', _("&Align 
Horizontally on Center"), None, _("Horizontally align the currently selected 
items along their centers"),101.2, 0),
***************
*** 330,348 ****
              'block': self.visualEditor.block,
              'object': self._currentObject}
  
!   def __onRunForm (self, event):
!     tmpLevel = 0
      tmpRez = 0
      tmpMessage = _("Please enter debugging level - integer [0..n]")
      tmpPrompt = _("Level:")
      tmpCaption = _("Choose debug level")
      tmpRez = 
wxGetNumberFromUser(tmpMessage,tmpPrompt,tmpCaption,tmpLevel,0,10,NULL)
!     if (tmpRez == -1):
!       tmpMessage = _("Debugging has been cancelled.")
!       tmpCaption = _("Debugging...")
!       wxMessageBox(tmpMessage,tmpCaption,wxOK|wxCENTRE,NULL,-1,-1)
!     else:
!       GDebug.setDebug(tmpRez,"");
        DebugSession(self)
  
  
--- 337,354 ----
              'block': self.visualEditor.block,
              'object': self._currentObject}
  
!   def __onSetDebugLevel(self, event):
!     tmpLevel = self.debugLevel
      tmpRez = 0
      tmpMessage = _("Please enter debugging level - integer [0..n]")
      tmpPrompt = _("Level:")
      tmpCaption = _("Choose debug level")
      tmpRez = 
wxGetNumberFromUser(tmpMessage,tmpPrompt,tmpCaption,tmpLevel,0,10,NULL)
!     if (tmpRez != -1):
!       self.debugLevel = tmpRez
! 
!   def __onRunForm (self, event):
!       GDebug.setDebug(self.debugLevel,"");
        DebugSession(self)