More icons fixes

This commit is contained in:
blitzmann
2018-06-02 10:18:56 -04:00
parent 94b1876cf1
commit e8d5e9f9f2
3 changed files with 8 additions and 3 deletions

View File

@@ -237,7 +237,7 @@ class ItemAffectedBy(wx.Panel):
displayName = attrInfo.displayName if attrInfo and attrInfo.displayName != "" else attrName
if attrInfo:
if attrInfo.icon is not None:
if attrInfo.iconID is not None:
iconFile = attrInfo.iconID
icon = BitmapLoader.getBitmap(iconFile, "icons")
if icon is None:
@@ -267,7 +267,7 @@ class ItemAffectedBy(wx.Panel):
if afflictorType == Ship:
itemIcon = self.imageList.Add(BitmapLoader.getBitmap("ship_small", "gui"))
elif item.icon:
elif item.iconID:
bitmap = BitmapLoader.getBitmap(item.iconID, "icons")
itemIcon = self.imageList.Add(bitmap) if bitmap else -1
else:

View File

@@ -44,7 +44,7 @@ class ItemDependents(wx.Panel):
child = self.reqTree.AppendItem(parent, "Level {}".format(self.romanNb[int(x)]), sbIconId)
for item in items:
if item.icon:
if item.iconID:
bitmap = BitmapLoader.getBitmap(item.iconID, "icons")
itemIcon = self.imageList.Add(bitmap) if bitmap else -1
else:

View File

@@ -56,6 +56,11 @@ MARKET_ROOTS = {
2203 # Structure Modifications (Rigs)
}
# todo: figure out how icons work
loaders = {
"app:/bin/graphicIDsLoader.pyd": "res:/staticdata/graphicIDs.fsdbinary",
}
import json
with open(args.icons, 'r') as f:
icon_json = json.load(f)