dabo Commit
Revision 6027
Date: 2010-09-22 14:29:37 -0700 (Wed, 22 Sep 2010)
Author: Ed
Trac: http://trac.dabodev.com/changeset/6027
Changed:
U trunk/ide/ClassDesigner.py
Log:
Fixed some issues that resulted from the recent refactoring of the
addNewControl() method
Diff:
Modified: trunk/ide/ClassDesigner.py
===================================================================
--- trunk/ide/ClassDesigner.py 2010-09-22 21:19:01 UTC (rev 6026)
+++ trunk/ide/ClassDesigner.py 2010-09-22 21:29:37 UTC (rev 6027)
@@ -2666,9 +2666,10 @@
if not pg.Sizer or not
isinstance(pg.Sizer, (LayoutSizer, LayoutBorderSizer, LayoutGridSizer)):
pg.Sizer = LayoutSizer("v")
pg0panel = LayoutPanel(pg)
+ return pg0panel
- def _afterAddNewControlSlidePanel(self, obj, classFlagProp):
+ def _afterAddNewControlSlidePanel(self, obj, classFlagProp, pcount,
useSizers):
pnlCls = obj.PanelClass
if isinstance(pnlCls, basestring):
# Saved class; let the control handle it
@@ -2678,19 +2679,20 @@
for pnl in obj.Panels:
pnl.Expanded = False
pnl.__setattr__(prop, pnlCls)
- pnl0panel = obj.Panels[0]
+ pnl0 = obj.Panels[0]
else:
pnlCtlCls = self.getControlClass(pnlCls)
basePanelCls = self.getControlClass(dabo.ui.dPanel)
obj.PanelClass = pnlCtlCls
obj.PanelCount = pcount
- pnl0panel = None
+ pnl0 = None
for pnl in obj.Panels[::-1]:
pnl.Expanded = False
if useSizers:
sz = pnl.Sizer = LayoutSizer("v")
sz.Parent = pnl
pnl0 = LayoutPanel(pnl)
+ return pnl0
def addNewControl(self, pnl, cls, props=None, attProperties=None,
@@ -2899,9 +2901,9 @@
elif issubclass(cls, dlgs.WizardPage):
self._afterAddNewControlWizardPage(obj)
elif isPageControl:
- self._afterAddNewControlPaged(obj, pcount,
classFlagProp, pgCls, useSizers)
+ pg0panel = self._afterAddNewControlPaged(obj, pcount,
classFlagProp, pgCls, useSizers)
elif isSlidePanelControl:
- self._afterAddNewControlSlidePanel(obj, classFlagProp,
pnlCtlCls)
+ pnl0 = self._afterAddNewControlSlidePanel(obj,
classFlagProp, pcount, useSizers)
if isinstance(obj, dui.dPage) and not isinstance(obj.Parent,
self.pagedControls):
# This is a free standing page being designed. Add the
sizer, if required.
_______________________________________________
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]
