dabo Commit
Revision 6450
Date: 2011-02-19 06:44:03 -0800 (Sat, 19 Feb 2011)
Author: Ed
Trac: http://trac.dabodev.com/changeset/6450
Changed:
U trunk/dabo/settings.py
U trunk/dabo/ui/uiwx/dDateTextBox.py
U trunk/dabo/ui/uiwx/dSizerMixin.py
Log:
Unmerging files I did not intend to commit
Diff:
Modified: trunk/dabo/settings.py
===================================================================
--- trunk/dabo/settings.py 2011-02-19 14:37:03 UTC (rev 6449)
+++ trunk/dabo/settings.py 2011-02-19 14:44:03 UTC (rev 6450)
@@ -104,8 +104,7 @@
defaultFontSize = 10
# Default language to use when none is specified
-#defaultLanguage = "en"
-defaultLanguage = "zz"
+defaultLanguage = "en"
# Default encoding to use when none is specified
defaultEncoding = "utf-8"
Modified: trunk/dabo/ui/uiwx/dDateTextBox.py
===================================================================
--- trunk/dabo/ui/uiwx/dDateTextBox.py 2011-02-19 14:37:03 UTC (rev 6449)
+++ trunk/dabo/ui/uiwx/dDateTextBox.py 2011-02-19 14:44:03 UTC (rev 6450)
@@ -77,7 +77,7 @@
self.continueAtBoundary = True
# Do we display a button on the right side for activating the
calendar?
### TODO: still needs a lot of work to display properly.
- self.showCalButton = True
+ self.showCalButton = False
# Do we display datetimes in 24-hour clock, or with AM/PM?
self.ampm = False
# Do we use the extended format for the calendar display?
@@ -92,10 +92,10 @@
self.Value = None ## If it is still blank, default to
None so the control works correctly
if self.showCalButton:
# Create a button that will display the calendar
- self.calButton = dabo.ui.dBitmapButton(self.Parent,
Picture="downArrow",
- DownPicture="downTriangleBlack",
Size=(self.Height, self.Height),
- Left=self.Right,
OnHit=self._onCalButton)
+ self.calButton = dButton(self.Parent,
Size=(self.Height, self.Height),
+ Right=self.Right, Caption="V")
self.calButton.Visible = True
+ self.calButton.bindEvent(dEvents.Hit, __onBtnClick)
# Tooltip help
self._defaultToolTipText = _("""Available Keys:
@@ -129,12 +129,13 @@
""" Display a calendar to allow users to select dates."""
self.showCalendar()
-
- def _onCalButton(self,evt):
+ def __onBtnClick(self,evt):
""" Display a calendar to allow users to select dates."""
self.showCalendar()
+
+
def showCalendar(self):
if self.ReadOnly:
# ignore
@@ -146,6 +147,9 @@
fp.show()
+
+
+
def __onChar(self, evt):
""" If a shortcut key was pressed, process that. Otherwise, eat
inappropriate characters.
@@ -457,12 +461,5 @@
if __name__ == "__main__":
- class TestForm(dabo.ui.dForm):
- def afterInit(self):
- self.datetext = dDateTextBox(self,
Value=datetime.date.today())
- self.Sizer.append(self.datetext, halign="center",
border=25)
-
- app = dabo.dApp(MainFormClass=TestForm)
- app.start()
-# import test
-# test.Test().runTest(dDateTextBox)
+ import test
+ test.Test().runTest(dDateTextBox)
Modified: trunk/dabo/ui/uiwx/dSizerMixin.py
===================================================================
--- trunk/dabo/ui/uiwx/dSizerMixin.py 2011-02-19 14:37:03 UTC (rev 6449)
+++ trunk/dabo/ui/uiwx/dSizerMixin.py 2011-02-19 14:44:03 UTC (rev 6450)
@@ -149,7 +149,6 @@
# If compressed to .pyo, __doc__ will be None.
pass
-
def layout(self):
"""Layout the items in the sizer.
@@ -179,7 +178,6 @@
# If compressed to .pyo, __doc__ will be None.
pass
-
def remove(self, itm, destroy=None):
"""This will remove the item from the sizer. It will not cause
the item to be destroyed unless the 'destroy' parameter is True.
@@ -223,7 +221,6 @@
else:
itm = self.Insert(pos, spacer, proportion=proportion,
userData=self)
itm.setSpacing = itm.SetSpacer
- itm._controllingSizer = self
return itm
_______________________________________________
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]
