Changeset 4132

Timestamp:

06/14/08 08:30:34 (4 months ago)

Author:

ed

Message:

Incorporated changes from the trunk into this branch

Files:

• branches/ed-ide/components/ClassDesigner/ClassDesigner.py (modified) (11 diffs)
• branches/ed-ide/components/ClassDesigner/ClassDesignerComponents.py (modified) (17 diffs)
• branches/ed-ide/components/ClassDesigner/ClassDesignerControlMixin.py (modified) (6 diffs)
• branches/ed-ide/components/ClassDesigner/ClassDesignerFormMixin.py (modified) (2 diffs)
• branches/ed-ide/components/ClassDesigner/ClassDesignerPropSheet.py (modified) (1 diff)

branches/ed-ide/components/ClassDesigner/ClassDesigner.py

@@ -139 +139 @@
-                {"name" : "DropdownList", "class" : dui.dDropdownList, "order" : 70},
-                {"name" : "EditBox", "class" : dui.dEditBox, "order" : 80},
+                {"name" : "HtmlBox", "class" : dui.dHtmlBox, "order" : 85},
-                {"name" : "Gauge", "class" : dui.dGauge, "order" : 90},
-                {"name" : "Grid", "class" : dui.dGrid, "order" : 100},
@@ -344 +345 @@
-                "ListEvent", "MenuEvent", "MouseEvent", "SashEvent",
-                "CalendarEvent", "TreeEvent")
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-        def evtsForClass(cls):
-
-
-
-
-
+
-                try:
-
-
-
-
+
+
+
+
+
-            ret.sort()
-            return ret
@@ -808 +805 @@
-                slots = int(self._extractKey(atts, "SlotCount", "1"))
-                useBox, boxCaption = None, None
+#               defSpacing = int(self._extractKey(atts, "DefaultSpacing", "0"))
-                if clsname == "LayoutBorderSizer":
-                    useBox = True
@@ -815 +813 @@
-                szCont = sz.ControllingSizer
-                itm = sz.ControllingSizerItem
-
+
+
+
+
+
+
-                is2D = isinstance(szCont, dabo.ui.dGridSizer)
-                defaults = {True: szItemDefaults[2],
@@ -1711 +1714 @@
-                        "PageNoTabs", "Box", "Bitmap", "BitmapButton", "Button", "CheckBox",
-                        "ComboBox", "DateTextBox", "DropdownList", "EditBox", "Editor",
-
+HtmlBox", "
-                        "RadioList", "Slider", "Spinner", "Splitter", "TextBox", "ToggleButton",
-                        "TreeView"]
@@ -1719 +1722 @@
-                        dui.dBox, dui.dBitmap, dui.dBitmapButton, dui.dButton, dui.dCheckBox,
-                        dui.dComboBox, dui.dDateTextBox, dui.dDropdownList, dui.dEditBox,
-
+HtmlBox, dui.d
-                        dui.dListBox, dui.dListControl, dui.dPage, dui.dRadioList, dui.dSlider,
-                        dui.dSpinner, dui.dSplitter, dui.dTextBox, dui.dToggleButton,
@@ -2048 +2051 @@
-                if adding:
-                    prop = data["propName"]
-
+
+
+
-                    self._classPropDict[obj] = {}
-                # Make sure that there are no single quotes in the comment
@@ -2533 +2538 @@
-            props["ColumnClass"] = self.getControlClass(dui.dColumn)
-            newCols = None
-
+
+
+
-                try:
-                    newCols = int(dui.getString(_("How many columns?"),
-                            _("New Grid Control"), "3"))
-
+ ValueError
-                    newCols = 3
-
@@ -2874 +2881 @@
-            pop.append(_("Add EditBox"), OnHit=self.onNewEditBox)
-            pop.append(_("Add Grid"), OnHit=self.onNewGrid)
+            pop.append(_("Add HtmlBox"), OnHit=self.onNewHtmlBox)
-            pop.append(_("Add ListBox"), OnHit=self.onNewListBox)
-            pop.append(_("Add ListControl"), OnHit=self.onNewListControl)
@@ -3087 +3095 @@
-    def onNewGrid(self, evt):
-        dui.callAfter(self.addNewControl, None, dui.dGrid)
+    def onNewHtmlBox(self, evt):
+        dui.callAfter(self.addNewControl, None, dui.dHtmlBox)
-    def onNewImage(self, evt):
-        dui.callAfter(self.addNewControl, None, dui.dImage)
@@ -3869 +3879 @@
-                    (_("Gauge"), dui.dGauge),
-                    (_("Grid"), dui.dGrid),
+                    (_("HtmlBox"), dui.dHtmlBox),
-                    (_("Image"), dui.dImage),
-                    (_("Label"), dui.dLabel),

branches/ed-ide/components/ClassDesigner/ClassDesignerComponents.py

@@ -61 +61 @@
-                try:
-                    myID = self.classID.split("-")[1]
-
+ IndexError
-                    myID = abs(self.__hash__())
-                if classID is None:
@@ -67 +67 @@
-                    try:
-                        classID = self.Parent.classID.split("-")[0]
-
+ IndexError
-                        # Try the sizer
-                            try:
-                                classID = self.ControllingSizer.classID.split("-")[0]
-
+ IndexError
-                                classID = "?????"
-                ra["classID"] = "%s-%s" % (classID, myID)
@@ -107 +107 @@
-            ra["designerClass"] = self.getClassName()
-
-
-
+
-        # We want to include some props whether they are the
-        # default or not.
@@ -179 +178 @@
-            # If it hasn't changed from the default, skip it
-            if not allProps:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-            if isinstance(val, basestring):
@@ -208 +210 @@
-            itmProps = self.ControllingSizer.getItemProps(self.ControllingSizerItem)
-            if insideClass:
-
+, direct=True
-            else:
-                itmDiffProps = self._diffSizerItemProps(itmProps, self.ControllingSizer)
-#               try:
-#                   defProps = self.Controller.getDefaultSizerProps(self.superControl)
-#                   itmDiffProps = self._diffSizerItemProps(itmProps, defProps, direct=True)
-#               except:
-#                   itmDiffProps = self._diffSizerItemProps(itmProps, self.ControllingSizer)
-            ret["attributes"]["sizerInfo"] = itmDiffProps
-        except AttributeError:
@@ -236 +233 @@
-    def _diffSizerItemProps(self, dct, szOrDict, direct=False):
-        """Remove all of the default values from the sizer item props."""
-
-
-
+
+
+
+
+
+
-        if isinstance(self, LayoutPanel):
-            defaults["Expand"] = True
@@ -377 +377 @@
-                                if cd["attributes"]["classID"] == kidID][0]
-                    except StandardError, e:
-None
-
-pass
+{}
+ AttributeError
+kidDict = {}
-
-            ret.append(kid.getDesignerDict(itemNum=numItems,
@@ -420 +420 @@
-                                if cd["attributes"]["classID"] == szID][0]
-                    except StandardError, e:
-None
-
-pass
+{}
+ AttributeError
+szDict = {}
-            ret.append(sz.getDesignerDict(itemNum=len(ret), classDict=szDict))
-        return ret
@@ -496 +496 @@
-        try:
-            self._defaultSizerProps = self.ControllingSizer.getItemProps(self)
-
+ AttributeError
-            self._defaultSizerProps = {}
-        
@@ -886 +886 @@
-        try:
-            sizerAtts = self.getDesignerDict()["attributes"]["sizerInfo"]
-
+ KeyError
-            sizerAtts = None
-        cs.remove(self)
@@ -946 +946 @@
-class LayoutSizerMixin(LayoutSaverMixin):
-    def __init__(self, *args, **kwargs):
+        self.isDesignerSizer = True
-        super(LayoutSizerMixin, self).__init__(*args, **kwargs)
-
@@ -998 +999 @@
-                defProps = self.Controller.getDefaultSizerProps(kidItem.superControl)
-                itmDiffDict = self._diffSizerItemProps(itmDict, defProps, direct=True)
-
+ AttributeError
-                itmDiffDict = self._diffSizerItemProps(itmDict, self)
-            if kidItem in self.ChildWindows:
@@ -1009 +1010 @@
-                                    if cd["attributes"]["classID"] == winID][0]
-                        except StandardError, e:
-None
-
-pass
+{}
+ AttributeError
+winDict = {}
-                kidDict = kidItem.getDesignerDict(itemNum=numItems,
-                        classDict=winDict)
@@ -1024 +1025 @@
-                                    if cd["attributes"]["classID"] == szrID][0]
-                        except StandardError, e:
-None
-
-pass
+{}
+ AttributeError
+szrDict = {}
-                kidDict = kidItem.getDesignerDict(itemNum=numItems,
-                        classDict=szrDict)
@@ -1036 +1037 @@
-                else:
-                    pos = 0
-
+
+
+
+
-                kidDict = {"name" : "Spacer",
-                    "attributes" : {"size" : spc, "Name" : "spacer"},
@@ -1164 +1168 @@
-                "DefaultBorderTop": {"type" : bool, "readonly" : False},
-                "DefaultBorderBottom": {"type" : bool, "readonly" : False},
+                "DefaultSpacing": {"type" : int, "readonly" : False},
-                "SlotCount" : {"type": int, "readonly" : False}}
-        # Add the controlling sizer props, if applicable
@@ -1529 +1534 @@
-            except StandardError, e:
-                ret = None
-
+ AttributeError
-            pass
-        return ret

branches/ed-ide/components/ClassDesigner/ClassDesignerControlMixin.py

@@ -746 +746 @@
-        imageProps = {"ScaleMode" : {"type" : list, "readonly" : False,
-                    "values" : ["Clip", "Proportional", "Stretch"]}}
+        labelProps = {"AutoResize": {"type" : bool, "readonly" : False}}
-        multiSelectProps = {"MultipleSelect": {"type" : bool, "readonly" : False}}
-        nodeProps = {"Image": {"type" : "path", "readonly" : False, 
-                    "customEditor": "editStdPicture"}}
-
-
+
+
+
+
-        pictureProps = {"Picture": {"type" : "path", "readonly" : False, 
-                    "customEditor": "editStdPicture"}}
@@ -775 +778 @@
-                "Min": {"type" : int, "readonly" : False},
-                "ShowLabels" : {"type" : bool, "readonly" : False}}
-  
+
-                "Orientation": {"type" : list, "readonly" : False,
-                    "values" : ["Horizontal", "Vertical"]},
@@ -792 +795 @@
-                    "values" : ["Upper", "Lower", "Title", "None"]},        
-                "ReadOnly" : {"type" : bool, "readonly" : False}}
+        htmlTextProps = {"Page": {"type" : unicode, "readonly" : False},
+                "RespondToLinks": {"type" : bool, "readonly" : False},
+                "ShowScrollBars": {"type" : bool, "readonly" : False},
+                "Source": {"type" : unicode, "readonly" : False}}
+        scrollProps = {"HorizontalScroll": {"type" : bool, "readonly" : False},
+                "VerticalScroll": {"type" : bool, "readonly" : False}}
-        treeProps = {"Editable" : {"type" : bool, "readonly" : False},
-                "MultipleSelect" : {"type" : bool, "readonly" : False},
@@ -878 +887 @@
-            ret.update(imageProps)
-        elif isinstance(self, dabo.ui.dLabel):
+            ret.update(labelProps)
-            ret.update(colorProps)
-            ret.update(captionProps)
@@ -937 +947 @@
-        elif isinstance(self, dabo.ui.dScrollPanel):
-            ret.update(panelProps)
+            ret.update(scrollProps)
-            ret.update(colorProps)
-        elif isinstance(self, dabo.ui.dPanel):
@@ -960 +971 @@
-                ret.update({"PasswordEntry" : {"type" : bool, "readonly" : False},
-                        "TextLength" : {"type" : int, "readonly" : False}})
+        elif isinstance(self, dabo.ui.dHtmlBox):
+            ret.update(htmlTextProps)
+            ret.update(scrollProps)
-        elif isinstance(self, dabo.ui.dTimer):
-            pass

branches/ed-ide/components/ClassDesigner/ClassDesignerFormMixin.py

@@ -484 +484 @@
-        # IOErrorrror that the calling method can catch.
-        open(fname, "wb").write(xml)
-
-
-
+
+
+
+
+
+
+
-            open(cfName, "wb").write(self._createDesignerCode(codeDict))
-        if currForm:
@@ -1002 +1006 @@
-        if ctl is None:
-            return
-if self.handles.has_key(ctl)
+try
-            hnd = self.handles[ctl]
-   for nm,h in hnd.items()
-   h.Visible = False
-       if release
-       h.release()
+except KeyError
+return
+for nm,h in hnd.items()
+h.Visible = False
-            if release:
-
+
+
+
-
-

branches/ed-ide/components/ClassDesigner/ClassDesignerPropSheet.py

@@ -319 +319 @@
-            dabo.ui.stop(_("Could not set property '%s' to value '%s'\nReason: '%s'") 
-                    % (prop, val, e))
-       
+
-
-