From 88552b956cd9e890421c3b36ed0c70a20dfbe6f4 Mon Sep 17 00:00:00 2001 From: Gyedo Jeon Date: Tue, 2 Mar 2010 22:31:00 +0000 Subject: [PATCH] Added a list to keep object palette order --- direct/src/leveleditor/ObjectPaletteBase.py | 2 ++ direct/src/leveleditor/ObjectPaletteUI.py | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/direct/src/leveleditor/ObjectPaletteBase.py b/direct/src/leveleditor/ObjectPaletteBase.py index 8092e20421..7590cc8470 100755 --- a/direct/src/leveleditor/ObjectPaletteBase.py +++ b/direct/src/leveleditor/ObjectPaletteBase.py @@ -32,6 +32,7 @@ class ObjectPaletteBase: self.rootName = '_root' self.data = {} self.dataStruct = {} + self.dataKeys = [] self.populate() def insertItem(self, item, parentName): @@ -49,6 +50,7 @@ class ObjectPaletteBase: self.dataStruct[item.name] = parentName self.data[item.name] = item + self.dataKeys.append(item.name) def add(self, item, parentName = None): if type(item) == str: diff --git a/direct/src/leveleditor/ObjectPaletteUI.py b/direct/src/leveleditor/ObjectPaletteUI.py index 5f02e55430..5d01e07c4a 100755 --- a/direct/src/leveleditor/ObjectPaletteUI.py +++ b/direct/src/leveleditor/ObjectPaletteUI.py @@ -13,7 +13,7 @@ class ObjectPaletteUI(wx.Panel): self.palette = self.editor.objectPalette self.tree = wx.TreeCtrl(self) root = self.tree.AddRoot('Objects') - self.addTreeNodes(root, self.palette.dataStruct) + self.addTreeNodes(root, self.palette.dataStruct, self.palette.dataKeys) self.SortTreeNodes(root) sizer = wx.BoxSizer(wx.VERTICAL) @@ -63,9 +63,8 @@ class ObjectPaletteUI(wx.Panel): return newItem - def addTreeNodes(self, parentItem, items): - #import pdb;set_trace() - for key in items.keys(): + def addTreeNodes(self, parentItem, items, itemKeys): + for key in itemKeys: item = self.traverse(parentItem, key) if item is None: newItem = self.addTreeNode(key, parentItem, items)