From b264f367612d3a6c8255874be7f2167a8d1d42ae Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Tue, 7 Dec 2010 14:54:38 +0200 Subject: [PATCH] Updated builtinViewColumns.baseIcon to use CachingImageList.GetImageIndex --- gui/builtinViewColumns/baseIcon.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/gui/builtinViewColumns/baseIcon.py b/gui/builtinViewColumns/baseIcon.py index b59bee86a..ddc5fe615 100644 --- a/gui/builtinViewColumns/baseIcon.py +++ b/gui/builtinViewColumns/baseIcon.py @@ -12,7 +12,7 @@ class BaseIcon(ViewColumn): self.maxsize = self.size self.mask = wx.LIST_MASK_IMAGE self.columnText = "" - self.shipImage = fittingView.imageList.Add(bitmapLoader.getBitmap("ship_small", "icons")) + self.shipImage = fittingView.imageList.GetImageIndex("ship_small", "icons") def getImageId(self, stuff): if isinstance(stuff, Drone): @@ -21,8 +21,7 @@ class BaseIcon(ViewColumn): return self.shipImage if isinstance(stuff, Module): if stuff.isEmpty: - bitmap = bitmapLoader.getBitmap("slot_%s_small" % Slot.getName(stuff.slot).lower(), "icons") - return self.fittingView.imageList.Add(bitmap) + return self.fittingView.imageList.GetImageIndex("slot_%s_small" % Slot.getName(stuff.slot).lower(), "icons") else: return self.loadIconFile(stuff.item.icon.iconFile if stuff.item.icon else "") @@ -31,11 +30,7 @@ class BaseIcon(ViewColumn): def loadIconFile(self, iconFile): if iconFile: - bitmap = bitmapLoader.getBitmap(iconFile, "pack") - if bitmap is None: - return -1 - else: - return self.fittingView.imageList.Add(bitmap) + return self.fittingView.imageList.GetImageIndex(iconFile, "pack") else: return -1