Changeset 4388

Timestamp:

08/09/08 19:30:24 (3 months ago)

Author:

ed

Message:

Updated for the name change from dFoldPanelBar to dSlidePanelControl.

Began implementing suppport for dSlidePanelControl in the Class Designer.

Files:

• trunk/ide/ClassDesigner.py (modified) (19 diffs)
• trunk/ide/ClassDesignerComponents.py (modified) (1 diff)
• trunk/ide/ClassDesignerControlMixin.py (modified) (2 diffs)
• trunk/ide/ClassDesignerEditor.py (modified) (1 diff)
• trunk/ide/ClassDesignerFormMixin.py (modified) (1 diff)
• trunk/ide/ClassDesignerPemForm.py (modified) (3 diffs)

trunk/ide/ClassDesigner.py

@@ -139 +139 @@
-                {"name" : "DropdownList", "class" : dui.dDropdownList, "order" : 70},
-                {"name" : "EditBox", "class" : dui.dEditBox, "order" : 80},
+                {"name" : "SlidePanelControl", "class" : dui.dSlidePanelControl, "order" : 82},
-                {"name" : "HtmlBox", "class" : dui.dHtmlBox, "order" : 85},
-                {"name" : "Gauge", "class" : dui.dGauge, "order" : 90},
@@ -267 +268 @@
-        dct = defVals.copy()
-        self._sizerDefaults[dui.dEditor] = dct
+        dct = defVals.copy()
+        self._sizerDefaults[dui.dSlidePanelControl] = dct
-        dct = defVals.copy()
-        dct.update({"Proportion" : 0})
@@ -345 +348 @@
-                "ListEvent", "MenuEvent", "MouseEvent", "SashEvent",
-                "CalendarEvent", "TreeEvent")
-
-ComboBox, dui.dDateTextBox, dui.dDialog, dui.dDropdownList, dui.dEditBox, 
-Editor, dui.dForm, dui.dDockForm, dui.dGauge, dui.dGrid, dui.dHtmlBox, dui.dImage, 
-abel, dui.dLine, dui.dListBox, dui.dListControl, dui.dOkCancelDialog, dui.dPanel, 
-ScrollPanel, dui.dPage, dui.dPageFrame, dui.dPageList, dui.dPageSelect
-PageFrameNoTabs, dui.dRadioList, dui.dSlider, dui.dSpinner, dui.dSplitter, dui.dTextBox, 
-oggleButton, dui.dT
+dui.dComboBox,
+DateTextBox, dui.dDialog, dui.dDropdownList, dui.dEditBox, dui.dEditor, dui.dSlidePanelControl,
+Form, dui.dDockForm, dui.dGauge, dui.dGrid, dui.dHtmlBox, dui.dImage, dui.dLabel, dui.dLine,
+istBox, dui.dListControl, dui.dOkCancelDialog, dui.dPanel, dui.dPage, dui.dScrollPanel,
+PageFrame, dui.dPageList, dui.dPageSelect, dui.dPageFrameNoTabs
+RadioList, dui.dSlider, dui.dSpinner, dui.dSplitter, dui.dTextBox, dui.dToggleButton,
+
-
-        def evtsForClass(cls):
@@ -635 +638 @@
-            # Standard directory structure; process the parent directory
-            self._initDB(os.path.dirname(currdir))
+        # We need to remove the menu bar class for now, since it isn't used at design time.
+        mbf = self._extractKey(atts, "MenuBarFile")
-        if self._reuseMainForm(useSizers=atts.get("UseSizers", False)):
-            # Original form hasn't changed, so just use it.
@@ -708 +713 @@
-        frm.Centered = True
-        frm.Visible = True
+        if mbf:
+            frm.MenuBarFile = mbf
-        # Save the initial state
-        dabo.ui.callAfter(frm.saveState)
@@ -914 +921 @@
-                isTree = issubclass(newClass, dui.dTreeView)
-                isSplitter = issubclass(newClass, dui.dSplitter)
+                isSlidePanelControl = issubclass(newClass, dui.dSlidePanelControl)
-                isPageControl = issubclass(newClass, self.pagedControls)
-                noTabs = issubclass(newClass, dui.dPageFrameNoTabs)
@@ -935 +943 @@
-                    if noTabs:
-                        del props["TabPosition"]
+                elif isSlidePanelControl:
+                    props["PanelCount"] = int(atts.get("PanelCount", "0"))
+                    try:
+                        del atts["PanelCount"]
+                    except: pass
-                elif isSplitter:
-                    ornt = self._extractKey(atts, "Orientation", "Vertical")
@@ -940 +953 @@
-                    props["createPanes"] = False
-                    atts["Split"] = False
+
-                # If we are pasting, we can get two objects with the same
-                # Name value, so change it to NameBase.
@@ -1002 +1016 @@
-                                self._srcObj = pg
-                                self.recreateChildren(pg, grandkids, None, False)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    elif isSplitter:
-                        for pos, kid in enumerate(kids):
@@ -1733 +1761 @@
-                # Create a dropdown list containing all the choices.
-                # NOTE: This would be an excellent candidate for usage ordering.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                if not _USE_DOCKFORM:
-                    # The dock form reference is position 1
@@ -2519 +2543 @@
-                            self.update()
-
-
-                dlg = PageInfoDialog(self.CurrentForm, NoTabs=noTabs,
-                        BasePrefKey=self.BasePrefKey+".PageInfoDialog")
@@ -2570 +2593 @@
-                    newCols = 3
-
+        isSlidePanelControl = issubclass(cls, dui.dSlidePanelControl)
+        if isSlidePanelControl:
+            dabo.ui.exclaim("NOT IMPLEMENTED YET")
+            return
+            # Make sure it has some panels.
+            newPanels = None
+            cnt = props.get("PanelCount", 0)
+            if not cnt:
+                try:
+                    newPanels = int(dui.getString(_("How many panels?"),
+                            _("New Slide Container"), "3"))
+                except ValueError:
+                    newPanels = 3
+                props["PanelCount"] = newPanels
+
-        if useSizers:
-            # Need to notify the tree that an update to a node will be
@@ -2595 +2633 @@
-            pcount = props["PageCount"]
-            props["PageCount"] = 0
+
+        # Delay the creation of pages
+        if isSlidePanelControl:
+            pcount = props["PanelCount"]
+            props["PanelCount"] = 0
-
-        # Make sure that the RadioList's components are Designer-aware
@@ -2674 +2717 @@
-                            pg0panel = LayoutPanel(pg)
-
+        if isSlidePanelControl:
+            pnlCls = obj.PanelClass
+            if isinstance(pnlCls, basestring):
+                # Saved class; let the control handle it
+                obj.PanelCount = pcount
+                # This is the key that marks it as a class, and not a base object.
+                prop = classFlagProp
+                for pnl in obj.Panels:
+                    pnl.Expanded = False
+                    pnl.__setattr__(prop, pnlCls)
+                pnl0panel = obj.Panels[0]
+            else:
+                pnlCtlCls = self.getControlClass(pnlCls)
+                basePanelCls = self.getControlClass(dabo.ui.dPanel)
+                obj.PanelClass = pnlCtlCls
+                obj.PanelCount = pcount
+                pnl0panel = None
+                for pnl in obj.Panels[::-1]:
+                    pnl.Expanded = False
+                    if useSizers:
+                        sz = pnl.Sizer = LayoutSizer("v")
+                        pnl0 = LayoutPanel(pnl)
+
-        if isinstance(obj, dui.dPage) and not isinstance(obj.Parent, self.pagedControls):
-            # This is a free standing page being designed. Add the sizer, if required.
@@ -2723 +2789 @@
-            if useSizers and isPageControl:
-                dui.callAfter(self.select, pg0panel)
+            elif useSizers and isSlidePanelControl:
+                dui.callAfter(self.select, pnl0)
-            else:
-                dui.callAfter(self.select, obj)
@@ -2920 +2988 @@
-            pop.append(_("Add Panel"), OnHit=self.onNewPanel)
-            pop.append(_("Add ScrollPanel"), OnHit=self.onNewScrollPanel)
+            pop.append(_("Add SlidePanelControl"), OnHit=self.onNewSlidePanelControl)
-            pop.append(_("Add Splitter"), OnHit=self.onNewSplitter)
-            mainpop.appendMenu(pop)
@@ -3114 +3183 @@
-    def onNewEditor(self, evt):
-        dui.callAfter(self.addNewControl, None, dui.dEditor)
+    def onNewSlidePanelControl(self, evt):
+        dui.callAfter(self.addNewControl, None, dui.dSlidePanelControl)
-    def onNewGauge(self, evt):
-        dui.callAfter(self.addNewControl, None, dui.dGauge)
@@ -3500 +3571 @@
-                    _("PageSelect") : self.onNewPageSelect,
-                    _("PageNoTabs") : self.onNewPageNoTabs,
+                    _("SlidePanelControl") : self.onNewSlidePanelControl,
-                    _("Slider") : self.onNewSlider,
-                    _("Spinner") : self.onNewSpinner,
@@ -3900 +3972 @@
-                    (_("DropdownList"), dui.dDropdownList),
-                    (_("EditBox"), dui.dEditBox),
+                    (_("SlidePanelControl"), dui.dSlidePanelControl),
-                    (_("Gauge"), dui.dGauge),
-                    (_("Grid"), dui.dGrid),

trunk/ide/ClassDesignerComponents.py

@@ -156 +156 @@
-                        isDefaultSize = (abs(self.Height - defHt) <= 1)
-                    if isDefaultSize:
-.
+
-                        continue
-            if prop == "BackColor" and isinstance(self, (LayoutPanel, LayoutSpacerPanel)):

trunk/ide/ClassDesignerControlMixin.py

@@ -783 +783 @@
-                "Min": {"type" : int, "readonly" : False},
-                "ShowLabels" : {"type" : bool, "readonly" : False}}
+        slidePanelControlProps = {"CollapseToBottom" : {"type" : bool, "readonly" : False},
+                "ExpandContent": {"type" : bool, "readonly" : False},
+                "PanelCount" : {"type" : int, "readonly" : True},
+                "SingleClick" : {"type" : bool, "readonly" : False},
+                "Singleton" : {"type" : bool, "readonly" : False}}
+        slidePanelProps = {
+                "BarColor1" : {"type" : "color", "readonly" : False, 
+                    "customEditor": "editColor"},
+                "BarColor2" : {"type" : "color", "readonly" : False, 
+                    "customEditor": "editColor"},
+                "BarStyle": {"type" : list, "readonly" : False,
+                    "values" : ["Borderless", "BorderOnly", "FilledBorder", "HorizontalFill", "VerticalFill"]},
+                "Border": {"type" : int, "readonly" : False},
+                "CaptionForeColor" : {"type" : "color", "readonly" : False, 
+                    "customEditor": "editColor"},
+                "PanelPosition": {"type" : int, "readonly" : False}}
-        splitterProps = {"MinimumPanelSize": {"type" : int, "readonly" : False},
-                "Orientation": {"type" : list, "readonly" : False,
@@ -957 +973 @@
-            ret.update(panelProps)
-            ret.update(colorProps)
+        elif isinstance(self, dabo.ui.dSlidePanelControl):
+            ret.update(slidePanelControlProps)
+        elif isinstance(self, dabo.ui.dSlidePanel):
+            ret.update(slidePanelProps)
+            ret.update(captionProps)
-        elif isinstance(self, dabo.ui.dSlider):
-            ret.update(sliderProps)

trunk/ide/ClassDesignerEditor.py

@@ -218 +218 @@
-        for number in [2,4,6,8,16]:
-            self._tabMenu.append(_("Tab Size %s" % number), OnHit=self.onTabSize, bmp="",
-
+       
-        self._tabMenu.Children[1].Checked = True
-

trunk/ide/ClassDesignerFormMixin.py

@@ -66 +66 @@
-        # for adding controls.
-        self._activeContainer = None
+        # The auto-binding happens too late in this case, so call
+        # this method here.
+        self.onActivate(None)
+
+
+    def _beforeInit(self, pre):
+        """Need to set this early in the process"""
-        # Convenient flag for controls determining if 
-        # they are being modified on a design surface
-        # or run interactively.
-        self.isDesignerForm = True
-
-
-
-
+
+
-    
-    def afterInit(self):

trunk/ide/ClassDesignerPemForm.py

@@ -67 +67 @@
-        tsz = tp.Sizer = dabo.ui.dSizer("v")
-
-FoldPanelBar
-Ba
-Ba
+SlidePanelControl
+Containe
+Containe
-        # This helps restore the sash position on the prop grid page
-        self._propSashPct = 80
-        # Bind to panel changes
-Bar.bindEvent(dEvents.Fold
-FoldPanel(self.mainBa
+Container.bindEvent(dEvents.Slide
+SlidePanel(self.mainContaine
-                CaptionForeColor="blue")
-FoldPanel(self.mainBa
+SlidePanel(self.mainContaine
-                CaptionForeColor="blue")
-FoldPanel(self.mainBa
+SlidePanel(self.mainContaine
-                CaptionForeColor="blue")
-
@@ -108 +108 @@
-        ps.Controller = ms.Controller = self._tree.Controller = ops.Controller = self.Controller
-        self.layout()
-Ba
+Containe
-
-    
@@ -135 +135 @@
-    def onResize(self, evt):
-        try:
-Ba
+Containe
-        except:
-Ba
+Containe
-            pass
-