Changeset 3049

Timestamp:

04/10/2007 03:50:56 PM (1 year ago)

Author:

nate

Message:

Modified the test classes to use the same dApp and dForm fixture. In other words, they won't be torn down each time we test a new widget.

Here is implementation 1 of dSearchBox. It works and the functionality is there. However, I still need to address the following:

1)I still need to work with the list class some to autogenerate the menu from a list and tie the menu event into a search event.

2) The CancelButtonVisible? property is half broken. I will fix it in dabo. If you set the property to True in initProperties, wx reports a memory leak. However, in afterInit and beyond it is ok. I will override the property and fix it.

3) Need to look into the SearchButtonVisible? property because it ain't working for me on windows. The search button is always visible. Guess it's not too much of an issue, but I would like to know why it is happening.

Files:

• branches/NateBranch/dabo/dEvents.py (modified) (2 diffs)
• branches/NateBranch/dabo/ui/uiwx/__init__.py (modified) (1 diff)
• branches/NateBranch/dabo/ui/uiwx/dTextBox.py (modified) (4 diffs)
• branches/NateBranch/tests/unitTests/ui/UIwx/Test_dTextBox.py (modified) (1 diff)
• branches/NateBranch/tests/unitTests/ui/UIwx/__init__.py (modified) (2 diffs)

branches/NateBranch/dabo/dEvents.py

@@ -190 +190 @@
-
-
+class SearchEvent(dEvent):
+    def appliesToClass(eventClass, objectClass):
+        return issubclass(objectClass, dabo.ui.dSearchBox)
+    appliesToClass = classmethod(appliesToClass)
+
+
+
-class CalendarEvent(dEvent):
-    def appliesToClass(eventClass, objectClass):
@@ -511 +518 @@
-
-
+class SearchButtonClicked(SearchEvent):
+    """Occurs when a user clicks the search button in a dSearchBox control."""
+    pass
+
+class SearchCancelButtonClicked(SearchEvent):
+    """Occurs when a user clicks the cancel button in a dSearchBox control."""
+    pass
+
+
-class CalendarDateChanged(CalendarEvent):
-    """Occurs when the date on a calendar is changed."""

branches/NateBranch/dabo/ui/uiwx/__init__.py

@@ -122 +122 @@
-from dPageFrameNoTabs import dPageFrameNoTabs
-from dPage import dPage
+from dSearchBox import dSearchBox
-from dSizer import dSizer
-from dBorderSizer import dBorderSizer

branches/NateBranch/dabo/ui/uiwx/dTextBox.py

@@ -1 @@
-import re
-import datetime
-import wx
-import dabo.lib.dates
-
-try:
-    import decimal
-except ImportError:
-    # decimal is only in Python 2.4 or greater
-    decimal = None
-
-import dabo, dabo.ui
@@ -15 +6 @@
-
-import dTextBoxMixin as tbm
-from dabo.dLocalize import _
-import dabo.dEvents as dEvents
-from dabo.ui import makeDynamicProperty
-
-
-class dTextBox(tbm.dTextBoxMixin, wx.TextCtrl):
@@ -28 +15 @@
-        tbm.dTextBoxMixin.__init__(self, preClass, parent, properties, attProperties, 
-                *args, **kwargs)
-
-
+
-
-
@@ -39 +25 @@
-if __name__ == "__main__":
-    import test
+    import datetime
-
-    # This test sets up several textboxes, each editing different data types.   

branches/NateBranch/tests/unitTests/ui/UIwx/Test_dTextBox.py

@@ -22 +22 @@
-#NOTE:  It would be really good if we could extract all of this out so we don't have
-#       to do it for every single widget test
-
-
-
-
+
+
-
-#Set up a base class that handle the set up and tear down of a semi-persistant test fixture

branches/NateBranch/tests/unitTests/ui/UIwx/__init__.py

@@ -4 +4 @@
-
-import unittest
+import dabo
+dabo.ui.loadUI('wx')
+
+#We want the dApp and mainForm to persist through the settings for speed sake
+#NOTE:  It would be really good if we could extract all of this out so we don't have
+#       to do it for every single widget test
+App = dabo.dApp()
+App.setup()
+
+testForm = dabo.ui.dForm()
+
-
-#suiteList should contain all of the suite that are recieved from the modules and TestCases
@@ -14 +25 @@
-import Test_dTextBox
-suiteList.append(unittest.TestLoader().loadTestsFromModule(Test_dTextBox))
+Test_dTextBox.App = App
+Test_dTextBox.testForm = testForm
+
-#import Test_dSearchBox
-#suiteList.append(unittest.TestLoader().loadTestsFromModule(Test_dSearchBox))
+#Test_dSearchBox.App = App
+#Test_dSearchBox.testForm = testForm
-
-#setup a suite and return it