Merge branch 'icons-1621' into v2.2.0b1
# 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:
@@ -82,10 +82,8 @@ class ItemStatsDialog(wx.Dialog):
|
||||
item = sMkt.getItem(victim.ID)
|
||||
victim = None
|
||||
self.context = itmContext
|
||||
if item.icon is not None:
|
||||
before, sep, after = item.icon.iconFile.rpartition("_")
|
||||
iconFile = "%s%s%s" % (before, sep, "0%s" % after if len(after) < 2 else after)
|
||||
itemImg = BitmapLoader.getBitmap(iconFile, "icons")
|
||||
if item.iconID is not None:
|
||||
itemImg = BitmapLoader.getBitmap(item.iconID, "icons")
|
||||
if itemImg is not None:
|
||||
self.SetIcon(wx.Icon(itemImg))
|
||||
self.SetTitle("%s: %s%s" % ("%s Stats" % itmContext if itmContext is not None else "Stats", item.name,
|
||||
|
||||
Reference in New Issue
Block a user