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 15:48:22

Modified files:
        designer/src/base: Instance.py 
        designer/src/forms: Instance.py 
        designer/src/forms/wizards: CreateSchema.py CreateWebForm.py 

Log message:
        reimplemented the Debug Run menu option, though it is now Tools | Run 
Form

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/Instance.py.diff?tr1=1.106&tr2=1.107&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/Instance.py.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/wizards/CreateSchema.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/wizards/CreateWebForm.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gnue/designer/src/base/Instance.py
diff -c gnue/designer/src/base/Instance.py:1.106 
gnue/designer/src/base/Instance.py:1.107
*** gnue/designer/src/base/Instance.py:1.106    Mon Jun  9 20:43:08 2003
--- gnue/designer/src/base/Instance.py  Tue Jun 10 15:48:22 2003
***************
*** 42,48 ****
  from gnue.designer.base.ToolBase import ToolBase
  from gnue.designer.base.ToolDock import ToolDock
  from gnue.designer.base.ToolPanel import *
- from gnue.designer.base.Debugger import DebugSession
  from gnue.designer.base.ObjectList import ObjectList
  from gnue.designer.base import TemplateBase
  from gnue.designer.base.TemplateParser import WizardRunner
--- 42,47 ----
***************
*** 267,272 ****
--- 266,272 ----
            ('Edit', _('&Edit'), 200),
            ('Insert',_('&Insert'), 300),
            ('Modify',_('&Modify'), 400),
+           ('Tools',_('&Tools'), 500),
            ('View',_('&View'), 800),
            ('Help',_('&Help'), 999)):
  
***************
*** 712,732 ****
      RuntimeSettings.saveRuntimeSettings(self)
      self._app.removeInstance(self)
      self.Destroy()
- 
-   def OnDebugRun (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)
  
  
    #################################################################
--- 712,717 ----
Index: gnue/designer/src/forms/Instance.py
diff -c gnue/designer/src/forms/Instance.py:1.47 
gnue/designer/src/forms/Instance.py:1.48
*** gnue/designer/src/forms/Instance.py:1.47    Mon Jun  9 20:43:08 2003
--- gnue/designer/src/forms/Instance.py Tue Jun 10 15:48:22 2003
***************
*** 35,43 ****
  from gnue.designer.base.Instance import BaseInstance
  from gnue.designer.base import PopupMenu
  from gnue.designer.base.ObjectList import ObjectList
  from Incubator import Incubator
  import wizards
- from WizardRunner import WizardRunner
  
  # Tool support...
  from LayoutEditor import LayoutEditor
--- 35,46 ----
  from gnue.designer.base.Instance import BaseInstance
  from gnue.designer.base import PopupMenu
  from gnue.designer.base.ObjectList import ObjectList
+ from WizardRunner import WizardRunner
+ from Debugger import DebugSession
  from Incubator import Incubator
+ 
+ # Wizards
  import wizards
  
  # Tool support...
  from LayoutEditor import LayoutEditor
***************
*** 56,61 ****
--- 59,65 ----
  from gnue.forms import GFForm, GFParser, GFObjects, GFLibrary
  from gnue.forms.GFObjects.GFBlock import GFBlock
  from gnue.common.logic import GTrigger
+ from gnue.common.apps import GDebug
  from gnue.common.datasources import GDataSource
  
  class Instance(BaseInstance, GFInstance.GFInstance):
***************
*** 93,98 ****
--- 97,103 ----
      self.registerEventListeners({
                         'ObjectModified' : self.__onModifyObject,
                         'ObjectDeleted' :  self.__onDeleteObject,
+                        'RunForm': self.__onRunForm
                        })
  
      # Convenience list to keep track of datasources and blocks
***************
*** 219,225 ****
    def initMenu(self):
      # Add the [sub]menus
      for location, text, grouping in (
!        ('Modify|Arrange Items',_('&Arrange Items'), 501), ):
  
        self.menubar.addMenu(location, text, grouping)
  
--- 224,230 ----
    def initMenu(self):
      # Add the [sub]menus
      for location, text, grouping in (
!        ('Modify|Arrange Items',_('&Arrange Items'), 501),):
  
        self.menubar.addMenu(location, text, grouping)
  
***************
*** 227,232 ****
--- 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),
***************
*** 323,328 ****
--- 329,349 ----
              'page': self.visualEditor.page,
              '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)
  
  
  
Index: gnue/designer/src/forms/wizards/CreateSchema.py
diff -c gnue/designer/src/forms/wizards/CreateSchema.py:1.14 
gnue/designer/src/forms/wizards/CreateSchema.py:1.15
*** gnue/designer/src/forms/wizards/CreateSchema.py:1.14        Mon Jun  9 
20:40:14 2003
--- gnue/designer/src/forms/wizards/CreateSchema.py     Tue Jun 10 15:48:22 2003
***************
*** 322,327 ****
      'Version' : VERSION,
      'Author' : 'The GNUe Designer Team',
      'Behavior': WIZARD,
!     'MenuLocation' : ('Extras',_('Create Schema from Form'))
  }
  
--- 322,327 ----
      'Version' : VERSION,
      'Author' : 'The GNUe Designer Team',
      'Behavior': WIZARD,
!     'MenuLocation' : ('Tools|Extras',_('Create Schema from Form'))
  }
  
Index: gnue/designer/src/forms/wizards/CreateWebForm.py
diff -c gnue/designer/src/forms/wizards/CreateWebForm.py:1.4 
gnue/designer/src/forms/wizards/CreateWebForm.py:1.5
*** gnue/designer/src/forms/wizards/CreateWebForm.py:1.4        Mon Jun  9 
20:40:14 2003
--- gnue/designer/src/forms/wizards/CreateWebForm.py    Tue Jun 10 15:48:22 2003
***************
*** 578,584 ****
      'Version' : VERSION,
      'Author' : 'The GNUe Designer Team',
      'Behavior': WIZARD,
!     'MenuLocation' : ('Extras',_('Compile Form for GNUe JsForms'))
  }
  
  if __name__ == "__main__":
--- 578,584 ----
      'Version' : VERSION,
      'Author' : 'The GNUe Designer Team',
      'Behavior': WIZARD,
!     'MenuLocation' : ('Tools|Extras',_('Compile Form for GNUe JsForms'))
  }
  
  if __name__ == "__main__":