Changeset 4425

Timestamp:

08/21/08 05:29:47 (3 months ago)

Author:

ed

Message:

Fixed Trac Issue #1165: opening a saved form does not correctly restore the size of that form.

Fixed a bug in the ClassDesignerEditor? that made it hard to delete a method just by deleting the body of the method.

Fixed the cause of most of the sources that caused the message: "None PROP DICT:, ROW=..." to print out while starting the Class Designer. It was mostly the result of an overzealous wx.Grid trying to determine CanGetValueAs?() when the grid was empty. IOW, not an error condition, and thus doesn't merit the output. There are still some timing issues when creating sizers; I've suppressed that output under the verboseLogging setting because it is simpler than getting into the underpinnings of sizer creation.

Added some additional support for dSlidePanelControl. It still is not 100% solid, but at least it's somewhat workable for now.

Files:

• trunk/ide/ClassDesigner.py (modified) (8 diffs)
• trunk/ide/ClassDesignerControlMixin.py (modified) (4 diffs)
• trunk/ide/ClassDesignerEditor.py (modified) (2 diffs)
• trunk/ide/ClassDesignerPropSheet.py (modified) (4 diffs)

trunk/ide/ClassDesigner.py

@@ -671 +671 @@
-        self.CurrentForm = frm
-        frm._classFile = pth
-frm.SaveRestorePosition = 
+
-        if isFormClass:
-            # See if there is any code associated with the form
@@ -836 +836 @@
-                defAtts.update(dictStringify(atts))
-                atts = defAtts
-
+
+
+
+
+
-                if classID:
-                    sz.classID = classID
@@ -1030 +1034 @@
-                            if grandkids:
-                                self._srcObj = pnl
-g
+nl
-                    elif isSplitter:
-                        for pos, kid in enumerate(kids):
@@ -1542 +1546 @@
-                    obj = pgf.Pages[-1]
-                    cleanup = "pgf.PageCount = %s" % pp
+                if issubclass(cls, dui.dSlidePanel) and isinstance(srcObj.Parent,
+                        dui.dSlidePanelControl):
+                    spc = srcObj.Parent
+                    pp = spc.PanelCount
+                    spc.PanelCount += 1
+                    obj = spc.Panels[-1]
+                    cleanup = "spc.PanelCount = %s" % pp
-                elif issubclass(cls, dui.dColumn):
-                    grd = srcObj.Parent
@@ -1558 +1569 @@
-            if cleanup:
-                exec cleanup in locals()
-
-
+
-                # Pages will be released by their parent.
-                obj.release()
@@ -2595 +2605 @@
-        isSlidePanelControl = issubclass(cls, dui.dSlidePanelControl)
-        if isSlidePanelControl:
-            dabo.ui.exclaim("NOT IMPLEMENTED YET")
-            return
-            # Make sure it has some panels.
-            newPanels = None
@@ -2738 +2746 @@
-                    if useSizers:
-                        sz = pnl.Sizer = LayoutSizer("v")
+                        sz.Parent = pnl
-                        pnl0 = LayoutPanel(pnl)
-
@@ -3406 +3415 @@
-            itm = None
-        if itm:
+            if isinstance(newSizer.Parent, dabo.ui.dSlidePanel):
+                #This is the main sizer
+                itm = None
+        if itm:
-            if sizerAtts:
-                if isSpacer:

trunk/ide/ClassDesignerControlMixin.py

@@ -85 +85 @@
-        elif isinstance(self, dabo.ui.dImage):
-            self.bindEvent(dEvents.Resize, self._onResize)
+        elif isinstance(self, (dabo.ui.dSlidePanelControl, dabo.ui.dSlidePanel)):
+            pass
-        else:
-            # This removes all previously-defined bindings
@@ -113 +115 @@
-            # Bind the active page to the current selection
-            self.bindEvent(dEvents.PageChanged, self.desSelectPage)
+        elif isinstance(self, dabo.ui.dSlidePanel): 
+            self.bindEvent(dEvents.SlidePanelChange, self.desSlidePanelChg)
-        elif isinstance(self, (dabo.ui.dPanel, dabo.ui.dImage, dabo.ui.dBitmap,
-                dabo.ui.dBitmapButton, dabo.ui.dToggleButton)):
@@ -133 +137 @@
-            self.Form.createControlHandles(self)
-#       self.bindKey("left", self.Form.keyMoveLeft)
-
-
+
+
-    def _insertPageOverride(self, pos, pgCls=None, caption="", imgKey=None,
-            makeActive=False, ignoreOverride=False):
@@ -466 +470 @@
-        """Called when a node in a tree is selected"""
-        self.Form.selectControl(self.Selection, False)
-
-
+
+
+
+
+
+
-    def moveControl(self, pos, shft=False):
-        """ Wraps the Move command with the necessary

trunk/ide/ClassDesignerEditor.py

@@ -273 +273 @@
-        
-    def _getMethodBase(self, mthd, isEvt):
-\n\t" % mthd, "def %s(self, evt):\n\t
+" % mthd, "def %s(self, evt):
-        if isEvt is None:
-            return cd
@@ -545 +545 @@
-        mthd = ed.Method
-        mb = self._getMethodBase(mthd, None)
-
+
+
-        obj = ed.Object
-        objCode = rep.get(obj)

trunk/ide/ClassDesignerPropSheet.py

@@ -709 +709 @@
-            return None
-        try:
- 
+
-        except KeyError, e:
-            print "PROP DICT ERROR: >%s<, row=%s" % (prop, row)
@@ -717 +717 @@
-        super(PropertyGrid, self).fillGrid(force)
-        # Set the renderers and editors manually by cell
+        if not self.Application.Selection:
+            return
-        valColumn = self.Columns[1]
-        for row in range(self.RowCount):
@@ -752 +754 @@
-            ret = typ in ("str", "string", "unicode", "u")
-        else:
+            if not self.Application.Selection:
+                return type(None)
-            pd = self.getPropDictForRow(row)
-            
-            if not isinstance(pd, dict):
-                if pd is None:
-
+
+
+
-                else:
-                    print _("BAD PROP DICT:"), pd, type(pd), _("ROW="), row
@@ -810 +816 @@
-        if col is None:
-            col = self.CurrentColumn
+        if not self.Application.Selection:
+            self.CurrentRow = self.CurrentColumn = 0
+            return
-        pd = self.getPropDictForRow(row)
-        if pd is None: