gnue/designer src/base/docks/BasePane.py src/ba...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Branch:         
Changes by:     Jason Cater <address@hidden>    03/06/16 17:17:48

Modified files:
        designer/src/base/docks: BasePane.py DockedPane.py Docker.py 
                                 FloatingPane.py SplitDock.py 
Added files:
        designer/images: tb_dock-16x16.png tb_dock-24x24.png 

Log message:
        more docking goodness

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/tb_dock-16x16.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/images/tb_dock-24x24.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/docks/BasePane.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/docks/DockedPane.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/docks/Docker.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/docks/FloatingPane.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/docks/SplitDock.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue/designer/src/base/docks/BasePane.py
diff -c gnue/designer/src/base/docks/BasePane.py:1.2 
gnue/designer/src/base/docks/BasePane.py:1.3
*** gnue/designer/src/base/docks/BasePane.py:1.2        Fri Jun 13 17:12:32 2003
--- gnue/designer/src/base/docks/BasePane.py    Mon Jun 16 17:17:48 2003
***************
*** 34,39 ****
--- 34,40 ----
    def __init__(self, parent, instance, tool):
      self.parent = parent
      self.instance = instance
+     self.tool = tool
      self.minimized = 0
  
      # Reparent the tool to be under our control...
Index: gnue/designer/src/base/docks/DockedPane.py
diff -c gnue/designer/src/base/docks/DockedPane.py:1.2 
gnue/designer/src/base/docks/DockedPane.py:1.3
*** gnue/designer/src/base/docks/DockedPane.py:1.2      Fri Jun 13 17:12:32 2003
--- gnue/designer/src/base/docks/DockedPane.py  Mon Jun 16 17:17:48 2003
***************
*** 108,114 ****
      nid = wxNewId()
      menu.Append(nid, _("Release to Frame"))
      EVT_MENU(self, nid, self.__BreakAway)
!     menu.Enable(nid, 0)  # TODO
  
      self.PopupMenu(menu, event.GetPosition())
  
--- 108,114 ----
      nid = wxNewId()
      menu.Append(nid, _("Release to Frame"))
      EVT_MENU(self, nid, self.__BreakAway)
! ##    menu.Enable(nid, 0)  # TODO
  
      self.PopupMenu(menu, event.GetPosition())
  
***************
*** 130,137 ****
  
    # Called by the popup menu when user right-clicks
    def __BreakAway(self, event):
!     print _("This function not yet supported!") # TODO
! 
  
    def __OnSize(self, event):
      if self.GetAutoLayout():
--- 130,136 ----
  
    # Called by the popup menu when user right-clicks
    def __BreakAway(self, event):
!     self.instance.dispatchEvent('Docker:Undock', tool=self.tool)
  
    def __OnSize(self, event):
      if self.GetAutoLayout():
Index: gnue/designer/src/base/docks/Docker.py
diff -c gnue/designer/src/base/docks/Docker.py:1.4 
gnue/designer/src/base/docks/Docker.py:1.5
*** gnue/designer/src/base/docks/Docker.py:1.4  Fri Jun 13 17:12:32 2003
--- gnue/designer/src/base/docks/Docker.py      Mon Jun 16 17:17:48 2003
***************
*** 47,52 ****
--- 47,55 ----
      self.rightDock = rightWin = SplitDock(horizSplitter, self,'right')
      EVT_SIZE(instance, self.__OnSize)
  
+     instance.registerEventListeners({'Docker:Undock': self.undock})
+     self.tools = []
+ 
      #
      # Add each tool
      #
***************
*** 81,91 ****
--- 84,97 ----
            dock = rightWin
          dock.add(DockedPane(dock, instance, tool), indx)
  
+       self.tools.append(tool)
+ 
        # Add ourselves to the Window menu
        instance.menubar.addAction(location='View', text=title, event='Tool:' + 
id,
                                grouping=group, canToggle=1, canDisable=0,
                                icon=None, hotkey=hotkey)
  
+ 
  ##      instance.__dict__["%sWindow" % id] = window
        instance.__dict__[id] = tool
  
***************
*** 112,114 ****
--- 118,130 ----
      settings.update(self.rightDock.saveSettings())
  
      return settings
+ 
+   def undock(self, event):
+     tool = event.tool
+     instance = self.instance
+     dockpane = tool.dockpane
+     panel = dockpane.parent.remove(dockpane)
+     FloatingPane(instance, instance, tool)
+     dockpane.Destroy()
+     instance.dispatchEvent('Show:Tool:%s' % tool.id)
+ 
Index: gnue/designer/src/base/docks/FloatingPane.py
diff -c gnue/designer/src/base/docks/FloatingPane.py:1.2 
gnue/designer/src/base/docks/FloatingPane.py:1.3
*** gnue/designer/src/base/docks/FloatingPane.py:1.2    Fri Jun 13 17:12:32 2003
--- gnue/designer/src/base/docks/FloatingPane.py        Mon Jun 16 17:17:48 2003
***************
*** 60,67 ****
--- 60,72 ----
      if tool.uses_feedback_bar:
        self.statusbar = self.CreateStatusBar()
  
+     if tool.uses_toolbar:
+       toolbar = tool.createToolbar(self)
+       self.SetToolBar(toolbar)
+ 
  
      EVT_CLOSE(self, self.OnClose)
+     self.Refresh()
  
  ##    self.SetPosition((
  ##       RuntimeSettings.getint(self.runtime_section, 'x', -1),
***************
*** 103,109 ****
      self.Show(0)
  
    def OnClose(self, event):
!     self.instance.dispatchEvent('Hide:Tool:%s' % self.id)
      event.Veto()
  
  
--- 108,114 ----
      self.Show(0)
  
    def OnClose(self, event):
!     self.instance.dispatchEvent('Hide:Tool:%s' % self.tool.id)
      event.Veto()
  
  
Index: gnue/designer/src/base/docks/SplitDock.py
diff -c gnue/designer/src/base/docks/SplitDock.py:1.2 
gnue/designer/src/base/docks/SplitDock.py:1.3
*** gnue/designer/src/base/docks/SplitDock.py:1.2       Fri Jun 13 17:12:32 2003
--- gnue/designer/src/base/docks/SplitDock.py   Mon Jun 16 17:17:48 2003
***************
*** 135,141 ****
    #
    def remove(self, panel):
      self.panels.remove((panel._dock_index, panel))
!     panel.SetManager(None)
  
    #
    # Redock a tool panel
--- 135,141 ----
    #
    def remove(self, panel):
      self.panels.remove((panel._dock_index, panel))
!     self.refresh()
  
    #
    # Redock a tool panel