X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1463b9df091ad0e9d76292564d4389882b28de1..97800f661840d18c39e38ef821a3310f70fb767e:/wxPython/wx/lib/customtreectrl.py?ds=sidebyside diff --git a/wxPython/wx/lib/customtreectrl.py b/wxPython/wx/lib/customtreectrl.py index 76f3501711..817fa01b54 100644 --- a/wxPython/wx/lib/customtreectrl.py +++ b/wxPython/wx/lib/customtreectrl.py @@ -3,7 +3,7 @@ # Inspired By And Heavily Based On wxGenericTreeCtrl. # # Andrea Gavana, @ 17 May 2006 -# Latest Revision: 26 May 2006, 22.30 CET +# Latest Revision: 16 Apr 2007, 11.00 CET # # # TODO List @@ -134,8 +134,8 @@ CustomTreeCtrl has been tested on the following platforms: * Mac OS (Thanks to John Jackson). -Latest Revision: Andrea Gavana @ 26 May 2006, 22.30 CET -Version 0.8 +Latest Revision: Andrea Gavana @ 16 Apr 2007, 11.00 CET +Version 1.0 """ @@ -1164,28 +1164,7 @@ class GenericTreeItem: self._wnd = wnd # are we holding a window? if wnd: - if wnd.GetSizer(): # the window is a complex one hold by a sizer - size = wnd.GetBestSize() - else: # simple window, without sizers - size = wnd.GetSize() - - # We have to bind the wx.EVT_SET_FOCUS for the associated window - # No other solution to handle the focus changing from an item in - # CustomTreeCtrl and the window associated to an item - # Do better strategies exist? - self._wnd.Bind(wx.EVT_SET_FOCUS, self.OnSetFocus) - - self._height = size.GetHeight() + 2 - self._width = size.GetWidth() - self._windowsize = size - - # We don't show the window if the item is collapsed - if self._isCollapsed: - self._wnd.Show(False) - - # The window is enabled only if the item is enabled - self._wnd.Enable(self._enabled) - self._windowenabled = self._enabled + self.SetWindow(wnd) def IsOk(self): @@ -1310,6 +1289,29 @@ class GenericTreeItem: self._wnd = wnd + if wnd.GetSizer(): # the window is a complex one hold by a sizer + size = wnd.GetBestSize() + else: # simple window, without sizers + size = wnd.GetSize() + + # We have to bind the wx.EVT_SET_FOCUS for the associated window + # No other solution to handle the focus changing from an item in + # CustomTreeCtrl and the window associated to an item + # Do better strategies exist? + self._wnd.Bind(wx.EVT_SET_FOCUS, self.OnSetFocus) + + self._height = size.GetHeight() + 2 + self._width = size.GetWidth() + self._windowsize = size + + # We don't show the window if the item is collapsed + if self._isCollapsed: + self._wnd.Show(False) + + # The window is enabled only if the item is enabled + self._wnd.Enable(self._enabled) + self._windowenabled = self._enabled + def GetWindow(self): """Returns the window associated to the item.""" @@ -1317,6 +1319,14 @@ class GenericTreeItem: return self._wnd + def DeleteWindow(self): + """Deletes the window associated to the item (if any).""" + + if self._wnd: + self._wnd.Destroy() + self._wnd = None + + def GetWindowEnabled(self): """Returns whether the associated window is enabled or not.""" @@ -1736,7 +1746,7 @@ def EventFlagsToSelType(style, shiftDown=False, ctrlDown=False): class CustomTreeCtrl(wx.PyScrolledWindow): def __init__(self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition, size=wx.DefaultSize, - style=0, ctstyle=TR_DEFAULT_STYLE, validator=wx.DefaultValidator, + style=TR_DEFAULT_STYLE, ctstyle=0, validator=wx.DefaultValidator, name="CustomTreeCtrl"): """ Default class constructor. @@ -1749,9 +1759,8 @@ class CustomTreeCtrl(wx.PyScrolledWindow): size: window size. If the default size (-1, -1) is specified then the window is sized appropriately. - style: the underlying wx.ScrolledWindow style + style: the underlying wx.ScrolledWindow style + CustomTreeCtrl window style. This can be one of: - ctstyle: CustomTreeCtrl window style. This can be one of: TR_NO_BUTTONS TR_HAS_BUTTONS # draw collapsed/expanded btns TR_NO_LINES # don't draw lines at all @@ -1769,10 +1778,14 @@ class CustomTreeCtrl(wx.PyScrolledWindow): TR_AUTO_CHECK_PARENT # only meaningful for checkboxes TR_AUTO_TOGGLE_CHILD # only meaningful for checkboxes + ctstyle: kept for backward compatibility. + validator: window validator. name: window name. """ + + style = style | ctstyle self._current = self._key_current = self._anchor = self._select_me = None self._hasFocus = False @@ -1790,7 +1803,9 @@ class CustomTreeCtrl(wx.PyScrolledWindow): btnshadow = wx.SystemSettings_GetColour(wx.SYS_COLOUR_BTNSHADOW) self._hilightUnfocusedBrush = wx.Brush(btnshadow) r, g, b = btnshadow.Red(), btnshadow.Green(), btnshadow.Blue() - backcolour = ((r >> 1) - 20, (g >> 1) - 20, (b >> 1) - 20) + backcolour = (max((r >> 1) - 20, 0), + max((g >> 1) - 20, 0), + max((b >> 1) - 20, 0)) backcolour = wx.Colour(backcolour[0], backcolour[1], backcolour[2]) self._hilightUnfocusedBrush2 = wx.Brush(backcolour) @@ -1871,14 +1886,14 @@ class CustomTreeCtrl(wx.PyScrolledWindow): self._itemWithWindow = [] if wx.Platform == "__WXMAC__": - ctstyle &= ~TR_LINES_AT_ROOT - ctstyle |= TR_NO_LINES + style &= ~TR_LINES_AT_ROOT + style |= TR_NO_LINES platform, major, minor = wx.GetOsVersion() if major < 10: - ctstyle |= TR_ROW_LINES + style |= TR_ROW_LINES - self._windowStyle = ctstyle + self._windowStyle = style # Create the default check image list self.SetImageListCheck(13, 13) @@ -2050,7 +2065,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow): self.RefreshLine(item) - def IsEnabled(self, item): + def IsItemEnabled(self, item): """Returns whether an item is enabled or disabled.""" if not item: @@ -2368,7 +2383,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow): return item.GetText() - def GetItemImage(self, item, which): + def GetItemImage(self, item, which=TreeItemIcon_Normal): """Returns the item image.""" if not item: @@ -3303,7 +3318,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow): event = TreeEvent(wxEVT_TREE_DELETE_ITEM, self.GetId()) event._item = item event.SetEventObject(self) - self.ProcessEvent(event) + self.GetEventHandler().ProcessEvent(event) def IsDescendantOf(self, parent, item): @@ -3448,7 +3463,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow): event._item = item event.SetEventObject(self) - if self.ProcessEvent(event) and not event.IsAllowed(): + if self.GetEventHandler().ProcessEvent(event) and not event.IsAllowed(): # cancelled by program return @@ -3462,11 +3477,11 @@ class CustomTreeCtrl(wx.PyScrolledWindow): self.HideWindows() event.SetEventType(wxEVT_TREE_ITEM_EXPANDED) - self.ProcessEvent(event) + self.GetEventHandler().ProcessEvent(event) - def ExpandAll(self, item): - """Expands all the items.""" + def ExpandAllChildren(self, item): + """Expands all the items children of the input item.""" if not item: raise Exception("\nERROR: Invalid Tree Item. ") @@ -3479,10 +3494,17 @@ class CustomTreeCtrl(wx.PyScrolledWindow): child, cookie = self.GetFirstChild(item) while child: - self.ExpandAll(child) + self.ExpandAllChildren(child) child, cookie = self.GetNextChild(item, cookie) + def ExpandAll(self): + """Expands all CustomTreeCtrl items.""" + + if self._anchor: + self.ExpandAllChildren(self._anchor) + + def Collapse(self, item): """ Collapse an item, sending a EVT_TREE_ITEM_COLLAPSING and @@ -3501,7 +3523,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow): event = TreeEvent(wxEVT_TREE_ITEM_COLLAPSING, self.GetId()) event._item = item event.SetEventObject(self) - if self.ProcessEvent(event) and not event.IsAllowed(): + if self.GetEventHandler().ProcessEvent(event) and not event.IsAllowed(): # cancelled by program return @@ -3515,7 +3537,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow): self.HideWindows() event.SetEventType(wxEVT_TREE_ITEM_COLLAPSED) - self.ProcessEvent(event) + self.GetEventHandler().ProcessEvent(event) def CollapseAndReset(self, item): @@ -3576,7 +3598,8 @@ class CustomTreeCtrl(wx.PyScrolledWindow): # the tree might not have the root item at all if rootItem: self.UnselectAllChildren(rootItem) - + + self.Unselect() # Recursive function ! # To stop we must have crt_item item.GetWindowSize()[1]: + ya += (item.GetHeight() - item.GetWindowSize()[1])/2 + if not wnd.IsShown(): wnd.Show() if wnd.GetPosition() != (wndx, ya): @@ -4438,7 +4468,10 @@ class CustomTreeCtrl(wx.PyScrolledWindow): # draw line down to last child origY += self.GetLineHeight(children[0])>>1 oldY += self.GetLineHeight(children[n-1])>>1 + oldPen = dc.GetPen() + dc.SetPen(self._dottedPen) dc.DrawLine(3, origY, 3, oldY) + dc.SetPen(oldPen) return y @@ -4724,11 +4757,11 @@ class CustomTreeCtrl(wx.PyScrolledWindow): keyCode = event.GetKeyCode() if keyCode in [ord("+"), wx.WXK_ADD]: # "+" - if self._current.HasPlus() and not self.IsExpanded(self._current) and self.IsEnabled(self._current): + if self._current.HasPlus() and not self.IsExpanded(self._current) and self.IsItemEnabled(self._current): self.Expand(self._current) elif keyCode in [ord("*"), wx.WXK_MULTIPLY]: # "*" - if not self.IsExpanded(self._current) and self.IsEnabled(self._current): + if not self.IsExpanded(self._current) and self.IsItemEnabled(self._current): # expand all self.ExpandAll(self._current) @@ -4748,7 +4781,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow): elif keyCode in [wx.WXK_RETURN, wx.WXK_SPACE]: - if not self.IsEnabled(self._current): + if not self.IsItemEnabled(self._current): event.Skip() return @@ -4781,7 +4814,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow): if prev: current = self._key_current # TODO: Huh? If we get here, we'd better be the first child of our parent. How else could it be? - if current == self.GetFirstChild(prev)[0] and self.IsEnabled(prev): + if current == self.GetFirstChild(prev)[0] and self.IsItemEnabled(prev): # otherwise we return to where we came from self.DoSelectItem(prev, unselect_others, extended_select) self._key_current = prev @@ -4797,13 +4830,13 @@ class CustomTreeCtrl(wx.PyScrolledWindow): current = prev # Try to get the previous siblings and see if they are active - while prev and not self.IsEnabled(prev): + while prev and not self.IsItemEnabled(prev): prev = self.GetPrevSibling(prev) if not prev: # No previous siblings active: go to the parent and up prev = self.GetItemParent(current) - while prev and not self.IsEnabled(prev): + while prev and not self.IsItemEnabled(prev): prev = self.GetItemParent(prev) if prev: @@ -4821,7 +4854,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow): if self.IsExpanded(self._current): self.Collapse(self._current) else: - if prev and self.IsEnabled(prev): + if prev and self.IsItemEnabled(prev): self.DoSelectItem(prev, unselect_others, extended_select) elif keyCode == wx.WXK_RIGHT: @@ -4829,7 +4862,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow): # also expand the item if it wasn't expanded yet if self.IsExpanded(self._current) and self.HasChildren(self._current): child, cookie = self.GetFirstChild(self._key_current) - if self.IsEnabled(child): + if self.IsItemEnabled(child): self.DoSelectItem(child, unselect_others, extended_select) self._key_current = child else: @@ -4855,11 +4888,11 @@ class CustomTreeCtrl(wx.PyScrolledWindow): current = self.GetItemParent(current) if current: next = self.GetNextSibling(current) - if not next or not self.IsEnabled(next): + if not next or not self.IsItemEnabled(next): next = None else: - while next and not self.IsEnabled(next): + while next and not self.IsItemEnabled(next): next = self.GetNext(next) if next: @@ -4884,7 +4917,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow): last = lastChild - if last and self.IsEnabled(last): + if last and self.IsItemEnabled(last): self.DoSelectItem(last, unselect_others, extended_select) @@ -4901,7 +4934,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow): if not prev: return - if self.IsEnabled(prev): + if self.IsItemEnabled(prev): self.DoSelectItem(prev, unselect_others, extended_select) else: @@ -4918,7 +4951,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow): # no such item return - if self.IsEnabled(id): + if self.IsItemEnabled(id): self.SelectItem(id) self._findPrefix += ch @@ -4950,7 +4983,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow): while 1: child = sibling(item) - if (child and self.IsEnabled(child)) or not child: + if (child and self.IsItemEnabled(child)) or not child: break item = child @@ -4958,10 +4991,10 @@ class CustomTreeCtrl(wx.PyScrolledWindow): # Tha's not a radiobutton... but some of its children can be # inactive child, cookie = self.GetFirstChild(item) - while child and not self.IsEnabled(child): + while child and not self.IsItemEnabled(child): child, cookie = self.GetNextChild(item, cookie) - if child and self.IsEnabled(child): + if child and self.IsItemEnabled(child): return child return None @@ -5015,7 +5048,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow): flags = TREE_HITTEST_NOWHERE return None, flags - if not self.IsEnabled(hit): + if not self.IsItemEnabled(hit): return None, flags return hit, flags @@ -5534,6 +5567,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow): item.SetHeight(total_h) else: item.SetWidth(item.GetWindowSize()[0]+image_w+text_w+wcheck+2) + item.SetHeight(max(total_h, item.GetWindowSize()[1])) def CalculateLevel(self, item, dc, level, y): @@ -5731,4 +5765,6 @@ class CustomTreeCtrl(wx.PyScrolledWindow): attr.font = wx.SystemSettings_GetFont(wx.SYS_DEFAULT_GUI_FONT) return attr + GetClassDefaultAttributes = classmethod(GetClassDefaultAttributes) +