dabo Commit
Revision 4085
Date: 2008-05-16 19:39:29 -0700 (Fri, 16 May 2008)
Author: Ed
Trac: http://svn.dabodev.com/trac/dabo/changeset/4085
Changed:
U trunk/ide/ClassDesigner.py
U trunk/ide/ClassDesignerControlMixin.py
Log:
For some reason dHtmlBox was never added to the Class Designer code. This
commit corrects that omission.
Diff:
Modified: trunk/ide/ClassDesigner.py
===================================================================
--- trunk/ide/ClassDesigner.py 2008-05-15 13:27:23 UTC (rev 4084)
+++ trunk/ide/ClassDesigner.py 2008-05-17 02:39:29 UTC (rev 4085)
@@ -138,6 +138,7 @@
{"name" : "DateTextBox", "class" :
dui.dDateTextBox, "order" : 60},
{"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},
{"name" : "Image", "class" : dui.dImage,
"order" : 110},
@@ -343,14 +344,13 @@
baseEvents = ("DataEvent", "EditorEvent", "GridEvent",
"KeyEvent",
"ListEvent", "MenuEvent", "MouseEvent",
"SashEvent",
"CalendarEvent", "TreeEvent")
- classes = (dui.dBox, dui.dBitmap, dui.dBitmapButton,
dui.dButton, dui.dCheckBox,
- dui.dComboBox, dui.dDateTextBox, dui.dDialog,
dui.dDropdownList,
- dui.dEditBox, dui.dEditor, dui.dForm,
dui.dDockForm, dui.dGauge, dui.dGrid, dui.dImage,
- dui.dLabel, dui.dLine, dui.dListBox,
dui.dListControl, dui.dOkCancelDialog,
- dui.dPanel, dui.dPage, dui.dScrollPanel,
dui.dPage, dui.dPageFrame,
- dui.dPageList, dui.dPageSelect,
dui.dPageFrameNoTabs, dui.dRadioList,
- dui.dSlider, dui.dSpinner, dui.dSplitter,
dui.dTextBox, dui.dToggleButton,
- dui.dTreeView, dlgs.Wizard, dlgs.WizardPage)
+ classes = (dui.dBox, dui.dBitmap, dui.dBitmapButton,
dui.dButton, dui.dCheckBox,
+ dui.dComboBox, dui.dDateTextBox, dui.dDialog,
dui.dDropdownList, dui.dEditBox,
+ dui.dEditor, dui.dForm, dui.dDockForm,
dui.dGauge, dui.dGrid, dui.dHtmlBox, dui.dImage,
+ dui.dLabel, dui.dLine, dui.dListBox,
dui.dListControl, dui.dOkCancelDialog, dui.dPanel,
+ dui.dPage, dui.dScrollPanel, dui.dPage,
dui.dPageFrame, dui.dPageList, dui.dPageSelect,
+ dui.dPageFrameNoTabs, dui.dRadioList,
dui.dSlider, dui.dSpinner, dui.dSplitter, dui.dTextBox,
+ dui.dToggleButton, dui.dTreeView, dlgs.Wizard,
dlgs.WizardPage)
def evtsForClass(cls):
ret = []
@@ -1710,7 +1710,7 @@
"Wizard", "WizardPage",
"PageFrame", "PageList", "PageSelect",
"PageNoTabs", "Box", "Bitmap",
"BitmapButton", "Button", "CheckBox",
"ComboBox", "DateTextBox",
"DropdownList", "EditBox", "Editor",
- "Gauge", "Grid", "Image",
"Label", "Line", "ListBox", "ListControl", "Page",
+ "Gauge", "Grid", "HtmlBox",
"Image", "Label", "Line", "ListBox", "ListControl", "Page",
"RadioList", "Slider",
"Spinner", "Splitter", "TextBox", "ToggleButton",
"TreeView"]
keys = [dui.dForm, dui.dDockForm, dui.dPanel,
dui.dScrollPanel, dui.dDialog,
@@ -1718,7 +1718,7 @@
dui.dPageFrame, dui.dPageList,
dui.dPageSelect, dui.dPageFrameNoTabs,
dui.dBox, dui.dBitmap,
dui.dBitmapButton, dui.dButton, dui.dCheckBox,
dui.dComboBox,
dui.dDateTextBox, dui.dDropdownList, dui.dEditBox,
- dui.dEditor, dui.dGauge,
dui.dGrid, dui.dImage, dui.dLabel, dui.dLine,
+ dui.dEditor, dui.dGauge,
dui.dGrid, dui.dHtmlBox, dui.dImage, dui.dLabel, dui.dLine,
dui.dListBox, dui.dListControl,
dui.dPage, dui.dRadioList, dui.dSlider,
dui.dSpinner, dui.dSplitter,
dui.dTextBox, dui.dToggleButton,
dui.dTreeView]
@@ -2873,6 +2873,7 @@
pop.append(_("Add DropdownList"),
OnHit=self.onNewDropdownList)
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)
pop.append(_("Add RadioList"),
OnHit=self.onNewRadioList)
@@ -3086,6 +3087,8 @@
dui.callAfter(self.addNewControl, None, dui.dGauge)
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)
def onNewLabel(self, evt):
@@ -3868,6 +3871,7 @@
(_("EditBox"), dui.dEditBox),
(_("Gauge"), dui.dGauge),
(_("Grid"), dui.dGrid),
+ (_("HtmlBox"), dui.dHtmlBox),
(_("Image"), dui.dImage),
(_("Label"), dui.dLabel),
(_("Line"), dui.dLine),
Modified: trunk/ide/ClassDesignerControlMixin.py
===================================================================
--- trunk/ide/ClassDesignerControlMixin.py 2008-05-15 13:27:23 UTC (rev
4084)
+++ trunk/ide/ClassDesignerControlMixin.py 2008-05-17 02:39:29 UTC (rev
4085)
@@ -774,7 +774,7 @@
sliderProps = {"Max": {"type" : int, "readonly" : False},
"Min": {"type" : int, "readonly" : False},
"ShowLabels" : {"type" : bool, "readonly" :
False}}
- splitterProps = { "MinimumPanelSize": {"type" : int,
"readonly" : False},
+ splitterProps = {"MinimumPanelSize": {"type" : int, "readonly"
: False},
"Orientation": {"type" : list, "readonly" :
False,
"values" : ["Horizontal", "Vertical"]},
"PanelClass" : {"type" : unicode, "readonly" :
False},
@@ -791,6 +791,11 @@
"ForceCase": {"type" : list, "readonly" : False,
"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},
"ShowButtons" : {"type" : bool, "readonly" :
False},
@@ -959,6 +964,8 @@
if isinstance(self, dabo.ui.dTextBox):
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
elif isinstance(self, dabo.ui.dToggleButton):
_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev
Searchable Archives: http://leafe.com/archives/search/dabo-dev
This message: http://leafe.com/archives/byMID/[EMAIL PROTECTED]
