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

Merge branch 'icons-1621' into v2.2.0b1

Browse Source 
# Conflicts:
#	eos/db/__init__.py
#	eos/db/gamedata/__init__.py
#	eos/db/gamedata/item.py
#	eos/gamedata.py
#	eve.db
This commit is contained in:
blitzmann
2018-06-12 21:43:28 -04:00
parent e19d231eba 19cf3c2036
commit 6fdcce12a3
1876 changed files with 188 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gui/builtinItemStatsViews/itemAttributes.py
View File

@@ -194,8 +194,8 @@ class ItemParams(wx.Panel):
attrName += " ({})".format(info.ID)
if info:
if info.icon is not None:
iconFile = info.icon.iconFile
if info.iconID is not None:
iconFile = info.iconID
icon = BitmapLoader.getBitmap(iconFile, "icons")
if icon is None:
@@ -203,9 +203,9 @@ class ItemParams(wx.Panel):
attrIcon = self.imageList.Add(icon)
else:
attrIcon = self.imageList.Add(BitmapLoader.getBitmap("7_15", "icons"))
attrIcon = self.imageList.Add(BitmapLoader.getBitmap("0", "icons"))
else:
attrIcon = self.imageList.Add(BitmapLoader.getBitmap("7_15", "icons"))
attrIcon = self.imageList.Add(BitmapLoader.getBitmap("0", "icons"))
index = self.paramList.InsertItem(self.paramList.GetItemCount(), attrName, attrIcon)
idNameMap[idCount] = attrName