Changeset 3206

Timestamp:

06/22/07 16:18:04 (2 years ago)

Author:

dj

Message:

Applied Ticket #1065 (Tab Grouping)

Files:

• dj/dabo/ui/uiwx/__init__.py (modified) (1 diff)
• dj/dabo/ui/uiwx/dTabGroup.py (added)
• dj/dabo/ui/uiwx/uiApp.py (modified) (4 diffs)

dj/dabo/ui/uiwx/__init__.py

@@ -132 +132 @@
-from dSplitter import dSplitter
-from dStatusBar import dStatusBar
+from dTabGroup import dTabGroup
-from dTextBox import dTextBox
-from dTimer import dTimer

dj/dabo/ui/uiwx/uiApp.py

@@ -149 +149 @@
-        self._mruMaxItems = 12
-        wx.InitAllImageHandlers()
+
+        #Atribute used by CustomTabOrder Property
+        self._tabOrder = dabo.ui.dTabGroup()
+        self._useTabOrder = False
-
-
@@ -796 +800 @@
-            self.ActiveForm.refresh()
-
+    def onNav(self, evt):
+        self._tabOrder.setCurrent(self.ActiveForm.FindFocus())
+        if evt.GetDirection():
+            self._tabOrder.next()
+        else:
+            self._tabOrder.prev()
+
-
-    def _getActiveForm(self):
@@ -807 +818 @@
-
-
+    def _getTabOrder(self):
+        return self._tabOrder
+
+    def _setTabOrder(self, val):
+        if not isinstance(val, dabo.ui.dTabGroup):
+            raise ValueError("CustomTabOrder must be an instance of dabo.ui.dTabGroup")
+
+        self._tabOrder = val
+
+
-    def _getDrawSizerOutlines(self):
-        return self._drawSizerOutlines
@@ -814 +835 @@
-
-
+    def _getUseTabOrder(self):
+        return self._useTabOrder
+
+    def _setUseTabOrder(self, val):
+        if val:
+            self.Bind(wx.EVT_NAVIGATION_KEY, self.onNav)
+        else:
+            self.Unbind(wx.EVT_NAVIGATION_KEY)
+
+
-    ActiveForm = property(_getActiveForm, _setActiveForm, None,
-            _("Returns the form that currently has focus, or None.  (dForm)" ) )
-
+    TabOrder = property(_getTabOrder, _setTabOrder, None,
+            _("Returns the Custom Tab Order (dTabGroup)") )
+
-    DrawSizerOutlines = property(_getDrawSizerOutlines, _setDrawSizerOutlines, None,
-            _("Determines if sizer outlines are drawn on the ActiveForm.  (bool)") )
-
+    UseTabOrder = property(_getUseTabOrder, _setUseTabOrder, None,
+            _("Determins if we should use a custom Tab Order or not.  (bool)") )
+