gnue/designer/src/base Debugger.py MenuBar.py

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 03/04/04 22:37:26

Modified files:
        designer/src/base: Debugger.py MenuBar.py 

Log message:
        disable debug and settings menus for 0.5.0
        halfhearted attempt to get debugger to play nice with new UI structure

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/Debugger.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/MenuBar.py.diff?tr1=1.38&tr2=1.39&r1=text&r2=text

Patches:
Index: gnue/designer/src/base/Debugger.py
diff -c gnue/designer/src/base/Debugger.py:1.10 
gnue/designer/src/base/Debugger.py:1.11
*** gnue/designer/src/base/Debugger.py:1.10     Mon Feb 17 02:32:50 2003
--- gnue/designer/src/base/Debugger.py  Fri Apr  4 22:37:26 2003
***************
*** 49,56 ****
      try: 
        self._saveexit = sys.exit
        sys.exit = self.debugClosing
!       debugInstance = DebugInstance(caller._app)
!       
debugInstance.setForm(GFParser.loadFile(StringIO(caller.rootObject.dumpXML(treeDump=1)),
 debugInstance))
        debugInstance.activate()
        debugInstance._ui._debuginstance = self
      except: 
--- 49,62 ----
      try: 
        self._saveexit = sys.exit
        sys.exit = self.debugClosing
!       
! #      debugInstance = DebugInstance(caller._app)
!       debugInstance = 
GFInstance.GFInstance(caller._app,connections=caller._app.connections,
!                  ui=DummyInterfaceModule,disableSplash=1)
!       debugInstance.addDialogs()
!       debugInstance.addFormFromBuffer(caller.rootObject.dumpXML(treeDump=1))
!           
!       
#debugInstance.setForm(GFParser.loadFile(StringIO(caller.rootObject.dumpXML(treeDump=1)),
 debugInstance))
        debugInstance.activate()
        debugInstance._ui._debuginstance = self
      except: 
***************
*** 67,74 ****
      self.stderrcatcher.restore()
      sys.exit = self._saveexit
  
- 
- 
  class DebugUserInterface(UIwxpython.GFUserInterface): 
    def closeTrap (self, event): 
      UIwxpython.GFUserInterface.closeTrap(self, event)
--- 73,78 ----
***************
*** 80,90 ****
  class DummyInterfaceModule:     
    GFUserInterface = DebugUserInterface
  
! 
! class DebugInstance(GFInstance.GFInstance): 
!   def __init__(self, app): 
!     GFInstance.GFInstance.__init__(self, app, -1, app.connections, 
!                           DummyInterfaceModule,1)
      
      
  
--- 84,97 ----
  class DummyInterfaceModule:     
    GFUserInterface = DebugUserInterface
  
! #class DebugInstance(GFInstance.GFInstance): 
! #  def __init__(self, manager, connections=None, ui=DummyInterfaceModule, 
disableSplash=1,
! #               parameters={}):
! #    GFInstance.GFInstance.__init__(self,connections=manager.connections,
! #                                   ui=ui, disableSplash=disableSplash)
! #
! #                                   app, -1, app.connections, 
! #                          DummyInterfaceModule,1)
      
      
  
Index: gnue/designer/src/base/MenuBar.py
diff -c gnue/designer/src/base/MenuBar.py:1.38 
gnue/designer/src/base/MenuBar.py:1.39
*** gnue/designer/src/base/MenuBar.py:1.38      Sun Mar 30 12:17:00 2003
--- gnue/designer/src/base/MenuBar.py   Fri Apr  4 22:37:26 2003
***************
*** 86,96 ****
       ID_NEW_PROJECT = wxNewId()
       ID_OPEN_PROJECT = wxNewId()
  
!      # Debug menu
!      ID_RUN = wxNewId()
  
!      # Settings menu
!      ID_CFGTOOL = wxNewId()
  
       # Help menu
       ID_ABOUT = wxNewId()
--- 86,96 ----
       ID_NEW_PROJECT = wxNewId()
       ID_OPEN_PROJECT = wxNewId()
  
! ##     # Debug menu
! ##     ID_RUN = wxNewId()
  
! ##     # Settings menu
! ##     ID_CFGTOOL = wxNewId()
  
       # Help menu
       ID_ABOUT = wxNewId()
***************
*** 208,222 ****
       self._tools.AppendSeparator()
  
  
!      self._debug = wxMenu()
!      self._debug.Append(ID_RUN, _('&Run'), _("Run the current form"))
!      self.__addMenuEvent('Debug|Run', ID_RUN, frame.OnDebugRun)
! 
!      # TODO: Implement settings
!      self._settings = wxMenu()
!      self._settings.Append(ID_CFGTOOL,_('Configure &Tools...'),
!                         _('Configure the display of tools'))
!      self.__addMenuEvent('Settings|Configure Tools', ID_RUN, frame.OnDebugRun)
  
  
       menumap = { '': (self, {}),
--- 208,223 ----
       self._tools.AppendSeparator()
  
  
! ##     TODO: NOT FUNCTION in 0.5.0
! ##     self._debug = wxMenu()
! ##     self._debug.Append(ID_RUN, _('&Run'), _("Run the current form"))
! ##     self.__addMenuEvent('Debug|Run', ID_RUN, frame.OnDebugRun)
! 
! ##      # TODO: Implement settings
! ##      self._settings = wxMenu()
! ##      self._settings.Append(ID_CFGTOOL,_('Configure &Tools...'),
! ##                         _('Configure the display of tools'))
! ##      self.__addMenuEvent('Settings|Configure Tools', ID_RUN, 
frame.OnDebugRun)
  
  
       menumap = { '': (self, {}),
***************
*** 224,235 ****
                   'File|New': (self._fileNew,{}),
                   'Edit': (self._edit,{}),
                   'Project': (self._project,{}),
!                  'Debug': (self._debug,{}),
                   'Tools': (self._tools,{}),
!                  'Settings': (self._settings,{}),
                   'Help': (self._help, {})}
  
!      basemenuorder = ['File','Edit','Debug','Project', 'Tools', 'Settings']
  
       for location in self._menuMappings.keys():
         last = None
--- 225,237 ----
                   'File|New': (self._fileNew,{}),
                   'Edit': (self._edit,{}),
                   'Project': (self._project,{}),
! ##                 'Debug': (self._debug,{}),
                   'Tools': (self._tools,{}),
! ##                 'Settings': (self._settings,{}),
                   'Help': (self._help, {})}
  
! ##     basemenuorder = ['File','Edit','Debug','Project', 'Tools', 'Settings']
!      basemenuorder = ['File','Edit','Project', 'Tools']
  
       for location in self._menuMappings.keys():
         last = None