Changeset 4085

Timestamp:

05/16/08 19:39:29 (6 months ago)

Author:

ed

Message:

For some reason dHtmlBox was never added to the Class Designer code. This commit corrects that omission.

Files:

• trunk/ide/ClassDesigner.py (modified) (7 diffs)
• trunk/ide/ClassDesignerControlMixin.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" : "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):
@@ -1711 +1711 @@
-                        "PageNoTabs", "Box", "Bitmap", "BitmapButton", "Button", "CheckBox",
-                        "ComboBox", "DateTextBox", "DropdownList", "EditBox", "Editor",
-
+HtmlBox", "
-                        "RadioList", "Slider", "Spinner", "Splitter", "TextBox", "ToggleButton",
-                        "TreeView"]
@@ -1719 +1719 @@
-                        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,
@@ -2874 +2874 @@
-            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 +3088 @@
-    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 +3872 @@
-                    (_("Gauge"), dui.dGauge),
-                    (_("Grid"), dui.dGrid),
+                    (_("HtmlBox"), dui.dHtmlBox),
-                    (_("Image"), dui.dImage),
-                    (_("Label"), dui.dLabel),

trunk/ide/ClassDesignerControlMixin.py

@@ -775 +775 @@
-                "Min": {"type" : int, "readonly" : False},
-                "ShowLabels" : {"type" : bool, "readonly" : False}}
-  
+
-                "Orientation": {"type" : list, "readonly" : False,
-                    "values" : ["Horizontal", "Vertical"]},
@@ -792 +792 @@
-                    "values" : ["Upper", "Lower", "Title", "None"]},        
-                "ReadOnly" : {"type" : bool, "readonly" : False}}
+        htmlTextProps = {"HorizontalScroll": {"type" : bool, "readonly" : False},
+                "Page": {"type" : unicode, "readonly" : False},
+                "RespondToLinks": {"type" : bool, "readonly" : False},
+                "ShowScrollBars": {"type" : bool, "readonly" : False},
+                "VerticalScroll": {"type" : bool, "readonly" : False}}
-        treeProps = {"Editable" : {"type" : bool, "readonly" : False},
-                "MultipleSelect" : {"type" : bool, "readonly" : False},
@@ -960 +965 @@
-                ret.update({"PasswordEntry" : {"type" : bool, "readonly" : False},
-                        "TextLength" : {"type" : int, "readonly" : False}})
+        elif isinstance(self, dabo.ui.dHtmlBox):
+            ret.update(htmlTextProps)
-        elif isinstance(self, dabo.ui.dTimer):
-            pass