daboide Commit
Revision 813
Date: 2007-03-17 12:34:34 -0700 (Sat, 17 Mar 2007)
Author: Ed
Trac: http://svn.dabodev.com/trac/daboide/changeset/813
Changed:
U trunk/ClassDesigner.py
U trunk/ClassDesignerSizerPalette.py
Log:
Added a bunch of changes to get the SizerPalette working on Gtk. There are some
issues with dToolForm (a.k.a wx.MiniFrame) resizing, so I switched to a dForm
for the palette when running on Gtk.
Diff:
Modified: trunk/ClassDesigner.py
===================================================================
--- trunk/ClassDesigner.py 2007-03-16 23:48:24 UTC (rev 812)
+++ trunk/ClassDesigner.py 2007-03-17 19:34:34 UTC (rev 813)
@@ -3686,10 +3686,12 @@
if not self._sizerPalette:
noPalette = True
if noPalette:
+ defSz = (300,800)
sp = self._sizerPalette = SizerPaletteForm(None,
Caption=_("Sizer Settings"),
BasePrefKey=self.BasePrefKey+".SizerPaletteForm",
- Controller = self)
+ Controller = self, Size=defSz)
+ dabo.ui.callAfter(self._sizerPalette.select, self.Selection)
return self._sizerPalette
Modified: trunk/ClassDesignerSizerPalette.py
===================================================================
--- trunk/ClassDesignerSizerPalette.py 2007-03-16 23:48:24 UTC (rev 812)
+++ trunk/ClassDesignerSizerPalette.py 2007-03-17 19:34:34 UTC (rev 813)
@@ -6,7 +6,6 @@
import dabo.dEvents as dEvents
from ClassDesignerComponents import LayoutSpacerPanel
-
class ContentBoxSizerPanel(dui.dPanel):
def afterInit(self):
sz = dui.dGridSizer(maxCol=2, hgap=8, vgap=5)
@@ -163,7 +162,7 @@
sz.append(ctl)
lbl = dui.dLabel(self, Caption=_("MaxDimension"))
ctl = dui.dDropdownList(self, DataField="MaxDimension",
- Choices=["C", "R"])
+ Choices=["C", "R"], Value="C")
sz.append(lbl, halign="right")
sz.append(ctl)
@@ -210,12 +209,14 @@
self.SelectedPage = self.gridPage
else:
self.SelectedPage = self.boxPage
+
self.Visible = (obj is not None)
self.update()
self.SelectedPage.setAll("DataSource", obj, filt="Enabled is
True")
- dabo.ui.callAfterInterval(100, self.layout)
+ #dabo.ui.callAfterInterval(100, self.layout)
+ self.layout()
+
-
class SizerSelfFrame(SizerInfoFrame):
boxClass = BoxSizerSelfPanel
gridClass = GridSizerSelfPanel
@@ -239,7 +240,6 @@
def afterInit(self):
self.Sizer = dui.dBorderSizer(self, "v", Caption=self._cap)
-# self.Sizer = dui.dSizer("v")
self.pgf = self.pgfClass(self)
self.Sizer.append(self.pgf, halign="center")
self.DynamicVisible = self.notBlank
@@ -260,9 +260,23 @@
class SizerSelfPanel(AbstractSizerPanel):
pgfClass = SizerSelfFrame
_cap = _("Sizer Settings")
-
+
class SizerPaletteForm(dui.dToolForm):
+ def __init__(self, *args, **kwargs):
+ if self.Application.Platform == "GTK":
+ # There are some serious issues with resizing the
dToolForm on Gtk,
+ # so use a plain form instead
+ SizerPaletteForm.__bases__ = (dui.dForm,)
+ kwargs["ShowStatusBar"] = False
+ kwargs["ShowMaxButton"] = False
+ kwargs["ShowMinButton"] = False
+ kwargs["TinyTitleBar"] = True
+ super(SizerPaletteForm, self).__init__(*args, **kwargs)
+
+ def beforeInit(self):
+ self.MenuBarClass = None
+
def afterInit(self):
self.currObj = None
self.inFitToSizer = False
@@ -301,6 +315,7 @@
def _delayedLayout(self):
self.lockDisplay()
super(SizerPaletteForm, self).layout()
+
self.inFitToSizer = True
self.fitToSizer()
self.inFitToSizer = False
_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev
