Changeset 2648

Timestamp:

01/10/07 18:49:33 (2 years ago)

Author:

ed

Message:

Changed the shortcut to remove the font zoom to Ctrl-/, as per Paul.

Fixed a bug in the decreaseFontSize() method in dGrid.

Fixed dTreeView so that the font zoom function work with the nodes. Also created the 'refreshDisplay()' method that causes the tree to resize its nodes properly; sort of like layout() does with sizers.

Files:

• trunk/dabo/ui/uiwx/dGrid.py (modified) (1 diff)
• trunk/dabo/ui/uiwx/dTreeView.py (modified) (10 diffs)
• trunk/dabo/ui/uiwx/uiApp.py (modified) (1 diff)

trunk/dabo/ui/uiwx/dGrid.py

@@ -543 +543 @@
-        if val is None:
-            val = -1
+        else:
+            val = -1 * val
-        self._changeFontSize(val)
-    def _changeFontSize(self, val):

trunk/dabo/ui/uiwx/dTreeView.py

@@ -116 +116 @@
-        self.tree.SetItemFont(self.itemID, val._nativeFont)
-        val.bindEvent(dabo.dEvents.FontPropertiesChanged, self._onFontPropsChanged)
+        dabo.ui.callAfterInterval(100, self.tree.refreshDisplay)
-
-    
@@ -126 +127 @@
-    def _setFontBold(self, val):
-        self.Font.Bold = val
+        dabo.ui.callAfterInterval(100, self.tree.refreshDisplay)
-
-
@@ -150 +152 @@
-    def _setFontItalic(self, val):
-        self.Font.Italic = val
+        dabo.ui.callAfterInterval(100, self.tree.refreshDisplay)
-
-    
@@ -160 +163 @@
-    def _setFontFace(self, val):
-        self.Font.Face = val
+        dabo.ui.callAfterInterval(100, self.tree.refreshDisplay)
-
-    
@@ -170 +174 @@
-    def _setFontSize(self, val):
-        self.Font.Size = val
+        dabo.ui.callAfterInterval(100, self.tree.refreshDisplay)
-    
-    
@@ -180 +185 @@
-    def _setFontUnderline(self, val):
-        self.Font.Underline = val
+        dabo.ui.callAfterInterval(100, self.tree.refreshDisplay)
-
-
@@ -198 +204 @@
-    def _setImg(self, key):
-        return self.tree.setNodeImg(self, key)
+        dabo.ui.callAfterInterval(100, self.tree.refreshDisplay)
-        
-        
@@ -322 +329 @@
-        self._nodeClass = dNode
-        
-
+ | wx.TR_HAS_VARIABLE_ROW_HEIGHT
-        # Default to showing buttons
-        val = self._extractKey((properties, kwargs), "ShowButtons", True)
@@ -396 +403 @@
-        self.DeleteAllItems()
-        self.nodes = []
+    
+    
+    def refreshDisplay(self):
+        """Changing some node appearance properties requires that the tree be 
+        collapsed and re-opened in order to update any sizing issues.
+        """
+        self.lockDisplay()
+        ndExp = [(nd, nd.Expanded) for nd in self.nodes]
+        self.collapseAll()
+        for nd, exp in ndExp:
+            nd.Expanded = exp
+        self.unlockDisplay()
-
-    
@@ -749 +768 @@
-
-
+    def increaseFontSize(self, val=None):
+        """Increase the font size by the specified amount for all nodes."""
+        if val is None:
+            val = 1
+        self._changeFontSize(val)
+    def decreaseFontSize(self, val=None):
+        if val is None:
+            val = -1
+        else:
+            val = -1 * val
+        self._changeFontSize(val)
+    def _changeFontSize(self, val):
+        for nd in self.nodes:
+            try:
+                nd.FontSize += val
+            except PyAssertionError:
+                # This catches invalid point sizes
+                pass
+        if self.Form is not None:
+            dabo.ui.callAfterInterval(200, self.Form.layout)
+
+
-    def treeFromStructure(self, stru, topNode=None):
-        """Given a sequence of items with a standard format, 

trunk/dabo/ui/uiwx/uiApp.py

@@ -185 +185 @@
-        plus = (char == "=") or (char == "+") or (kcd == wx.WXK_NUMPAD_ADD)
-        minus = (char == "-") or (kcd == wx.WXK_NUMPAD_SUBTRACT)
-zero = (char == "0") or (kcd == wx.WXK_NUMPAD0
-zero
+slash = (char == "/") or (kcd == wx.WXK_NUMPAD_DIVIDE
+slash
-            evt.Skip()
-            return