Changeset 4166

Timestamp:

06/19/08 18:10:44 (4 months ago)

Author:

ed

Message:

Removed the ReleaseOnEscape? property from dDialog. Added the CancelOnEscape? property to dStandardButtonDialog; when this is True (default), pressing the Escape key will be handled by the appropriate standard button handler.

Re-instituted the ButtonSizerPosition? property.

Deprecated onOK() and onCancel(). The methods that will be used by developers to react to standard buttons being clicked are now named run*; e.g., runOK(), runHelp().

Fixed a bug that has been around in dDialog for years. It used to be that pressing the Escape key destroyed the dialog if ReleaseOnEscape? was True; the code in the class would still try to access the now-destroyed object, throwing an error. Now dialogs are never destroyed in these classes; if you create them, you have to manually call their release() method.

Files:

• trunk/dabo/ui/uiwx/dDialog.py (modified) (15 diffs)

trunk/dabo/ui/uiwx/dDialog.py

@@ -1 +1 @@
-# -*- coding: utf-8 -*-
+import warnings
-import wx
-import dabo
@@ -96 +97 @@
-    def _onEscape(self, evt):
-        evt.stop()
-
-
-
+
-
-
@@ -128 +127 @@
-    
-    
-    def _setEscapeBehavior(self):
-        """Allow subclasses to respond to changes in the ReleaseOnEscape property."""
-        pass
-        
-
-    def _getAutoSize(self):
-        return self._fit
@@ -164 +158 @@
-    
-
-    def _getReleaseOnEscape(self):
-        try:
-            val = self._releaseOnEscape
-        except AttributeError:
-            val = True
-        return val
-
-    def _setReleaseOnEscape(self, val):
-        self._releaseOnEscape = bool(val)
-        self._setEscapeBehavior()
-
-
-    def _getShowStat(self):
-        # Dialogs cannot have status bars.
@@ -194 +176 @@
-            "Determines if the dialog is shown modal (default) or modeless.  (bool)")
-    
-    ReleaseOnEscape = property(_getReleaseOnEscape, _setReleaseOnEscape, None,
-            "Determines if the <Esc> key releases the dialog. Default=True.  (bool)")
-
-
-    DynamicAutoSize = makeDynamicProperty(AutoSize)
@@ -218 +197 @@
-    you must specify them all; in other words, OK is only assumed if nothing is specified.
-    Then add your custom controls in the addControls() hook method, and respond to
-o
-onOK(), onN
+ru
+runOK(), runO
-    to find out if the user pressed "OK" or "Yes"; if neither of these was pressed, 
-    Accepted will be False.
@@ -229 +208 @@
-        self._no = self._extractKey((properties, kwargs), "No")
-        self._help = self._extractKey((properties, kwargs), "Help")
+        self._cancelOnEscape = True
-        super(dStandardButtonDialog, self).__init__(parent=parent, properties=properties, *args, **kwargs)
-        self._baseClass = dStandardButtonDialog
@@ -267 +247 @@
-        # Initialize the button references
-        self.btnOK = self.btnCancel = self.btnYes = self.btnNo = self.btnHelp = None
-
+
+
+
+
+
+
-        btns = [b.GetWindow() for b in sbs.GetChildren() if b.IsWindow()]
-        for btn in btns:
@@ -297 +282 @@
-        for pos, btn in enumerate(buttons[1:]):
-            btn.MoveAfterInTabOrder(buttons[pos-1])
-cancel or no
+self.CancelOnEscape
-            # The default Escape behavior destroys the dialog, so we need to replace
-            # this with out own.
@@ -305 +290 @@
-            elif no:
-                self.bindKey("esc", self._onNo)
+            elif ok:
+                self.bindKey("esc", self._onOK)
+            elif yes:
+                self.bindKey("esc", self._onYes)
+                
-
-        # Let the user add their controls
@@ -310 +300 @@
-
-        # Just in case user changed Self.Sizer, update our reference:
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-    ################################################
-
+
+
+
+
+
+
+
-    def _onOK(self, evt):
-        self.Accepted = True
-
+
+
+
+
+
+
+
+
+
+
-        self.EndModal(kons.DLG_OK)
-    def _onCancel(self, evt):
-
+
+
+
+
+
+
+
+
+
+
-        self.EndModal(kons.DLG_CANCEL)
-    def _onYes(self, evt):
-        self.Accepted = True
-o
+ru
-        self.EndModal(kons.DLG_YES)
-    def _onNo(self, evt):
-o
+ru
-        self.EndModal(kons.DLG_NO)
-    def _onHelp(self, evt):
-
+
+
-    # The following are stub methods that can be overridden when needed.
-o
-o
-o
-o
-o
+ru
+ru
+ru
+ru
+ru
-    ################################################
-
@@ -389 +408 @@
-
-
+    def _getButtonSizerPosition(self):
+        return self.ButtonSizer.getPositionInSizer()
+
+
-    def _getCancelButton(self):
-        return self.btnCancel
-
-
+    def _getCancelOnEscape(self):
+        return self._cancelOnEscape
+
+    def _setCancelOnEscape(self, val):
+        if self._constructed():
+            self._cancelOnEscape = val
+        else:
+            self._properties["CancelOnEscape"] = val
+
+
-    def _getHelpButton(self):
-        return self.btnHelp
@@ -415 +448 @@
-            _("Returns a reference to the sizer controlling the Ok/Cancel buttons.  (dSizer)"))
-
+    ButtonSizerPosition = property(_getButtonSizerPosition, None, None,
+            _("""Returns the position of the Ok/Cancel buttons in the sizer.  (int)"""))
+
-    CancelButton = property(_getCancelButton, None, None,
-            _("Reference to the Cancel button on the form, if present  (dButton or None)."))
-    
+    CancelOnEscape = property(_getCancelOnEscape, _setCancelOnEscape, None,
+            _("""When True (default), pressing the Escape key will perform the same action 
+            as clicking the Cancel button. If no Cancel button is present but there is a No button, 
+            the No behavior will be executed. If neither button is present, the default button's 
+            action will be executed  (bool)"""))
+
-    HelpButton = property(_getHelpButton, None, None,
-            _("Reference to the Help button on the form, if present  (dButton or None)."))
@@ -438 +480 @@
-        super(dOkCancelDialog, self).__init__(parent, properties, *args, **kwargs)
-        self._baseClass = dOkCancelDialog
-        
-
-class dYesNoDialog(dStandardButtonDialog):
@@ -448 +489 @@
-
-
-
-if __name__ == "__main__":
-    import test