gnue/designer/src base/Instance.py base/ToolBar...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Branch:         
Changes by:     Jason Cater <address@hidden>    03/06/09 20:43:08

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

Log message:
        renamed _menubar to menubar since it's used by the subclassed Instance's

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/Instance.py.diff?tr1=1.105&tr2=1.106&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/ToolBar.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/Instance.py.diff?tr1=1.46&tr2=1.47&r1=text&r2=text

Patches:
Index: gnue/designer/src/base/Instance.py
diff -c gnue/designer/src/base/Instance.py:1.105 
gnue/designer/src/base/Instance.py:1.106
*** gnue/designer/src/base/Instance.py:1.105    Mon Jun  9 20:40:13 2003
--- gnue/designer/src/base/Instance.py  Mon Jun  9 20:43:08 2003
***************
*** 200,206 ****
  
      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)
  
--- 200,206 ----
  
      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)
  
***************
*** 220,227 ****
      self.initToolBar()
  
      # Finalize menu bar
!     self._menubar.finalize()
!     self._app.mru.addMenu(self._menubar.getMenu('File|Open Recent|'), self)
  
      # TODO: This is a hack to disable any menu items
      # TODO: for actions we've yet to implement
--- 220,227 ----
      self.initToolBar()
  
      # Finalize menu bar
!     self.menubar.finalize()
!     self._app.mru.addMenu(self.menubar.getMenu('File|Open Recent|'), self)
  
      # TODO: This is a hack to disable any menu items
      # TODO: for actions we've yet to implement
***************
*** 270,276 ****
            ('View',_('&View'), 800),
            ('Help',_('&Help'), 999)):
  
!       self._menubar.addMenu(location, text, grouping)
  
      for location, event, text, hotkey, help, grouping in (
         ('File', 'RequestOpen', _('&Open'), 'Ctrl+O', _("Open an existing 
document"), 200.1),
--- 270,276 ----
            ('View',_('&View'), 800),
            ('Help',_('&Help'), 999)):
  
!       self.menubar.addMenu(location, text, grouping)
  
      for location, event, text, hotkey, help, grouping in (
         ('File', 'RequestOpen', _('&Open'), 'Ctrl+O', _("Open an existing 
document"), 200.1),
***************
*** 290,308 ****
         ('Modify','RequestDelete', _("&Delete Item"), 'Delete', _("Delete the 
current object"),100),
         ('Help', 'RequestAbout', _("&About GNUe Designer"), None, _("More 
information about GNUe Designer"), 900),
       ):
!       self._menubar.addAction(location, text, event,
                        grouping, canDisable=1,
                        icon=None, hotkey=hotkey, help=help)
  
      # Add supported tools to File|New
      for tool in SupportedTools:
!        self._menubar.addAction('File|New', '&%s' % 
tool.properties.nickname,'RequestNew', 100,
          help=_('Create a new %s') % string.lower(tool.properties.nickname), 
eventdata={'type': tool.properties.module })
  
      # Add connections
      for conn in self.connections.getAllConnectionParameters().keys():
        id = wxNewId()
!       self._menubar.addAction('File|Connect To', conn, 'Connect:%s' % conn,
                 help=_("Login to %s connection") % conn,
                 eventdata={'connection': conn})
        self.registerEventListeners({'Connect:%s' % conn:self.__OnConnectTo})
--- 290,308 ----
         ('Modify','RequestDelete', _("&Delete Item"), 'Delete', _("Delete the 
current object"),100),
         ('Help', 'RequestAbout', _("&About GNUe Designer"), None, _("More 
information about GNUe Designer"), 900),
       ):
!       self.menubar.addAction(location, text, event,
                        grouping, canDisable=1,
                        icon=None, hotkey=hotkey, help=help)
  
      # Add supported tools to File|New
      for tool in SupportedTools:
!        self.menubar.addAction('File|New', '&%s' % 
tool.properties.nickname,'RequestNew', 100,
          help=_('Create a new %s') % string.lower(tool.properties.nickname), 
eventdata={'type': tool.properties.module })
  
      # Add connections
      for conn in self.connections.getAllConnectionParameters().keys():
        id = wxNewId()
!       self.menubar.addAction('File|Connect To', conn, 'Connect:%s' % conn,
                 help=_("Login to %s connection") % conn,
                 eventdata={'connection': conn})
        self.registerEventListeners({'Connect:%s' % conn:self.__OnConnectTo})
***************
*** 356,362 ****
          enableMenu = 0
  
        # Add ourselves to the Window menu
!       self._menubar.addAction(location='View', text=title, event='Tool:' + id,
                                grouping=group, canToggle=1, canDisable=0,
                                icon=None, hotkey=hotkey)
  
--- 356,362 ----
          enableMenu = 0
  
        # Add ourselves to the Window menu
!       self.menubar.addAction(location='View', text=title, event='Tool:' + id,
                                grouping=group, canToggle=1, canDisable=0,
                                icon=None, hotkey=hotkey)
  
***************
*** 793,799 ****
  
          if location:
            self.wizardRunner(template, self)
!           self._menubar.addAction(location=location, text=translation,
                                    event='Wizard:%s' % template['BaseID'],
                                    grouping=grouping, canDisable=1,
                                    eventdata={'template':template})
--- 793,799 ----
  
          if location:
            self.wizardRunner(template, self)
!           self.menubar.addAction(location=location, text=translation,
                                    event='Wizard:%s' % template['BaseID'],
                                    grouping=grouping, canDisable=1,
                                    eventdata={'template':template})
Index: gnue/designer/src/base/ToolBar.py
diff -c gnue/designer/src/base/ToolBar.py:1.4 
gnue/designer/src/base/ToolBar.py:1.5
*** gnue/designer/src/base/ToolBar.py:1.4       Thu May 29 01:07:22 2003
--- gnue/designer/src/base/ToolBar.py   Mon Jun  9 20:43:08 2003
***************
*** 61,67 ****
        else:
          handle, image = string.split(type,',',1)
          help=""
! ##        help = self.instance._menubar.getEventHelp(handle)
  
  ##        if not help:
  ##          print "Warning: No event tied to %s" % handle
--- 61,67 ----
        else:
          handle, image = string.split(type,',',1)
          help=""
! ##        help = self.instance.menubar.getEventHelp(handle)
  
  ##        if not help:
  ##          print "Warning: No event tied to %s" % handle
Index: gnue/designer/src/forms/Instance.py
diff -c gnue/designer/src/forms/Instance.py:1.46 
gnue/designer/src/forms/Instance.py:1.47
*** gnue/designer/src/forms/Instance.py:1.46    Mon Jun  9 20:40:14 2003
--- gnue/designer/src/forms/Instance.py Mon Jun  9 20:43:08 2003
***************
*** 221,227 ****
      for location, text, grouping in (
         ('Modify|Arrange Items',_('&Arrange Items'), 501), ):
  
!       self._menubar.addMenu(location, text, grouping)
  
      for location, event, text, hotkey, help, grouping, canToggle in (
         ('View', 'LayoutEditor:ZoomIn', _("Zoom In"), None, _("Zoom in"), 
11.1, 0),
--- 221,227 ----
      for location, text, grouping in (
         ('Modify|Arrange Items',_('&Arrange Items'), 501), ):
  
!       self.menubar.addMenu(location, text, grouping)
  
      for location, event, text, hotkey, help, grouping, canToggle in (
         ('View', 'LayoutEditor:ZoomIn', _("Zoom In"), None, _("Zoom in"), 
11.1, 0),
***************
*** 234,240 ****
         ('Modify|Align Items','LayoutEditor:AlignBottom', _("&Align Right 
Edges"), None, _("Vertically align the currently selected items along their 
bottom edges"),111.2, 0),
         ('Modify|Align Items','LayoutEditor:AlignVCenter', _("&Align 
Vertically on Center"), None, _("Vertically align the currently selected items 
along their centers"),111.2, 0),
         ('Modify','LayoutEditor:AutoArrange', _("&Reset Focus Order by 
Position"), None, _("Automatically set the focus order based on an items 
position"),201.2, 0)):
!       self._menubar.addAction(location, text, event,
                        grouping, canDisable=1, canToggle=canToggle,
                        icon=None, hotkey=hotkey, help=help)
  
--- 234,240 ----
         ('Modify|Align Items','LayoutEditor:AlignBottom', _("&Align Right 
Edges"), None, _("Vertically align the currently selected items along their 
bottom edges"),111.2, 0),
         ('Modify|Align Items','LayoutEditor:AlignVCenter', _("&Align 
Vertically on Center"), None, _("Vertically align the currently selected items 
along their centers"),111.2, 0),
         ('Modify','LayoutEditor:AutoArrange', _("&Reset Focus Order by 
Position"), None, _("Automatically set the focus order based on an items 
position"),201.2, 0)):
!       self.menubar.addAction(location, text, event,
                        grouping, canDisable=1, canToggle=canToggle,
                        icon=None, hotkey=hotkey, help=help)