Changeset 2458

Timestamp:

11/15/06 16:54:27 (2 years ago)

Author:

ed

Message:

Added a 'Visible' property to the dColumn class. Setting it to False will hide the column; setting it back to True returns the column to its original visible status.

Added column information to the mouse events on the grid headers.

Fixed a problem with the Children property of dSpinner returning references to its textbox and spin buttons, neither of which are Dabo objects. Also localized some docstrings.

Fixed a bug in dPemMixin.setAll() if an object's Children propety returned None.

Removed some unneeded code from dHtmlBox; enhanced the test code.

Files:

• trunk/dabo/ui/uiwx/dGrid.py (modified) (27 diffs)
• trunk/dabo/ui/uiwx/dHtmlBox.py (modified) (5 diffs)
• trunk/dabo/ui/uiwx/dPemMixin.py (modified) (1 diff)
• trunk/dabo/ui/uiwx/dSpinner.py (modified) (2 diffs)

trunk/dabo/ui/uiwx/dGrid.py

@@ -433 +433 @@
-        # Do text columns wrap their long text?
-        self._wordWrap = False
+        # Is the column shown?
+        self._visible = True
-
-        self._beforeInit()
@@ -1210 +1212 @@
-
-
+    def _getVisible(self):
+        return self._visible
+
+    def _setVisible(self, val):
+        if self._constructed():
+            self._visible = val
+            if self.Parent:
+                self.Parent.showColumn(self, val)
+        else:
+            self._properties["Visible"] = val
+
+
-    def _getWidth(self):
-        idx = self._GridColumnIndex
@@ -1218 +1232 @@
-        if self.Parent and idx >= 0:
-            # Make sure the grid is in sync:
-
+
+
+
+
+
-        return v
-
@@ -1413 +1431 @@
-            are 'Top', 'Center', and 'Bottom'.  (str)"""))
-
+    Visible = property(_getVisible, _setVisible, None,
+            _("Controls whether the column is shown or not  (bool)"))
+    
-    Width = property(_getWidth, _setWidth, None,
-            _("Width of this column  (int)") )
@@ -1457 +1478 @@
-    DynamicSortable = makeDynamicProperty(Sortable)
-    DynamicVerticalAlignment = makeDynamicProperty(VerticalAlignment)
+    DynamicVisible = makeDynamicProperty(Visible)
-    DynamicWidth = makeDynamicProperty(Width)
-
@@ -1614 +1636 @@
-        self._headerMouseLeftDown, self._headerMouseRightDown = False, False
-
-
-        header.Bind(wx.EVT_LEFT_DCLICK, self.__onWxHeaderMouseLeftDoubleClick)
-        header.Bind(wx.EVT_LEFT_DOWN, self.__onWxHeaderMouseLeftDown)
@@ -1627 +1648 @@
-        header.Bind(wx.EVT_IDLE, self.__onWxHeaderIdle)
-
-
-        self.bindEvent(dEvents.GridHeaderMouseLeftDown, self._onGridHeaderMouseLeftDown)
-        self.bindEvent(dEvents.GridHeaderMouseMove, self._onGridHeaderMouseMove)
@@ -1642 +1662 @@
-        return ret
-
+
-    def GetValue(self, row, col):
-        try:
@@ -1648 +1669 @@
-            ret = super(dGrid, self).GetValue(row, col)
-        return ret
+
-
-    def SetValue(self, row, col, val):
@@ -1665 +1687 @@
-        except StandardError, e:
-            dabo.errorLog.write("Cannot update data set: %s" % e)
+
-
-    # Wrapper methods to Dabo-ize these calls.
@@ -1676 +1699 @@
-            ret = ret.decode(self.Encoding)
-        return ret
+        
-    def setValue(self, row, col, val):
-        return self.SetValue(row, col, val)
@@ -1692 +1716 @@
-        dcol.CustomEditors[row] = edt
-        #self.SetCellEditor(row, col, edt)
+        
-
-    def setRendererForCell(self, row, col, rnd):
@@ -1713 +1738 @@
-        currFocus = self.FindFocus()
-        currDataField = None
-    
-        # if the current focus is data-aware, we must temporarily remove it's binding
-        # or the value of the control will flow to other records in the bizobj, but
@@ -1733 +1757 @@
-            # Used for display purposes when no data is present.
-            self._addEmptyRows()
-        
-        tbl.setColumns(self.Columns)
-        tbl.fillTable(force)
-
-
-        ## pkm: I've disabled the following block, because setting the focus
@@ -1755 +1777 @@
-                self.MakeCellVisible(row, col)
-            self.SetGridCursor(row, col)
-
-        
-        if currFocus is not None:
@@ -2017 +2038 @@
-            w = min(w, maxWidth)
-            colObj.Width = w
-
-            if persist:
-                colObj._persist("Width")
-
-        try:
-            self.AutoSizeColumn(colNum, setAsMin=False)
@@ -2042 +2061 @@
-        for col in cols:
-            sortIndicator = False
-
-            try:
-                colObj = self.Columns[col]
@@ -2139 +2157 @@
-
-
+    def showColumn(self, col, visible):
+        """If the column is not shown and visible=True, show it. Likewise
+        but opposite if visible=False.
+        """
+        if isinstance(col, (int, long)):
+            if col < self.ColumnCount:
+                col = self.Columns[col]
+            else:
+                dabo.errorLog.write(_("Invalid column number passed to 'showColumn()'."))
+                return
+        if visible:
+            if col in self.Columns:
+                # already shown
+                return
+            self.addColumn(col)
+        else:
+            if col in self.Columns:
+                self.removeColumn(col)
+            
+        
-    def moveColumn(self, colNum, toNum):
-        """ Move the column to a new position."""
@@ -2542 +2580 @@
-        else:
-            col.Parent = self
+
-        if col.Order == -1:
-            maxOrd = self.maxColOrder()
@@ -2553 +2592 @@
-            self._syncColumnCount()
-            self.fillGrid(force=True)
-
-        try:
-            ## Set the Width property last, otherwise it won't stick:
@@ -2655 +2693 @@
-                    wx.grid.GRIDTABLE_NOTIFY_COLS_DELETED,
-                    0, abs(diff))
-
-        elif diff > 0:
-            msg = wx.grid.GridTableMessage(self._Table,
-                    wx.grid.GRIDTABLE_NOTIFY_COLS_APPENDED,
-                    diff)
-
-        if msg:
-            self.ProcessTableMessage(msg)
@@ -3128 +3164 @@
-
-    def __onWxHeaderContextMenu(self, evt):
-
+
+
-        evt.Skip()
-
@@ -3138 +3175 @@
-
-    def __onWxHeaderMouseEnter(self, evt):
-
+
+
-        evt.Skip()
-        
-        
-    def __onWxHeaderMouseLeave(self, evt):
+        col, row = self._getColRowForPosition(evt.GetPosition())
-        self._headerMouseLeftDown, self._headerMouseRightDown = False, False
-
+, col=col
-        evt.Skip()
-
-
-    def __onWxHeaderMouseLeftDoubleClick(self, evt):
-
+
+
-        evt.Skip()
-
-
-    def __onWxHeaderMouseLeftDown(self, evt):
-
+
+
-        self._headerMouseLeftDown = True
-        #evt.Skip() #- don't skip or all the rows will be selected.
@@ -3160 +3201 @@
-
-    def __onWxHeaderMouseLeftUp(self, evt):
-
+
+
-        if self._headerMouseLeftDown:
-            # mouse went down and up in the header: send a click:
-
+, col=col
-            self._headerMouseLeftDown = False
-        evt.Skip()
@@ -3169 +3211 @@
-
-    def __onWxHeaderMouseMotion(self, evt):
-
+
+
-        evt.Skip()
-
-
-    def __onWxHeaderMouseRightDown(self, evt):
-
+
+
-        self._headerMouseRightDown = True
-        evt.Skip()
@@ -3180 +3224 @@
-
-    def __onWxHeaderMouseRightUp(self, evt):
-
+
+
-        if self._headerMouseRightDown:
-            # mouse went down and up in the header: send a click:
@@ -4188 +4233 @@
-        #self.ShowRowLabels = True
-
-
-if __name__ == '__main__':
-    class TestForm(dabo.ui.dForm):

trunk/dabo/ui/uiwx/dHtmlBox.py

@@ -30 +30 @@
-
-
-    def layout(self):
-        """ Wrap the wx version of the call, if possible. """
-        self.Layout()
-        for child in self.Children:
-            try:
-                child.layout()
-            except: pass
-        try:
-            # Call the Dabo version, if present
-            self.Sizer.layout()
-        except:
-            pass
-    
-    
-    def setImageURLs(self, val):
-        """Replace standard image file names with 'file:///img.pth' references"""
@@ -67 +53 @@
-                break
-        return ret          
-
-
-    def _getChildren(self):
-        ret = super(dHtmlBox, self)._getChildren()
-        return [kid for kid in ret
-                if isinstance(kid, dabo.ui.dPemMixinBase.dPemMixinBase)]
-
-    def _setChildren(self, val):
-        super(dHtmlBox, self)._setChildren(val)
-
-
@@ -118 +95 @@
-    def _setSource(self, val):
-        if isinstance(val, types.StringTypes):
-            val = self.setImageURLs(val)
-            self._source = val
-            self._page = ""
+            val = self.setImageURLs(val)
-            self.SetPage(val)
-
@@ -133 +110 @@
-        self.SetScrollRate(rt[0], {True:rt[1], False:0}[val])
-
-
-    Children = property(_getChildren, _setChildren, None,
-            _("""Child controls of this panel. This excludes the wx-specific
-            scroll bars  (list of objects)"""))
-
-    HorizontalScroll = property(_getHorizontalScroll, _setHorizontalScroll, None,
@@ -168 +141 @@
-        return """<html>
-        <body bgcolor="#ACAA60">
-
-
-
-
-
+
+
+
+
+
+
+
-        </center>
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-><b>Dabo</b> is brought to you by <b>Ed Leafe</b>, <b>Paul Mcn
-, Copyright &copy; 2006.
+ align="center"><b>Dabo</b> is brought to you by <b>Ed Leafe</b>, <b>Paul McN
+. Copyright &copy; 2006
-        </p>
-        </body>

trunk/dabo/ui/uiwx/dPemMixin.py

@@ -988 +988 @@
-        else:
-            kids = self.Children
+        if not kids:
+            return
-        for kid in kids:
-            ok = hasattr(kid, prop)

trunk/dabo/ui/uiwx/dSpinner.py

@@ -55 +55 @@
-    # Property get/set/del methods follow. Scroll to bottom to see the property
-    # definitions themselves.
+    def _getChildren(self):
+        return None
+    
+    
-    def _getMax(self):
-        return self.GetMax()
@@ -88 +92 @@
-
-    # Property definitions:
+    Children = property(_getChildren, None, None, 
+            _("""Need to override this to return None, since the text box and spin
+            buttons are not  Dabo children.  (None)"""))
+            
+    Max = property(_getMax, _setMax, None, 
+            _("Specifies the highest possible value for the spinner. (int)"))
+
-    Min = property(_getMin, _setMin, None, 
-
-
-
-
-
-
+
-
-    SpinnerWrap = property(_getSpinnerWrap, _setSpinnerWrap, None,
-
+
+
+
+
+
-    DynamicSpinnerWrap = makeDynamicProperty(SpinnerWrap)
+
-
-