From 3c5b129f40b3b733667faddaf81d6d11bdbe04d7 Mon Sep 17 00:00:00 2001 From: Gyedo Jeon Date: Fri, 12 Mar 2010 19:03:29 +0000 Subject: [PATCH] Made protoPalette working with new PaletteTreeCtrl --- direct/src/leveleditor/MayaConverter.py | 2 +- direct/src/leveleditor/PaletteTreeCtrl.py | 2 +- direct/src/leveleditor/ProtoPaletteUI.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/direct/src/leveleditor/MayaConverter.py b/direct/src/leveleditor/MayaConverter.py index a347c2df08..6c9360bee5 100755 --- a/direct/src/leveleditor/MayaConverter.py +++ b/direct/src/leveleditor/MayaConverter.py @@ -148,7 +148,7 @@ class MayaConverter(wx.Dialog): self.editor.protoPalette.add(itemData) - newItem = self.editor.ui.protoPaletteUI.tree.AppendItem(self.editor.ui.protoPaletteUI.root, name) + newItem = self.editor.ui.protoPaletteUI.tree.AppendItem(self.editor.ui.protoPaletteUI.tree.root, name) self.editor.ui.protoPaletteUI.tree.SetItemPyData(newItem, itemData) self.editor.ui.protoPaletteUI.tree.ScrollTo(newItem) diff --git a/direct/src/leveleditor/PaletteTreeCtrl.py b/direct/src/leveleditor/PaletteTreeCtrl.py index 7e7695bb11..569878d50f 100644 --- a/direct/src/leveleditor/PaletteTreeCtrl.py +++ b/direct/src/leveleditor/PaletteTreeCtrl.py @@ -10,7 +10,7 @@ class PaletteTreeCtrl(wx.TreeCtrl): wx.TreeCtrl.__init__(self, parent, style=treeStyle) self.rootName = rootName - self.AddRoot(self.rootName) + self.root = self.AddRoot(self.rootName) self.paletteUI = parent diff --git a/direct/src/leveleditor/ProtoPaletteUI.py b/direct/src/leveleditor/ProtoPaletteUI.py index a16c63c726..1ca311bc4c 100755 --- a/direct/src/leveleditor/ProtoPaletteUI.py +++ b/direct/src/leveleditor/ProtoPaletteUI.py @@ -149,9 +149,9 @@ class ProtoPaletteUI(wx.Panel): menuItem = self.popupmenu.FindItemById(event.GetId()) text = menuItem.GetText() if text == self.opAdd: - self.AddGroup() + self.tree.AddGroup() elif text == self.opDelete: - self.DeleteSelected() + self.tree.DeleteSelected() elif text == self.opSortAlpha: self.opSort = self.opSortAlpha self.tree.SortTreeNodes(self.tree.GetRootItem()) @@ -174,7 +174,7 @@ class ProtoPaletteUI(wx.Panel): itemData = ObjectBase(name=name, model=modelname, actor=True) self.editor.protoPalette.add(itemData) - newItem = self.tree.AppendItem(self.editor.ui.protoPaletteUI.root, name) + newItem = self.tree.AppendItem(self.editor.ui.protoPaletteUI.tree.root, name) self.tree.SetItemPyData(newItem, itemData) self.tree.ScrollTo(newItem)