dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Updated builtinViewColumns.baseIcon to use CachingImageList.GetImageIndex

Browse Source
This commit is contained in:
HomeWorld
2010-12-07 14:54:38 +02:00
parent f34d038308
commit b264f36761
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gui/builtinViewColumns/baseIcon.py
View File

@@ -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