Changeset 4534

Timestamp:

09/28/08 13:47:36 (2 months ago)

Author:

ed

Message:

Fixed some issues that affected the behavior of wizards in the Class Designer.

Files:

• trunk/ide/ClassDesigner.py (modified) (3 diffs)
• trunk/ide/ClassDesignerComponents.py (modified) (1 diff)

trunk/ide/ClassDesigner.py

@@ -1109 +1109 @@
-            code = pgDct.get("code", {})
-            propDefs = pgDct.get("properties", {})
+            # Remove any unneeded properties
+            pgDct.pop("sizerInfo", None)
+            pgDct.pop("Width", None)
+            pgDct.pop("Height", None)
-            try:
-                imp, clsname = nm.rsplit(".", 1)
@@ -1129 +1133 @@
-            mixClass = self.getControlClass(cls)
-            wizpage = frm.append(mixClass(pp, attProperties=atts))
+#           wizpage.AlwaysResetSizer = True
-            for mthd, cd in code.items():
-                if not self._codeDict.get(wizpage):
@@ -1147 +1152 @@
-            # The slot count before adding controls should be 4.
-            # Add any additional slots.
-slots - 4
+4 - len(wizSizer.Children)
-            if newslots > 0:
-                wizSizer.SlotCount += newslots
-            self._srcObj = wizpage.Sizer.ChildWindows[-1]
-            self.recreateChildren(wizpage, kids, wizpage.Sizer, True, debug=1)
+#           wizpage.iterateCall("layout", resetMin=True)
-        self._srcObj = saveSrc
-

trunk/ide/ClassDesignerComponents.py

@@ -147 +147 @@
-                continue
-            if isinstance(self, dabo.ui.dLabel) and prop in ("Width", "Height"):
+                # If the width/height is controlled by the sizer, don't save it.
+                csz = self.ControllingSizer
+                szornt = csz.Orientation
+                exp = csz.getItemProp(self, "Expand")
+                prptn = csz.getItemProp(self, "Proportion")
+                if szornt == "Horizontal":
+                    if (prop == "Width") and (prptn > 0):
+                        continue
+                    elif (prop == "Height") and exp:
+                        continue
+                elif szornt == "Vertical":
+                    if (prop == "Width") and exp:
+                        continue
+                    elif (prop == "Height") and (prptn > 0):
+                        continue
-                # Don't copy the size if AutoSize=True and the width is close to the default size.
-                if self.AutoResize: