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

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/05/23 12:25:12

Modified files:
        designer/src/base: Instance.py 
        designer/src/forms/LayoutEditor: LayoutEditor.py 
                                         LayoutEditorTools.py 
Added files:
        designer/images: tb_copy.png tb_cut.png tb_open.png tb_paste.png 
                         tb_preferences.png tb_redo.png tb_save_as.png 
                         tb_undo.png 
        designer/src/base: PrimaryToolBar.py ToolBar.py 

Log message:
        added a primary toolbar in the main window; generalized the toolbar 
creation code

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/tb_copy.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/tb_cut.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/tb_open.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/tb_paste.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/tb_preferences.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/tb_redo.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/tb_save_as.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/tb_undo.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/PrimaryToolBar.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/ToolBar.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/Instance.py.diff?tr1=1.91&tr2=1.92&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/LayoutEditor.py.diff?tr1=1.73&tr2=1.74&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text

Patches:
Index: gnue/designer/src/base/Instance.py
diff -c gnue/designer/src/base/Instance.py:1.91 
gnue/designer/src/base/Instance.py:1.92
*** gnue/designer/src/base/Instance.py:1.91     Fri Apr  4 23:52:50 2003
--- gnue/designer/src/base/Instance.py  Fri May 23 12:25:12 2003
***************
*** 42,48 ****
  from gnue.designer.base.Debugger import DebugSession
  from gnue.designer.base import TemplateBase
  from gnue.designer.base.TemplateParser import WizardRunner
! 
  
  TITLE=PACKAGE
  
--- 42,48 ----
  from gnue.designer.base.Debugger import DebugSession
  from gnue.designer.base import TemplateBase
  from gnue.designer.base.TemplateParser import WizardRunner
! from PrimaryToolBar import PrimaryToolBar
  
  TITLE=PACKAGE
  
***************
*** 84,89 ****
--- 84,94 ----
    def createWizards(self):
      pass
  
+   # Instances can add to the primary toolbar
+   def initToolBar(self):
+     pass
+ 
+ 
    # Used by TemplateParser to build a wizard.current dict
    def buildWizardCurrentDict(self):
      return {'object': self._currentObject}
***************
*** 173,178 ****
--- 178,186 ----
      self.SetStatusText('Welcome to GNUe Designer. Watch your step and try not 
to get hurt.')
      self._menubar = MainMenuBar(self)
      self.SetMenuBar(self._menubar)
+     self._toolbar = PrimaryToolBar(self, self)
+     self.SetToolBar(self._toolbar)
+ 
  
      self.rootObject.walk(self.__inventory)
  
***************
*** 182,187 ****
--- 190,196 ----
      self.createTools()
      self._initTools()
      self.createWizards()
+     self.initToolBar()
      self._menubar.buildMenu()
  
      # Build accelerator list
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditor.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.73 
gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.74
*** gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.73   Thu May 22 
20:30:44 2003
--- gnue/designer/src/forms/LayoutEditor/LayoutEditor.py        Fri May 23 
12:25:12 2003
***************
*** 124,130 ****
  
  
    def createToolbar(self, parent):
!     self.toolbar = LayoutEditorTools(self, parent)
      self.blockCombo = self.toolbar.blockCombo
      EVT_COMBOBOX(self.toolbar, self.blockCombo.GetId(), self.OnBlockSelected)
      self._rebuildBlockCombo()
--- 124,130 ----
  
  
    def createToolbar(self, parent):
!     self.toolbar = LayoutEditorTools(parent, self.instance)
      self.blockCombo = self.toolbar.blockCombo
      EVT_COMBOBOX(self.toolbar, self.blockCombo.GetId(), self.OnBlockSelected)
      self._rebuildBlockCombo()
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.20 
gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.21
*** gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.20      Thu May 
22 19:17:17 2003
--- gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py   Fri May 23 
12:25:12 2003
***************
*** 25,126 ****
  #
  # NOTES:
  
- import os, string
  from wxPython.wx import *
! from gnue.common.apps import GDebug, GConfig
  
- from gnue.common.events import Event, EventAware
  
! iconlocation = 
os.path.join(GConfig.getInstalledBase('designer_images','common_images') 
,'designer')
! 
! 
! ToolbarMapping = 'File|New|Form,tb_new.png;'   \
!                + 'File|Save,tb_save.png;'   \
!                + ';'   \
!                + 'Edit|Insert|Label,deslay_label.png;' \
                 + 'Edit|Insert|Unbound Entry,deslay_entrytext.png;'   \
                 + 'Edit|Insert|Drop Down Entry,deslay_entrydrop.png;' \
                 + 'Edit|Insert|Button,deslay_button.png;' \
                 + 'Edit|Insert|Box,deslay_box.png'
  
- #               + 'File|Open,tb_open.png;'   \
  
  
! class LayoutEditorTools(wxToolBar, EventAware):
  
!   def __init__(self, editor, frame):
!     self.editor = editor
!     wxToolBar.__init__(self, frame, -1)#, style=wxTB_DOCKABLE)
!     EventAware.__init__(self, editor.instance)
      self.registerEventListeners( {'BeginWizard' : self.onBeginWizard,
!                                   'EndWizard' : self.onEndWizard,
!                                   'MakeDirty' : self.onDirtyForm,
!                                   'MakeClean' : self.onCleanForm, } )
! 
! 
!     self.mapping = {}
!     self.SetToolBitmapSize(wxSize(32,32))
! 
!     for type in string.split(ToolbarMapping,';'):
!       if not len(type):
!         self.AddSeparator()
!       else:
!         handle, image = string.split(type,',',1)
!         help = self.editor.instance._menubar.getEventHelp(handle)
! 
!         if not help:
!           print "Warning: No event tied to %s" % handle
!           help = ""
! 
!         id = wxNewId()
!         self.mapping[id] = handle
!         self.mapping[handle] = id
! 
!         self.AddTool(id,
!           wxImage(os.path.join(iconlocation,image),
!                   wxBITMAP_TYPE_PNG).ConvertToBitmap(),
!           isToggle=1,
!           shortHelpString=help,
!           longHelpString=help)
! 
!         self.SetToolClientData(id, handle)
! 
!         EVT_TOOL(self, id, self.OnButtonSelected)
  
      self.AddSeparator()
      self.AddControl(wxStaticText(self,-1,_("Block: ")))
      self.blockCombo = wxComboBox(self, -1)
      self.AddControl(self.blockCombo)
  
-     self.Realize()
- 
-   def resetTool(self, mode):
-     if self.mapping.has_key(mode):
-       self.ToggleTool(self.mapping[mode],0)
- 
- 
-   def OnButtonSelected(self, event):
-     #
-     # Cheer up any previously depressed toolbuttons
-     #
-     for key in self.mapping.keys():
-       try:
-         self.ToggleTool(int(key),0)
-       except ValueError:
-         pass
-       
-     self.ToggleTool(event.GetId(),0)
-     handle = self.mapping[event.GetId()]
-     self.editor.instance._menubar.simulateMenuEvent(handle)
- 
- ##    if self.editor.mode == handle:
- ##      self.editor.mode = 'move'
- ##    else:
- ##      self.resetTool(self.editor.mode)
- ##      self.editor.mode = handle
- 
- ##    self.editor.frame.SetStatusText('Click on the gridded Layout '
- ##           'Editor to create a new %s.' % descr)
  
    def onBeginWizard(self, event):
      try:
--- 25,55 ----
  #
  # NOTES:
  
  from wxPython.wx import *
! from gnue.designer.base.ToolBar import BaseToolBar
  
  
! ToolbarMapping = 'Edit|Insert|Label,deslay_label.png;' \
                 + 'Edit|Insert|Unbound Entry,deslay_entrytext.png;'   \
                 + 'Edit|Insert|Drop Down Entry,deslay_entrydrop.png;' \
                 + 'Edit|Insert|Button,deslay_button.png;' \
                 + 'Edit|Insert|Box,deslay_box.png'
  
  
+ class LayoutEditorTools(BaseToolBar):
  
!   ICON_SIZE = (32,32)
  
!   def init(self):
      self.registerEventListeners( {'BeginWizard' : self.onBeginWizard,
!                                   'EndWizard' : self.onEndWizard } )
  
+     self.addToolbarMapping(ToolbarMapping)
      self.AddSeparator()
      self.AddControl(wxStaticText(self,-1,_("Block: ")))
      self.blockCombo = wxComboBox(self, -1)
      self.AddControl(self.blockCombo)
  
  
    def onBeginWizard(self, event):
      try:
***************
*** 128,148 ****
      except KeyError:
        pass
  
    def onEndWizard(self, event):
      try:
        self.ToggleTool(self.mapping[event.template['Location']],0)
      except KeyError:
        pass
  
-   def onDirtyForm(self, event):
-     try:
-       self.EnableTool(self.mapping['File|Save'],1)
-     except KeyError:
-       pass
- 
- 
-   def onCleanForm(self, event):
-     try:
-       self.EnableTool(self.mapping['File|Save'],0)
-     except KeyError:
-       pass
--- 57,66 ----
      except KeyError:
        pass
  
+ 
    def onEndWizard(self, event):
      try:
        self.ToggleTool(self.mapping[event.template['Location']],0)
      except KeyError:
        pass