Changeset 4316

Timestamp:

07/23/08 16:20:31 (1 month ago)

Author:

ed

Message:

Moved the FloatingPanel? code into dDialog and dFormMixin, so that it is available in all form classes.

Fixed an unhandled exception in dDateTextBox.

Fixed a bug in the execute command in dPref.

Added some convenience attributes to dKeys.

Files:

• trunk/dabo/dPref.py (modified) (1 diff)
• trunk/dabo/ui/uiwx/dDateTextBox.py (modified) (1 diff)
• trunk/dabo/ui/uiwx/dDialog.py (modified) (3 diffs)
• trunk/dabo/ui/uiwx/dForm.py (modified) (5 diffs)
• trunk/dabo/ui/uiwx/dFormMixin.py (modified) (4 diffs)
• trunk/dabo/ui/uiwx/dKeys.py (modified) (1 diff)

trunk/dabo/dPref.py

@@ -425 +425 @@
-        else:
-            param = "%"
-param
+(param,)
-        rs = crs.getDataSet()
-        vs = [itm.values()[0] for itm in rs]

trunk/dabo/ui/uiwx/dDateTextBox.py

@@ -151 +151 @@
-                else:
-                    key = {8: "h", 13: "m", 19: "s"}[evt.keyCode]
-KeyError
+(KeyError, AttributeError)
-            # spurious key event; ignore
-            return

trunk/dabo/ui/uiwx/dDialog.py

@@ -9 +9 @@
-from dabo.dLocalize import _
-import dFormMixin as fm
+import dPemMixin as pm
-from dabo.ui import makeDynamicProperty
-
@@ -519 +520 @@
-        self._baseClass = dOkCancelDialog
-
+
+
-class dYesNoDialog(dStandardButtonDialog):
-    def __init__(self, parent=None, properties=None, *args, **kwargs):
@@ -527 +530 @@
-
-
+
+class _FloatDialog(dDialog):
+    def __init__(self, owner, *args, **kwargs):
+        self._above = None
+        self._owner = None
+        kwargs["Borderless"] = True
+        kwargs["FloatOnParent"] = True
+        super(_FloatDialog, self).__init__(*args, **kwargs)
+
+
+    def clear(self):
+        """Releases any controls remaining from a previous usage."""
+        self.Sizer.clear(True)
+
+
+    def show(self):
+        # position by owner
+        if self.Owner is None:
+            self.Centered = True
+        else:
+            self.Centered = None
+            left, top = self.Owner.absoluteCoordinates()
+            self.Left = left
+            if self.Above:
+                self.Bottom = top
+            else:
+                self.Top = top + self.Owner.Height
+        # Make sure that we're within the display limits
+        maxW, maxH = dabo.ui.getDisplaySize()
+        self.Left = max(5, self.Left)
+        self.Top = max(5, self.Top)
+        self.Right = min(self.Right, maxW-5)
+        self.Bottom = min(self.Bottom, maxH-5)
+        super(_FloatDialog, self).show()
+        
+
+    def _getAbove(self):
+        return self._above
+
+    def _setAbove(self, val):
+        if self._constructed():
+            self._above = val
+        else:
+            self._properties["Above"] = val
+
+
+    def _getOwner(self):
+        return self._owner
+
+    def _setOwner(self, val):
+        if self._constructed():
+            self._owner = val
+        else:
+            self._properties["Owner"] = val
+
+
+    Above = property(_getAbove, _setAbove, None,
+            _("Is this dialog positioned above its owner? Default=False  (bool)"))
+
+    Owner = property(_getOwner, _setOwner, None,
+            _("Control which is currently managing this window.  (varies)"))
+
+
+
+
+
+
+
+
-if __name__ == "__main__":
-    import test

trunk/dabo/ui/uiwx/dForm.py

@@ -14 +14 @@
-
-
-class _FloatDialog(dDialog):
-    def __init__(self, owner, *args, **kwargs):
-        self._above = None
-        self._owner = None
-        kwargs["Borderless"] = True
-        kwargs["FloatOnParent"] = True
-        super(_FloatDialog, self).__init__(*args, **kwargs)
-
-
-    def clear(self):
-        """Releases any controls remaining from a previous usage."""
-        self.Sizer.clear(True)
-
-
-    def show(self):
-        # position by owner
-        if self.Owner is None:
-            self.Centered = True
-        else:
-            self.Centered = None
-            left, top = self.Owner.absoluteCoordinates()
-            self.Left = left
-            if self.Above:
-                self.Bottom = top
-            else:
-                self.Top = top + self.Owner.Height
-        # Make sure that we're within the display limits
-        maxW, maxH = dabo.ui.getDisplaySize()
-        self.Left = max(5, self.Left)
-        self.Top = max(5, self.Top)
-        self.Right = min(self.Right, maxW-5)
-        self.Bottom = min(self.Bottom, maxH-5)
-        super(_FloatDialog, self).show()
-        
-
-    def _getAbove(self):
-        return self._above
-
-    def _setAbove(self, val):
-        if self._constructed():
-            self._above = val
-        else:
-            self._properties["Above"] = val
-
-
-    def _getOwner(self):
-        return self._owner
-
-    def _setOwner(self, val):
-        if self._constructed():
-            self._owner = val
-        else:
-            self._properties["Owner"] = val
-
-
-    Above = property(_getAbove, _setAbove, None,
-            _("Is this dialog positioned above its owner? Default=False  (bool)"))
-
-    Owner = property(_getOwner, _setOwner, None,
-            _("Control which is currently managing this window.  (varies)"))
-
-
-
-class BaseForm(fm.dFormMixin):
-    """Creates a bizobj-aware form.
@@ -86 +23 @@
-        self.bizobjs = {}
-        self._primaryBizobj = None
-        self._floatingPanel = None
-        
-        # If this is True, a panel will be automatically added to the
@@ -146 +82 @@
-            self.activeControlValid()
-            ret = self.confirmChanges()
-        if self._floatingPanel:
-            self._floatingPanel.release()
-        if ret:
-            ret = super(BaseForm, self)._beforeClose(evt)
@@ -863 +797 @@
-        
-
-    def _getFloatingPanel(self):
-        if not self._floatingPanel:
-            self._floatingPanel = _FloatDialog(self)
-        return self._floatingPanel
-
-
-    def _getPrimaryBizobj(self):
-        """The attribute '_primaryBizobj' should be a bizobj, but due
@@ -928 +856 @@
-            box asking whether to save changes, discard changes, or cancel the 
-            operation that led to the dialog being presented.""") )
-
-    FloatingPanel = property(_getFloatingPanel, None, None,
-            _("""Small modal dialog that is designed to be used for temporary displays, 
-            similar to context menus, but which can contain any controls.  
-            (read-only) (dDialog)"""))
-
-    PrimaryBizobj = property(_getPrimaryBizobj, _setPrimaryBizobj, None, 

trunk/dabo/ui/uiwx/dFormMixin.py

@@ -23 +23 @@
-        # double-activation is no longer an issue.
-        self._skipActivate = (wx.VERSION < (2,7) and self.Application.Platform == "Win")
-
-        self._cxnFile = ""
-        self._cxnName = ""
-        self._connection = None
+        self._floatingPanel = None
+
-        # Extract the menu definition file, if any
-        self._menuBarFile = self._extractKey((properties, attProperties, kwargs), 
@@ -363 +364 @@
-        hook method.
-        """
+        if self._floatingPanel:
+            self._floatingPanel.release()
-        ret = self.beforeClose(evt)
-        return ret
@@ -659 +662 @@
-    def _setCxnName(self, val):
-        self._cxnName = val
+
+
+    def _getFloatingPanel(self):
+        if not self._floatingPanel:
+            # Have to import it here, as it requires that dFormMixin be defined.
+            from dDialog import _FloatDialog
+            self._floatingPanel = _FloatDialog(self)
+        return self._floatingPanel
-
-
@@ -1022 +1033 @@
-            _("Name of the connection used for data access  (str)"))
-    
+    FloatingPanel = property(_getFloatingPanel, None, None,
+            _("""Small modal dialog that is designed to be used for temporary displays, 
+            similar to context menus, but which can contain any controls.  
+            (read-only) (dDialog)"""))
+
-    FloatOnParent = property(_getFloatOnParent, _setFloatOnParent, None,
-            _("Specifies whether the form stays on top of the parent or not."))

trunk/dabo/ui/uiwx/dKeys.py

@@ -150 +150 @@
-    "cmd": mod_Cmd,
-}
+
+arrows = (key_Up, key_Down, key_Left, key_Right)
+whitespace = (key_Tab, key_Space, key_Numpad_space, key_Numpad_tab)
-
-## pkm: I didn't include all the keycodes below - I want to see what is