From ced029315a8855cba22a2122ccc892ba5017d04f Mon Sep 17 00:00:00 2001 From: Arkady Trestman Date: Wed, 10 Feb 2010 22:38:20 +0000 Subject: [PATCH] corrected minor deletion issues --- direct/src/leveleditor/ObjectPaletteBase.py | 1 - direct/src/leveleditor/ProtoPaletteUI.py | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/direct/src/leveleditor/ObjectPaletteBase.py b/direct/src/leveleditor/ObjectPaletteBase.py index 18e514de14..8092e20421 100755 --- a/direct/src/leveleditor/ObjectPaletteBase.py +++ b/direct/src/leveleditor/ObjectPaletteBase.py @@ -71,7 +71,6 @@ class ObjectPaletteBase: def delete(self, name): try: - import pdb;set_trace() deleteItems = {} node = self.deleteStruct(name, deleteItems) if node is not None: diff --git a/direct/src/leveleditor/ProtoPaletteUI.py b/direct/src/leveleditor/ProtoPaletteUI.py index 171f3ceed9..fc2f166fac 100755 --- a/direct/src/leveleditor/ProtoPaletteUI.py +++ b/direct/src/leveleditor/ProtoPaletteUI.py @@ -57,7 +57,7 @@ class ProtoPaletteUI(wx.Panel): self.editorTxt = "Proto Objects Editor" self.opAdd = "Add Group" - self.opDelete = "Delete Group" + self.opDelete = "Delete" self.menuItemsGen = list() self.menuItemsGen.append(self.opAdd) @@ -207,7 +207,7 @@ class ProtoPaletteUI(wx.Panel): if text == self.opAdd: self.AddGroup() elif text == self.opDelete: - self.DeleteGroup() + self.Delete() def AddGroup(self): #import pdb;set_trace() @@ -236,10 +236,10 @@ class ProtoPaletteUI(wx.Panel): self.tree.Expand(self.root) self.tree.ScrollTo(newItem) - def DeleteGroup(self): + def Delete(self): item = self.tree.GetSelection() itemText = self.tree.GetItemText(item) - if item is not None and itemText != self.rootName: + if item and itemText != self.rootName: self.tree.Delete(item) self.editor.protoPalette.delete(itemText)