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

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Branch:         
Changes by:     Jason Cater <address@hidden>    03/06/07 02:53:36

Modified files:
        designer/src/base: Instance.py ToolFrame.py UndoManager.py 
        designer/src/forms: Instance.py 

Log message:
        more work on floating tool frames

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/Instance.py.diff?tr1=1.103&tr2=1.104&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/ToolFrame.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/UndoManager.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/Instance.py.diff?tr1=1.44&tr2=1.45&r1=text&r2=text

Patches:
Index: gnue/designer/src/base/Instance.py
diff -c gnue/designer/src/base/Instance.py:1.103 
gnue/designer/src/base/Instance.py:1.104
*** gnue/designer/src/base/Instance.py:1.103    Fri Jun  6 22:18:24 2003
--- gnue/designer/src/base/Instance.py  Sat Jun  7 02:53:35 2003
***************
*** 270,276 ****
  
          if pos not in ('left','right'):  # i.e., 'frame' or something old
            # Frame type
!           window = ToolFrame(self, title, baseclass.uses_feedback_bar)
            control = baseclass(self, self.rootObject, window)
            window.control = control
            window.dock = 'frame'
--- 270,276 ----
  
          if pos not in ('left','right'):  # i.e., 'frame' or something old
            # Frame type
!           window = ToolFrame(self, id, title, baseclass.uses_feedback_bar)
            control = baseclass(self, self.rootObject, window)
            window.control = control
            window.dock = 'frame'
Index: gnue/designer/src/base/ToolFrame.py
diff -c gnue/designer/src/base/ToolFrame.py:1.22 
gnue/designer/src/base/ToolFrame.py:1.23
*** gnue/designer/src/base/ToolFrame.py:1.22    Fri Jun  6 21:11:00 2003
--- gnue/designer/src/base/ToolFrame.py Sat Jun  7 02:53:35 2003
***************
*** 41,62 ****
  #
  class ToolFrame (wxFrame, ToolPanel):
  
!   default_width = 200
!   default_height = 150
    default_visible = 0
  
!   def __init__(self, instance, title, statusbar=0, toolbar=0):
      if sys.platform[:3] == 'win':
        style = wxFRAME_TOOL_WINDOW|wxMINIMIZE_BOX|wxRESIZE_BORDER| \
!               wxCAPTION|wxFRAME_FLOAT_ON_PARENT|wxSYSTEM_MENU
      else:
!       style = wxMINIMIZE_BOX|wxRESIZE_BORDER|wxCAPTION|wxSYSTEM_MENU
  
      wxFrame.__init__(self, instance, -1, title, style=style)
  
      self.title = title
      self.runtime_section = "ToolFrame-%s" % string.replace(self.title,' ','')
      self.instance = instance
      if statusbar:
        self.statusbar = self.CreateStatusBar()
  
--- 41,65 ----
  #
  class ToolFrame (wxFrame, ToolPanel):
  
!   default_width = 300
!   default_height = 200
    default_visible = 0
  
!   def __init__(self, instance, id, title, statusbar=0, toolbar=0):
      if sys.platform[:3] == 'win':
        style = wxFRAME_TOOL_WINDOW|wxMINIMIZE_BOX|wxRESIZE_BORDER| \
!               wxFRAME_FLOAT_ON_PARENT
      else:
!       style = 
wxMINIMIZE_BOX|wxRESIZE_BORDER|wxCAPTION|wxFRAME_NO_TASKBAR|wxFRAME_FLOAT_ON_PARENT
! 
  
      wxFrame.__init__(self, instance, -1, title, style=style)
  
+     self.id = id
      self.title = title
      self.runtime_section = "ToolFrame-%s" % string.replace(self.title,' ','')
      self.instance = instance
+     self.visible = 0
      if statusbar:
        self.statusbar = self.CreateStatusBar()
  
***************
*** 82,89 ****
--- 85,97 ----
             self.runtime_section, 'visible', self.default_visible):
        self.show()
  
+ 
      RuntimeSettings.registerRuntimeSettingHandler(self.instance, self)
  
+     self.instance.registerEventListeners(
+                { 'ShowTool:%s' % self.id : self.show,
+                  'HideTool:%s' % self.id : self.hide } )
+ 
  
    def saveRuntimeSettings(self):
      x, y = self.GetPositionTuple()
***************
*** 91,120 ****
      return ( self.runtime_section,
               {'x': x,
                'y': y,
! ##              'visible': self.control._menutool.menu.IsChecked(),
                'height': height,
                'width': width,  } )
  
-   # This event is set by MenuBar.addTool
-   # Called whenever menu item is selected
-   def OnMenuSelected(self, event):
-     if self.control._menutool.menu.IsChecked():
-       self.show()
-     else:
-       self.hide()
  
!   def show(self):
! ##    self.control._menutool.menu.SetHelp(_("Hide the %s window")  % 
self.title)
! ##    self.control._menutool.menu.Check(1)
      self.Show(1)
  
!   def hide(self):
! ##    self.control._menutool.menu.SetHelp(_("Show the %s window") % 
self.title)
! ##    self.control._menutool.menu.Check(0)
      self.Show(0)
  
    def OnClose(self, event):
!     self.hide()
      event.Veto()
  
  
--- 99,119 ----
      return ( self.runtime_section,
               {'x': x,
                'y': y,
!               'visible': self.visible,
                'height': height,
                'width': width,  } )
  
  
!   def show(self, event=None):
!     self.visible = 1
      self.Show(1)
  
!   def hide(self, event=None):
!     self.visible = 0
      self.Show(0)
  
    def OnClose(self, event):
!     self.instance.dispatchEvent('HideTool:%s' % self.id)
      event.Veto()
  
  
Index: gnue/designer/src/base/UndoManager.py
diff -c gnue/designer/src/base/UndoManager.py:1.3 
gnue/designer/src/base/UndoManager.py:1.4
*** gnue/designer/src/base/UndoManager.py:1.3   Mon Jun  2 19:33:25 2003
--- gnue/designer/src/base/UndoManager.py       Sat Jun  7 02:53:35 2003
***************
*** 66,71 ****
--- 66,72 ----
        else:
          self.history.append ([history])
        self.forward = []
+       self.history = self.history[-50:]
        self.updateEvents()
  
    def beginGroup(self, event):
***************
*** 76,81 ****
--- 77,83 ----
      self.groupCount -= 1
      if not self.groupCount:
        self.history.append(self.group)
+       self.history = self.history[-50:]
        self.group = []
  
    def undo(self, event):
Index: gnue/designer/src/forms/Instance.py
diff -c gnue/designer/src/forms/Instance.py:1.44 
gnue/designer/src/forms/Instance.py:1.45
*** gnue/designer/src/forms/Instance.py:1.44    Fri Jun  6 22:18:24 2003
--- gnue/designer/src/forms/Instance.py Sat Jun  7 02:53:36 2003
***************
*** 91,98 ****
      BaseInstance.__init__(self, app, *args, **params)
  
      self.registerEventListeners({
!                        'ObjectModified' : self.onModifyObject,
!                        'ObjectDeleted' :  self.onDeleteObject,
                        })
  
      # Convenience list to keep track of datasources and blocks
--- 91,98 ----
      BaseInstance.__init__(self, app, *args, **params)
  
      self.registerEventListeners({
!                        'ObjectModified' : self.__onModifyObject,
!                        'ObjectDeleted' :  self.__onDeleteObject,
                        })
  
      # Convenience list to keep track of datasources and blocks
***************
*** 149,155 ****
      object._popupMenu = ObjectMenu(self, object)
  
  
!   def onModifyObject(self, event):
  
      object = event.object
  
--- 149,155 ----
      object._popupMenu = ObjectMenu(self, object)
  
  
!   def __onModifyObject(self, event):
  
      object = event.object
  
***************
*** 173,179 ****
        block._fieldMap[object.name] = object
  
  
!   def onDeleteObject(self, event):
      object = event.object
      if object._type == 'GFPage':
        self._pages.remove(object)
--- 173,179 ----
        block._fieldMap[object.name] = object
  
  
!   def __onDeleteObject(self, event):
      object = event.object
      if object._type == 'GFPage':
        self._pages.remove(object)
***************
*** 255,264 ****
  
      if not valid: 
        if wxMessageDialog(self, 
!           _('The form definition you are about to save\n') +
!           _('does not appear to be a workable definition.') +
!           _('\n\nIf you save an incomplete definition, you\n') +
!           _('may not be able to reopen it in Designer.\n\nSave anyway?'),
               _("Incomplete Form Definition"), wxYES_NO|wxICON_QUESTION 
).ShowModal() == wxID_NO:
          return 1
  
--- 255,264 ----
  
      if not valid: 
        if wxMessageDialog(self, 
!           _('The form definition you are about to save\n' + \
!           'does not appear to be a workable definition.' + \
!           '\n\nIf you save an incomplete definition, you\n' + \
!           'may not be able to reopen it in Designer.\n\nSave anyway?'),
               _("Incomplete Form Definition"), wxYES_NO|wxICON_QUESTION 
).ShowModal() == wxID_NO:
          return 1