dabo Commit
Revision 6984
Date: 2011-11-25 10:17:32 -0800 (Fri, 25 Nov 2011)
Author: Ed
Trac: http://trac.dabodev.com/changeset/6984
Changed:
U trunk/ide/ClassDesigner.py
U trunk/ide/ClassDesignerControlMixin.py
Log:
Added support for the dShell control.
Diff:
Modified: trunk/ide/ClassDesigner.py
===================================================================
--- trunk/ide/ClassDesigner.py 2011-11-25 18:10:58 UTC (rev 6983)
+++ trunk/ide/ClassDesigner.py 2011-11-25 18:17:32 UTC (rev 6984)
@@ -217,6 +217,7 @@
{"name" : "Page", "class" : dui.dPage, "order"
: 170},
{"name" : "Panel", "class" : dui.dPanel,
"order" : 180},
{"name" : "ScrollPanel", "class" :
dui.dScrollPanel, "order" : 190},
+ {"name" : "Shell", "class" : dabo.ui.dShell,
"order" : 195},
{"name" : "PageFrame", "class" :
dui.dPageFrame, "order" : 200},
{"name" : "PageList", "class" : dui.dPageList,
"order" : 210},
{"name" : "PageSelect", "class" :
dui.dPageSelect, "order" : 220},
@@ -321,7 +322,7 @@
dui.dLed, dui.dLine, dui.dListBox,
dui.dListControl, dui.dMaskedTextBox,
dui.dOkCancelDialog, dui.dPanel, dui.dPage,
dui.dScrollPanel, dui.dPage, dui.dPageFrame,
dui.dPageList, dui.dPageSelect,
- dui.dPageStyled, dui.dPageFrameNoTabs,
dui.dRadioList, dui.dSlider,
+ dui.dPageStyled, dui.dPageFrameNoTabs,
dui.dRadioList, dabo.ui.dShell, dui.dSlider,
dui.dSpinner, dui.dSplitter, dui.dTextBox,
dui.dToggleButton, dui.dTreeView,
dlgs.Wizard, dlgs.WizardPage)
try:
@@ -1996,7 +1997,7 @@
dui.dDateTextBox,
dui.dDropdownList, dui.dEditBox, dui.dEditor,
dui.dGauge, dui.dGrid,
dui.dHtmlBox, dui.dImage, dui.dLabel, dui.dLine,
dui.dLed, dui.dListBox,
dui.dListControl, dui.dMaskedTextBox,
- dui.dPage, dui.dRadioList,
dui.dSlider, dui.dSpinner,
+ dui.dPage, dui.dRadioList,
dabo.ui.dShell, dui.dSlider, dui.dSpinner,
dui.dSplitter, dui.dTextBox,
dui.dToggleButton, dui.dTreeView]
try:
keys += (dui.dMediaControl, )
@@ -3258,6 +3259,7 @@
pop.append(_("Add BitmapButton"),
OnHit=self.onNewBitmapButton)
pop.append(_("Add Button"), OnHit=self.onNewButton)
pop.append(_("Add Gauge"), OnHit=self.onNewGauge)
+ pop.append(_("Add Interactive Shell"),
OnHit=self.onNewShell)
pop.append(_("Add Slider"), OnHit=self.onNewSlider)
pop.append(_("Add TreeView"), OnHit=self.onNewTreeView)
mainpop.appendMenu(pop)
@@ -3479,8 +3481,6 @@
dui.callAfter(self.addNewControl, None, dui.dRadioList)
def onNewPanel(self, evt):
dui.callAfter(self.addNewControl, None, dui.dPanel)
- def onNewScrollPanel(self, evt):
- dui.callAfter(self.addNewControl, None, dui.dScrollPanel)
def onNewPageFrame(self, evt):
dui.callAfter(self.addNewControl, None, dui.dPageFrame)
def onNewPageList(self, evt):
@@ -3491,6 +3491,10 @@
dui.callAfter(self.addNewControl, None, dui.dPageStyled)
def onNewPageNoTabs(self, evt):
dui.callAfter(self.addNewControl, None, dui.dPageFrameNoTabs)
+ def onNewScrollPanel(self, evt):
+ dui.callAfter(self.addNewControl, None, dui.dScrollPanel)
+ def onNewShell(self, evt):
+ dui.callAfter(self.addNewControl, None, dabo.ui.dShell)
def onNewSlider(self, evt):
dui.callAfter(self.addNewControl, None, dui.dSlider)
def onNewSpinner(self, evt):
@@ -4281,6 +4285,7 @@
(_("PageStyled"), dui.dPageStyled),
(_("PageNoTabs"), dui.dPageFrameNoTabs),
(_("RadioList"), dui.dRadioList),
+ (_("Shell"), dabo.ui.dShell),
(_("Slider"), dui.dSlider),
(_("Spinner"), dui.dSpinner),
(_("Splitter"), dui.dSplitter),
Modified: trunk/ide/ClassDesignerControlMixin.py
===================================================================
--- trunk/ide/ClassDesignerControlMixin.py 2011-11-25 18:10:58 UTC (rev
6983)
+++ trunk/ide/ClassDesignerControlMixin.py 2011-11-25 18:17:32 UTC (rev
6984)
@@ -724,7 +724,8 @@
dataProps = {"DataSource": {"type": unicode, "readonly": False},
"DataField": {"type": unicode, "readonly":
False},
"Value": {"type": "multi", "readonly": False}}
- editorProps = {"ShowCallTips": {"type": bool, "readonly":
False},
+ editorProps = {"CommentString": {"type": unicode, "readonly":
False},
+ "ShowCallTips": {"type": bool, "readonly":
False},
"ShowCodeFolding": {"type": bool, "readonly":
False},
"ShowEOL": {"type": bool, "readonly": False},
"ShowLineNumbers": {"type": bool, "readonly":
False},
@@ -849,7 +850,8 @@
"CaptionForeColor": {"type": "color",
"readonly": False,
"customEditor": "editColor"},
"PanelPosition": {"type": int, "readonly":
False}}
- splitterProps = {"MinimumPanelSize": {"type": int, "readonly":
False},
+ splitterProps = {"CanUnsplit": {"type": bool, "readonly":
False},
+ "MinimumPanelSize": {"type": int, "readonly":
False},
"Orientation": {"type": list, "readonly": False,
"values": ["Horizontal", "Vertical"]},
"PanelClass": {"type": unicode, "readonly":
False},
@@ -1047,6 +1049,8 @@
ret.update(panelProps)
ret.update(scrollProps)
ret.update(colorProps)
+ elif isinstance(self, dui.dShell):
+ ret.update(fontProps)
elif isinstance(self, dui.dPanel):
ret.update(panelProps)
ret.update(colorProps)
_______________________________________________
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]
