gnue/designer doc/technotes/00003.txt src/Insta...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/10/07 22:24:26

Modified files:
        designer/doc/technotes: 00003.txt 
        designer/src   : Instance.py MenuBar.py TemplateParser.py 
        designer/src/forms: WizardRunner.py 
        designer/src/forms/LayoutEditor: LayoutEditor.py 
                                         LayoutEditorTools.py 

Log message:
        * Added event model to designer
        * Enabled the Toolbar "Save" icon to be enabled/disabled based
        on the state of the document
        * The icons for various functions stay depressed until the
        function has completed (e.g., drawing a combo box or entry)
        * Toolbar icons are depressed when a function is selected from
        the menu (to show state)
        * Various code cleanups

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/doc/technotes/00003.txt.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/Instance.py.diff?cvsroot=OldCVS&tr1=1.65&tr2=1.66&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/MenuBar.py.diff?cvsroot=OldCVS&tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/TemplateParser.py.diff?cvsroot=OldCVS&tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/forms/WizardRunner.py.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/forms/LayoutEditor/LayoutEditor.py.diff?cvsroot=OldCVS&tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py.diff?cvsroot=OldCVS&tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: gnue/designer/doc/technotes/00003.txt
diff -c gnue/designer/doc/technotes/00003.txt:1.1 
gnue/designer/doc/technotes/00003.txt:1.2
*** gnue/designer/doc/technotes/00003.txt:1.1   Mon Oct  7 19:13:29 2002
--- gnue/designer/doc/technotes/00003.txt       Mon Oct  7 22:24:26 2002
***************
*** 3,5 ****
--- 3,14 ----
  Created: 07-OCT-2002
  
  
+ ObjectModified
+ ObjectDeleted
+ ObjectCreated
+ 
+ MakeDirty -- Called after a document has been modified
+ MakeClean -- Called after a document has been saved
+ 
+ BeginWizard -- Called whenever a wizard has been selected to run
+ EndWizard -- Called whenever a wizard has finished running
\ No newline at end of file
Index: gnue/designer/src/Instance.py
diff -c gnue/designer/src/Instance.py:1.65 gnue/designer/src/Instance.py:1.66
*** gnue/designer/src/Instance.py:1.65  Mon Oct  7 19:13:29 2002
--- gnue/designer/src/Instance.py       Mon Oct  7 22:24:26 2002
***************
*** 258,263 ****
--- 258,264 ----
          self.SetTitle( TITLE + _(" - <New %s> *") % self.properties.nickname)
        else:
          self.SetTitle( TITLE + " - " + self._path + " *")
+     self.dispatchEvent(Event('MakeDirty'))
  
    def makeClean(self):
      self._isdirty = 0
***************
*** 266,271 ****
--- 267,273 ----
        self.SetTitle( TITLE + _(" - <New %s>") % self.properties.nickname)
      else:
        self.SetTitle( TITLE + " - " + self._path)
+     self.dispatchEvent(Event('MakeClean'))
  
  
    # Take an object and mangle it all up
Index: gnue/designer/src/MenuBar.py
diff -c gnue/designer/src/MenuBar.py:1.31 gnue/designer/src/MenuBar.py:1.32
*** gnue/designer/src/MenuBar.py:1.31   Mon Oct  7 19:13:29 2002
--- gnue/designer/src/MenuBar.py        Mon Oct  7 22:24:26 2002
***************
*** 49,57 ****
  
    def addWizardLocation(self, location, template):
      #print "Adding %s" % location
!     self._menuMappings[location] = self._frame.wizardRunner(template,
!                                          string.split(location,'|')[-1],
!                                          self._frame)
  
    # Called after all the addWizardLocation's have been run
    def buildMenu(self):
--- 49,59 ----
  
    def addWizardLocation(self, location, template):
      #print "Adding %s" % location
!     wr = self._frame.wizardRunner(template,
!                                   string.split(location,'|')[-1],
!                                   self._frame)
! 
!     self._menuMappings[location] = wr
  
    # Called after all the addWizardLocation's have been run
    def buildMenu(self):
***************
*** 277,283 ****
      except KeyError:
        return None
  
!   
    def simulateMenuEvent(self, location):
      method, id = self._eventMappings[location]
      method(wxEvent(id))
--- 279,285 ----
      except KeyError:
        return None
  
! 
    def simulateMenuEvent(self, location):
      method, id = self._eventMappings[location]
      method(wxEvent(id))
Index: gnue/designer/src/TemplateParser.py
diff -c gnue/designer/src/TemplateParser.py:1.19 
gnue/designer/src/TemplateParser.py:1.20
*** gnue/designer/src/TemplateParser.py:1.19    Tue Sep 17 11:27:45 2002
--- gnue/designer/src/TemplateParser.py Mon Oct  7 22:24:26 2002
***************
*** 590,597 ****
--- 590,599 ----
         self.tooltip = ""
  
    def run(self, event):
+     self.instance.dispatchEvent(Event('BeginWizard', template=self.template))
      TemplateParser(self.instance, self.instance.rootObject,
            self.instance, self.template).run()
+     self.instance.dispatchEvent(Event('EndWizard', template=self.template))
  
    def finalize(self):
      pass
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditor.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.30 
gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.31
*** gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.30   Fri Aug 16 
00:51:28 2002
--- gnue/designer/src/forms/LayoutEditor/LayoutEditor.py        Mon Oct  7 
22:24:26 2002
***************
*** 34,39 ****
--- 34,40 ----
  from gnue.designer.PopupMenu import PageMenu
  from gnue.designer.forms import Incubator
  from gnue.designer.TemplateParser import TemplateParser
+ from gnue.common.events import Event
  
  # My support files
  from Utils import *
***************
*** 448,453 ****
--- 449,455 ----
  
  
  
+ 
    def selectWidgetInArea(self, object, x1, y1, x2, y2):
      try:
        if x1 <= object.x <= x2 and \
***************
*** 533,538 ****
--- 535,541 ----
            self._instance, self.__template, currentObject=self.block or 
self.page).run(x=x, y=y,
                                                 width=width,
                                                 height=height)
+     self._instance.dispatchEvent(Event('EndWizard', template=self.__template))
      self.mode = 'move'
  
  
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.9 
gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.10
*** gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.9       Fri Aug 
16 00:51:28 2002
--- gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py   Mon Oct  7 
22:24:26 2002
***************
*** 29,34 ****
--- 29,36 ----
  from wxPython.wx import *
  from gnue.common import GDebug, GConfig
  
+ from gnue.common.events import Event, EventAware
+ 
  iconlocation = GConfig.getInstalledBase('designer_images','common_images') + 
'/'
  
  
***************
*** 43,53 ****
  #               + 'File|Open,tb_open.png;'   \
  
  
! class LayoutEditorTools(wxToolBar):
  
    def __init__(self, editor, frame):
      self.editor = editor
      wxToolBar.__init__(self, frame, -1)#, style=wxTB_DOCKABLE)
  
  
      self.mapping = {}
--- 45,60 ----
  #               + '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 = {}
***************
*** 71,77 ****
          self.AddTool(id,
            wxImage(os.path.join(iconlocation,image),
                    wxBITMAP_TYPE_PNG).ConvertToBitmap(),
! ##          isToggle=1,
            shortHelpString=help,
            longHelpString=help)
  
--- 78,84 ----
          self.AddTool(id,
            wxImage(os.path.join(iconlocation,image),
                    wxBITMAP_TYPE_PNG).ConvertToBitmap(),
!           isToggle=1,
            shortHelpString=help,
            longHelpString=help)
  
***************
*** 87,92 ****
--- 94,100 ----
  
  
    def OnButtonSelected(self, event):
+     self.ToggleTool(event.GetId(),0)
      handle = self.mapping[event.GetId()]
      self.editor._instance._menubar.simulateMenuEvent(handle)
  
***************
*** 99,102 ****
  ##    self.editor.frame.SetStatusText('Click on the gridded Layout '
  ##           'Editor to create a new %s.' % descr)
  
! 
--- 107,133 ----
  ##    self.editor.frame.SetStatusText('Click on the gridded Layout '
  ##           'Editor to create a new %s.' % descr)
  
!   def onBeginWizard(self, event):
!     try:
!       self.ToggleTool(self.mapping[event.template['Location']],1)
!     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
Index: gnue/designer/src/forms/WizardRunner.py
diff -c gnue/designer/src/forms/WizardRunner.py:1.2 
gnue/designer/src/forms/WizardRunner.py:1.3
*** gnue/designer/src/forms/WizardRunner.py:1.2 Wed Aug  7 19:29:18 2002
--- gnue/designer/src/forms/WizardRunner.py     Mon Oct  7 22:24:26 2002
***************
*** 30,35 ****
--- 30,36 ----
  
  from gnue.designer.TemplateParser import WizardRunner as BaseWizardRunner
  import TemplateSupport
+ from gnue.common.events import Event
  
  class WizardRunner(BaseWizardRunner):
  
***************
*** 44,47 ****
--- 45,50 ----
  
  
    def __run(self, event):
+     self.instance.dispatchEvent(Event('BeginWizard', 
+               template=self.template))
      self.instance.visualEditor.startPrePositioningTemplate(self.template)