Changeset 4079

Timestamp:

05/12/08 06:39:42 (3 months ago)

Author:

ed

Message:

Began implementing toolbar support for dDockForm, but for the life of me I can't see a difference between toolbars and any other panes. Added the 'Toolbar' property that returns True if the pane is a toolbar.

Added the '_Manager' property to _dDockPanel. Previously the only reference to the AUI manager available was through the form.

Fixed several naming conflict issues. Besides the wxPython requirement of siblings having unique names, the AUI stuff requires that each managed pane be uniquely named (they are actually children of the floating pane window).

Fixed some issues with some properties not being set; adding them to the delayed properties resolved that.

Added support for saving and restoring the layout of a dDockForm when SaveRestorePosition? is True. This is still not working as smoothly as possible; if you change the properties passed to a _dDockPanel, restoring the layout also restores the old property settings.

Tried to implement DynamicCaption? as a proof of concept for Dynamic* props, but there is no way to tie into the AUI events such as docking and undocking, so this is marginal at best right now.

Added the 'ShowActivePanel?' and 'TransparentDrag?' properties to dDockForm. When the former is True, the 'active' panel's title bar will be hilited. When TransparentDrag? is True, the panel being dragged assumes a semi-transparent appearance.

Fixed the form's update(), as it wasn't propagating to the panels.

Files:

• trunk/dabo/ui/uiwx/dDockForm.py (modified) (35 diffs)

trunk/dabo/ui/uiwx/dDockForm.py

@@ -10 +10 @@
-from dabo.ui import makeDynamicProperty
-
+flag_allow_float = aui.AUI_MGR_ALLOW_FLOATING
+flag_show_active = aui.AUI_MGR_ALLOW_ACTIVE_PANE
+flag_transparent_drag = aui.AUI_MGR_TRANSPARENT_DRAG
+flag_rectangle_hint = aui.AUI_MGR_RECTANGLE_HINT
+flag_transparent_hint = aui.AUI_MGR_TRANSPARENT_HINT
+flag_venetian_blinds_hint = aui.AUI_MGR_VENETIAN_BLINDS_HINT
+flag_no_venetian_blinds_fade = aui.AUI_MGR_NO_VENETIAN_BLINDS_FADE
+flag_hint_fade = aui.AUI_MGR_HINT_FADE
+
-
-class _dDockManager(aui.AuiManager):
-    def __init__(self, win):
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        pi = PaneInfo()
+        if toolbar:
+            pi.ToolbarPane()
-        if name is not None:
-            pi = pi.Name(name)
@@ -46 +65 @@
-class _dDockPanel(dabo.ui.dPanel):
-    def __init__(self, parent, properties=None, attProperties=None, *args, **kwargs):
-
+
+
+
+
-        pcapUp = self._extractKey(kwargs, "Caption", "")
-        pcap = self._extractKey(kwargs, "caption", "")
-        ptype = self._extractKey(kwargs, "typ", "")
-        kwargs["NameBase"] = pname
-        if pcapUp:
-            kwargs["Caption"] = pcapUp
@@ -56 +77 @@
-            kwargs["Caption"] = pcap
-        self._paramType = ptype
+        self._toolbar = self._extractKey(kwargs, "Toolbar", False)
-        
-        # Initialize attributes that underly properties
@@ -80 +102 @@
-            self._floatingSize = self.GetParent().GetSize().Get()
-    
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    def float(self):
-        """Float the panel if it isn't already floating."""
@@ -86 +134 @@
-            return
-        self.__pi.Float()
-Form._refreshState
+_updateAUI
-        
-        
@@ -104 +152 @@
-                dabo.errorLog.write(_("Invalid dock position: '%s'.") % side)
-        inf.Dock()
-Form._refreshState
+_updateAUI
-            
-        
@@ -114 +162 @@
-        """
-        self._propDelayDict = {}
-
-
-
+
+
+
+
+
+
+
+
+
-                self._propDelayDict[delayed] = val
-        return super(_dDockPanel, self)._beforeSetProperties(props)
-        
-        
-
+
+
-        frm = self.Form
-frm._mgr.addPane(self, name=props["NameBase"]
-props["Caption"]
+self._Manager.addPane(self, name=nm
+self._propDelayDict.get("Caption", "_dDockPanel")
-        del self._paramType
-        self.__pi.MinSize((50,50))
-        super(_dDockPanel, self)._setProperties(props)
-
-
-    def _afterSetProperties(self):
-        if self._propDelayDict:
-            self.setProperties(self._propDelayDict)
-        del self._propDelayDict
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    def __getPosition(self):
-        if self.Floating:
@@ -173 +247 @@
-        if self._constructed():
-            self.__pi.BottomDockable(val)
-Form._refreshState
+_updateAUI
-        else:
-            self._properties["BottomDockable"] = val
-
-
-    def _getCaption(self):
@@ -189 +262 @@
-            self._caption = val
-            self.__pi.Caption(val)
-Form._refreshState
+_updateAUI
-        else:
-            self._properties["Caption"] = val
@@ -201 +274 @@
-            self._destroyOnClose = val
-            self.__pi.DestroyOnClose(val)
-Form._refreshState
+_updateAUI
-        else:
-            self._properties["DestroyOnClose"] = val
@@ -213 +286 @@
-            self._dockable = val
-            self.__pi.Dockable(val)
-
+
+
+
-        else:
-            self._properties["Dockable"] = val
@@ -232 +307 @@
-                chg = True
-            if chg:
-Form._refreshState
+_updateAUI
-        else:
-            self._properties["Docked"] = val
@@ -244 +319 @@
-            vUp = val[0].upper()
-            self.__pi.dock_direction = {"T": 1, "R": 2, "B": 3, "L": 4}[vUp]
-Form._refreshState
+_updateAUI
-        else:
-            self._properties["DockSide"] = val
@@ -256 +331 @@
-            self._floatable = val
-            self.__pi.Floatable(val)
-Form._refreshState
+_updateAUI
-        else:
-            self._properties["Floatable"] = val
@@ -275 +350 @@
-                chg = True
-            if chg:
-
-
-
+
+
-            self._properties["Floating"] = val
-
@@ -415 +489 @@
-        if self._constructed():
-            self.__pi.LeftDockable(val)
-Form._refreshState
+_updateAUI
-        else:
-            self._properties["LeftDockable"] = val
+
+
+    def _getManager(self):
+        try:
+            mgr = self._mgr
+        except AttributeError:
+            mgr = self._mgr = self.Form._mgr
+        return mgr
-
-
@@ -427 +509 @@
-            self._movable = val
-            self.__pi.Movable(val)
-Form._refreshState
+_updateAUI
-        else:
-            self._properties["Movable"] = val
@@ -439 +521 @@
-            self._resizable = val
-            self.__pi.Resizable(val)
-Form._refreshState
+_updateAUI
-        else:
-            self._properties["Resizable"] = val
@@ -463 +545 @@
-        if self._constructed():
-            self.__pi.RightDockable(val)
-Form._refreshState
+_updateAUI
-        else:
-            self._properties["RightDockable"] = val
@@ -475 +557 @@
-            self._showBorder = val
-            self.__pi.PaneBorder(val)
-Form._refreshState
+_updateAUI
-        else:
-            self._properties["ShowBorder"] = val
@@ -487 +569 @@
-            self._showCaption = val
-            self.__pi.CaptionVisible(val)
-Form._refreshState
+_updateAUI
-        else:
-            self._properties["ShowCaption"] = val
@@ -515 +597 @@
-            self._showGripper = val
-            self.__pi.Gripper(val)
-Form._refreshState
+_updateAUI
-        else:
-            self._properties["ShowGripper"] = val
@@ -527 +609 @@
-            self._showMaximizeButton = val
-            self.__pi.MaximizeButton(val)
-Form._refreshState
+_updateAUI
-        else:
-            self._properties["ShowMaximizeButton"] = val
@@ -539 +621 @@
-            self._showMinimizeButton = val
-            self.__pi.MinimizeButton(val)
-Form._refreshState
+_updateAUI
-        else:
-            self._properties["ShowMinimizeButton"] = val
@@ -551 +633 @@
-            self._showPinButton = val
-            self.__pi.PinButton(val)
-Form._refreshState
+_updateAUI
-        else:
-            self._properties["ShowPinButton"] = val
+
+
+
+    def _getToolbar(self):
+        return self._toolbar
-
-
@@ -575 +662 @@
-        if self._constructed():
-            self.__pi.TopDockable(val)
-Form._refreshState
+_updateAUI
-        else:
-            self._properties["TopDockable"] = val
@@ -586 +673 @@
-        if self._constructed():
-            self.__pi.Show(val)
-Form._refreshState
+_updateAUI
-        else:
-            self._properties["Visible"] = val
@@ -666 +753 @@
-            _("Can the panel be docked to the left edge of the form? Default=True  (bool)"))
-
+    _Manager = property(_getManager, None, None,
+            _("Reference to the AUI manager (for internal use only).  (_dDockManager)"))
+
-    Movable = property(_getMovable, _setMovable, None,
-            _("Can the panel be moved (True, default), or is it in a fixed position (False).  (bool)"))
@@ -699 +789 @@
-            _("Does the panel display a pin button when floating? Default=False  (bool)"))
-
+    Toolbar = property(_getToolbar, None, None,
+            _("Returns True if this is a Toolbar pane. Default=False  (bool)"))
+
-    Top = property(_getTop, _setTop, None,
-            _("Position in pixels of the top side of the panel. Read-only when docked; read-write when floating  (int)"))
@@ -711 +804 @@
-            _("Position in pixels of the width of the panel. Read-only when docked; read-write when floating  (int)"))
-
+
+    DynamicCaption = makeDynamicProperty(Caption)
-    
-        
@@ -716 +811 @@
-class dDockForm(dabo.ui.dForm):
-    def _afterInit(self):
+        self._inUpdate = False
-        self._mgr = mgr = _dDockManager(self)
-        pc = self.getBasePanelClass()
-        self._centerPanel = pc(self, name="CenterPanel", typ="center")
-        self._centerPanel.Sizer = dabo.ui.dSizer("v")
+        self._panels = {}
-        super(dDockForm, self)._afterInit()
-        self.bindEvent(dEvents.Destroy, self.__onDestroy)
@@ -726 +823 @@
-    def __onDestroy(self, evt):
-        if self._finito:
+            # Need to save this here, since we can't respond to all layout changes.
+            self.saveSizeAndPosition()
-            self._mgr.UnInit()
+
-    
-    def getBasePanelClass(cls):
@@ -736 +836 @@
-        ok = isinstance(evt.child, (_dDockPanel, dabo.ui.dStatusBar, dabo.ui.dShell.dShell))
-        if not ok:
-
+
+
-        
-        
-    def addObject(self, classRef, Name=None, *args, **kwargs):
+        """To support the old addObject() syntax, we need to re-direct the request
+        to the center panel.
+        """
-        self._centerPanel.addObject(classRef, Name=Name, *args, **kwargs)
-        
-    
-    def addPanel(self, *args, **kwargs):
+        """Adds a dockable panel to the form."""
-        pnl = _dDockPanel(self, *args, **kwargs)
-        self._refreshState()
+        # Store the pane info
+        nm = pnl.getState()[0]
+        self._panels[pnl] = nm
-        return pnl
-
-
+
+
-    def _refreshState(self, interval=None):
-        if self._finito:
@@ -757 +865 @@
-            self._mgr.Update()
-        else:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -766 +908 @@
-
-
+    def _getShowActivePanel(self):
+        return bool(self._mgr.GetFlags() & flag_show_active)
+
+    def _setShowActivePanel(self, val):
+        if self._constructed():
+            self._transparentDrag = val
+            flags = self._mgr.GetFlags()
+            if val:
+                newFlags = flags | flag_show_active
+            else:
+                newFlags = flags & ~flag_show_active
+            self._mgr.SetFlags(newFlags)
+        else:
+            self._properties["ShowActivePanel"] = val
+
+
+    def _getTransparentDrag(self):
+        return bool(self._mgr.GetFlags() & flag_transparent_drag)
+
+    def _setTransparentDrag(self, val):
+        if self._constructed():
+            self._transparentDrag = val
+            flags = self._mgr.GetFlags()
+            if val:
+                newFlags = flags | flag_transparent_drag
+            else:
+                newFlags = flags & ~flag_transparent_drag
+            self._mgr.SetFlags(newFlags)
+        else:
+            self._properties["TransparentDrag"] = val
+
+
-    CenterPanel = property(_getCenterPanel, None, None,
-            _("Reference to the center (i.e., non-docking) panel. (read-only) (dPanel)"))
-
-
+
+
+
+
+
+
-
-
-
-class _dDockForm_test(dDockForm):
+    def initProperties(self):
+        self.SaveRestorePosition = False
+        self.Size = (700, 500)
+
-    def afterInit(self):
-_dDockPanel(self, 
-'m Floating!", Top=70, Left=1
-_dDockPanel(self, Floating=False
+self.addPanel(
+nitially Floating", Top=70, Left=2
+self.addPanel(Floating=False, Caption="Initially Docked"
-                ShowCaption=False, ShowPinButton=True, ShowCloseButton=False,
-                ShowGripper=True)
-
-
-
-
+
+
+
+
+
+
+
-        self.fp.DynamicCaption = self.capForOrange
-
-
-    def capForOrange(self):
+        print "CAPFOR", self.fp.Docked
-        state = "Floating"
-        if self.fp.Docked:
-            state = "Docked"
+        print "STATE", state
-        return "I'm %s!" % state
-        
-    
-    def onTestFP(self, evt):
-        self.printTest(self.fp)