From ba852d450f747ebdf0b30c66397c081d8e2b4121 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 5 Jul 2013 22:25:32 +0000 Subject: [PATCH] TreeListCtrl & PersistentControls Demos TreeListCtrl & PersistentControls Demos Phoenix Fixes Still needs more a bit more work git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@74383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- demo/TreeListCtrl.py | 57 +++++++++++++++++----------------- demo/agw/PersistentControls.py | 38 +++++++++++++---------- 2 files changed, 49 insertions(+), 46 deletions(-) diff --git a/demo/TreeListCtrl.py b/demo/TreeListCtrl.py index 2518b2a2..e4a76926 100644 --- a/demo/TreeListCtrl.py +++ b/demo/TreeListCtrl.py @@ -1,6 +1,6 @@ import wx -import wx.gizmos as gizmos +import wx.adv import images @@ -12,75 +12,74 @@ class TestPanel(wx.Panel): wx.Panel.__init__(self, parent, -1) self.Bind(wx.EVT_SIZE, self.OnSize) - self.tree = gizmos.TreeListCtrl(self, -1, style = + self.tree = wx.adv.TreeListCtrl(self, -1, style = wx.TR_DEFAULT_STYLE #| wx.TR_HAS_BUTTONS #| wx.TR_TWIST_BUTTONS #| wx.TR_ROW_LINES #| wx.TR_COLUMN_LINES - #| wx.TR_NO_LINES + #| wx.TR_NO_LINES | wx.TR_FULL_ROW_HIGHLIGHT ) isz = (16,16) il = wx.ImageList(isz[0], isz[1]) - fldridx = il.Add(wx.ArtProvider_GetBitmap(wx.ART_FOLDER, wx.ART_OTHER, isz)) - fldropenidx = il.Add(wx.ArtProvider_GetBitmap(wx.ART_FILE_OPEN, wx.ART_OTHER, isz)) - fileidx = il.Add(wx.ArtProvider_GetBitmap(wx.ART_NORMAL_FILE, wx.ART_OTHER, isz)) + fldridx = il.Add(wx.ArtProvider.GetBitmap(wx.ART_FOLDER, wx.ART_OTHER, isz)) + fldropenidx = il.Add(wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN, wx.ART_OTHER, isz)) + fileidx = il.Add(wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_OTHER, isz)) smileidx = il.Add(images.Smiles.GetBitmap()) self.tree.SetImageList(il) self.il = il # create some columns - self.tree.AddColumn("Main column") - self.tree.AddColumn("Column 1") - self.tree.AddColumn("Column 2") - self.tree.SetMainColumn(0) # the one with the tree in it... + self.tree.AppendColumn("Main column") + self.tree.AppendColumn("Column 1") + self.tree.AppendColumn("Column 2") + ##self.tree.SetMainColumn(0) # the one with the tree in it... self.tree.SetColumnWidth(0, 175) + self.root = self.tree.InsertItem(self.tree.GetRootItem(), wx.adv.TLI_FIRST, "The Root Item") - self.root = self.tree.AddRoot("The Root Item") - self.tree.SetItemText(self.root, "col 1 root", 1) - self.tree.SetItemText(self.root, "col 2 root", 2) - self.tree.SetItemImage(self.root, fldridx, which = wx.TreeItemIcon_Normal) - self.tree.SetItemImage(self.root, fldropenidx, which = wx.TreeItemIcon_Expanded) + self.tree.SetItemText(self.root, 1, "col 1 root") + self.tree.SetItemText(self.root, 2, "col 2 root") + self.tree.SetItemImage(self.root, closed=fldridx, opened=fldropenidx) for x in range(15): txt = "Item %d" % x child = self.tree.AppendItem(self.root, txt) - self.tree.SetItemText(child, txt + "(c1)", 1) - self.tree.SetItemText(child, txt + "(c2)", 2) - self.tree.SetItemImage(child, fldridx, which = wx.TreeItemIcon_Normal) - self.tree.SetItemImage(child, fldropenidx, which = wx.TreeItemIcon_Expanded) + self.tree.SetItemText(child, 1, txt + "(c1)") + self.tree.SetItemText(child, 2, txt + "(c2)") + self.tree.SetItemImage(child, closed=fldridx, opened=fldropenidx) for y in range(5): txt = "item %d-%s" % (x, chr(ord("a")+y)) last = self.tree.AppendItem(child, txt) - self.tree.SetItemText(last, txt + "(c1)", 1) - self.tree.SetItemText(last, txt + "(c2)", 2) - self.tree.SetItemImage(last, fldridx, which = wx.TreeItemIcon_Normal) - self.tree.SetItemImage(last, fldropenidx, which = wx.TreeItemIcon_Expanded) + self.tree.SetItemText(last, 1, txt + "(c1)") + self.tree.SetItemText(last, 2, txt + "(c2)") + self.tree.SetItemImage(last, closed=fldridx, opened=fldropenidx) for z in range(5): txt = "item %d-%s-%d" % (x, chr(ord("a")+y), z) item = self.tree.AppendItem(last, txt) - self.tree.SetItemText(item, txt + "(c1)", 1) - self.tree.SetItemText(item, txt + "(c2)", 2) - self.tree.SetItemImage(item, fileidx, which = wx.TreeItemIcon_Normal) - self.tree.SetItemImage(item, smileidx, which = wx.TreeItemIcon_Selected) + self.tree.SetItemText(item, 1, txt + "(c1)") + self.tree.SetItemText(item, 2, txt + "(c2)") + #TODO: Phoenix change selected to smiley + self.tree.SetItemImage(item, closed=fileidx, opened=smileidx) + ## self.tree.SetItemImage(item, fileidx, which = wx.TreeItemIcon_Normal) + ## self.tree.SetItemImage(item, smileidx, which = wx.TreeItemIcon_Selected) self.tree.Expand(self.root) - self.tree.GetMainWindow().Bind(wx.EVT_RIGHT_UP, self.OnRightUp) + ## self.tree.GetMainWindow().Bind(wx.EVT_RIGHT_UP, self.OnRightUp) self.tree.Bind(wx.EVT_TREE_ITEM_ACTIVATED, self.OnActivate) def OnActivate(self, evt): self.log.write('OnActivate: %s' % self.tree.GetItemText(evt.GetItem())) - + def OnRightUp(self, evt): pos = evt.GetPosition() diff --git a/demo/agw/PersistentControls.py b/demo/agw/PersistentControls.py index e03cc89d..5243cfc0 100644 --- a/demo/agw/PersistentControls.py +++ b/demo/agw/PersistentControls.py @@ -1,4 +1,5 @@ import wx +import wx.adv import os import sys import images @@ -344,7 +345,7 @@ class PersistentFrame1(wx.Frame): # The wx.HtmlListBox derives from wx.VListBox, but draws each item # itself as a wx.HtmlCell. -class MyHtmlListBox(wx.HtmlListBox): +class MyHtmlListBox(wx.html.HtmlListBox): def OnGetItem(self, n): if n % 2 == 0: @@ -377,7 +378,7 @@ class PersistentFrame2(wx.Frame): self.textctrl = wx.TextCtrl(dummyPanel, -1, text, style=wx.TE_MULTILINE, name="TextCtrl1") self.searchctrl = wx.SearchCtrl(dummyPanel, -1, "", name="SearchCtrl1") self.checkbox = wx.CheckBox(dummyPanel, -1, "CheckBox", name="CheckBox1") - self.datepickerctrl = wx.DatePickerCtrl(dummyPanel, style=wx.DP_DROPDOWN, name="DatePicker1") + self.datepickerctrl = wx.adv.DatePickerCtrl(dummyPanel, style=wx.adv.DP_DROPDOWN, name="DatePicker1") self.choice = wx.Choice(dummyPanel, -1, choices=_sampleList, name="Choice1") self.split2.SplitHorizontally(self.notebook, dummyPanel) @@ -463,31 +464,34 @@ class PersistentFrame2(wx.Frame): def CreateTreeListCtrl(self, isTreeList): if isTreeList: - treeList = wx.gizmos.TreeListCtrl(self.notebook, style=wx.TR_DEFAULT_STYLE|wx.TR_FULL_ROW_HIGHLIGHT| + treeList = wx.adv.TreeListCtrl(self.notebook, style=wx.TR_DEFAULT_STYLE|wx.TR_FULL_ROW_HIGHLIGHT| wx.SUNKEN_BORDER|wx.TR_MULTIPLE, name="TreeList1") else: treeList = wx.TreeCtrl(self.split1, style=wx.TR_DEFAULT_STYLE|wx.SUNKEN_BORDER|wx.TR_MULTIPLE, name="TreeCtrl1") il = wx.ImageList(16, 16) - fldridx = il.Add(wx.ArtProvider_GetBitmap(wx.ART_FOLDER, wx.ART_OTHER, (16, 16))) + fldridx = il.Add(wx.ArtProvider.GetBitmap(wx.ART_FOLDER, wx.ART_OTHER, (16, 16))) smileidx = il.Add(images.Smiles.GetBitmap()) treeList.AssignImageList(il) if isTreeList: # create some columns - treeList.AddColumn("Main column") - treeList.AddColumn("Column 1") - treeList.AddColumn("Column 2") - treeList.SetMainColumn(0) # the one with the tree in it... + treeList.AppendColumn("Main column") + treeList.AppendColumn("Column 1") + treeList.AppendColumn("Column 2") + ##treeList.SetMainColumn(0) # the one with the tree in it... treeList.SetColumnWidth(0, 175) - root = treeList.AddRoot("The Root Item") + if isTreeList: + root = treeList.InsertItem(treeList.GetRootItem(), wx.adv.TLI_FIRST, "The Root Item") + else: + root = treeList.AddRoot("The Root Item") if isTreeList: - treeList.SetItemText(root, "col 1 root", 1) - treeList.SetItemText(root, "col 2 root", 2) + treeList.SetItemText(root, 1, "col 1 root") + treeList.SetItemText(root, 2, "col 2 root") treeList.SetItemImage(root, fldridx) @@ -496,24 +500,24 @@ class PersistentFrame2(wx.Frame): child = treeList.AppendItem(root, txt) treeList.SetItemImage(child, smileidx) if isTreeList: - treeList.SetItemText(child, txt + "(c1)", 1) - treeList.SetItemText(child, txt + "(c2)", 2) + treeList.SetItemText(child, 1, txt + "(c1)") + treeList.SetItemText(child, 2, txt + "(c2)") for y in range(5): txt = "item %d-%s" % (x, chr(ord("a")+y)) last = treeList.AppendItem(child, txt) treeList.SetItemImage(last, fldridx) if isTreeList: - treeList.SetItemText(last, txt + "(c1)", 1) - treeList.SetItemText(last, txt + "(c2)", 2) + treeList.SetItemText(last, 1, txt + "(c1)") + treeList.SetItemText(last, 2, txt + "(c2)") for z in range(5): txt = "item %d-%s-%d" % (x, chr(ord("a")+y), z) item = treeList.AppendItem(last, txt) treeList.SetItemImage(item, smileidx) if isTreeList: - treeList.SetItemText(item, txt + "(c1)", 1) - treeList.SetItemText(item, txt + "(c2)", 2) + treeList.SetItemText(item, 1, txt + "(c1)") + treeList.SetItemText(item, 2, txt + "(c2)") treeList.Expand(root) return treeList