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

Change to new icon locations

Browse Source
This commit is contained in:
blitzmann
2015-09-24 12:17:17 -04:00
parent fb7574e476
commit 474f270b26
46 changed files with 153 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/builtinViewColumns/ammo.py
View File

@@ -27,8 +27,8 @@ class Ammo(ViewColumn):
def __init__(self, fittingView, params):
ViewColumn.__init__(self, fittingView)
self.mask = wx.LIST_MASK_IMAGE
self.imageId = fittingView.imageList.GetImageIndex("damagePattern_small", "icons")
self.bitmap = bitmapLoader.getBitmap("damagePattern_small", "icons")
self.imageId = fittingView.imageList.GetImageIndex("damagePattern_small", "gui")
self.bitmap = bitmapLoader.getBitmap("damagePattern_small", "gui")
def getText(self, stuff):
if getattr(stuff, "charge", None) is not None:

2
gui/builtinViewColumns/ammoIcon.py
View File

@@ -44,7 +44,7 @@ class AmmoIcon(ViewColumn):
else:
iconFile = stuff.charge.icon.iconFile if stuff.item.icon else ""
if iconFile:
return self.fittingView.imageList.GetImageIndex(iconFile, "pack")
return self.fittingView.imageList.GetImageIndex(iconFile, "icons")
else:
return -1

4
gui/builtinViewColumns/attributeDisplay.py
View File

@@ -35,10 +35,10 @@ class AttributeDisplay(ViewColumn):
if params["showIcon"]:
if info.name == "power":
iconFile = "pg_small"
iconType = "icons"
iconType = "gui"
else:
iconFile = info.icon.iconFile if info.icon else None
iconType = "pack"
iconType = "icons"
if iconFile:
self.imageId = fittingView.imageList.GetImageIndex(iconFile, iconType)
self.bitmap = bitmapLoader.getBitmap(iconFile, iconType)

6
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.GetImageIndex("ship_small", "icons")
self.shipImage = fittingView.imageList.GetImageIndex("ship_small", "gui")
def getImageId(self, stuff):
if isinstance(stuff, Drone):
@@ -23,7 +23,7 @@ class BaseIcon(ViewColumn):
return -1
if isinstance(stuff, Module):
if stuff.isEmpty:
return self.fittingView.imageList.GetImageIndex("slot_%s_small" % Slot.getName(stuff.slot).lower(), "icons")
return self.fittingView.imageList.GetImageIndex("slot_%s_small" % Slot.getName(stuff.slot).lower(), "gui")
else:
return self.loadIconFile(stuff.item.icon.iconFile if stuff.item.icon else "")
@@ -32,7 +32,7 @@ class BaseIcon(ViewColumn):
def loadIconFile(self, iconFile):
if iconFile:
return self.fittingView.imageList.GetImageIndex(iconFile, "pack")
return self.fittingView.imageList.GetImageIndex(iconFile, "icons")
else:
return -1

2
gui/builtinViewColumns/baseName.py
View File

@@ -32,7 +32,7 @@ class BaseName(ViewColumn):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.columnText = "Name"
self.shipImage = fittingView.imageList.GetImageIndex("ship_small", "icons")
self.shipImage = fittingView.imageList.GetImageIndex("ship_small", "gui")
self.mask = wx.LIST_MASK_TEXT
self.projectedView = isinstance(fittingView, gui.projectedView.ProjectedView)

4
gui/builtinViewColumns/capacitorUse.py
View File

@@ -34,8 +34,8 @@ class CapacitorUse(ViewColumn):
sAttr = service.Attribute.getInstance()
info = sAttr.getAttributeInfo("capacitorNeed")
self.imageId = fittingView.imageList.GetImageIndex("capacitorRecharge_small", "icons")
self.bitmap = bitmapLoader.getBitmap("capacitorRecharge_small", "icons")
self.imageId = fittingView.imageList.GetImageIndex("capacitorRecharge_small", "gui")
self.bitmap = bitmapLoader.getBitmap("capacitorRecharge_small", "gui")
def getText(self, mod):
if isinstance(mod, Mode):

4
gui/builtinViewColumns/maxRange.py
View File

@@ -39,8 +39,8 @@ class MaxRange(ViewColumn):
if params["showIcon"]:
iconFile = info.icon.iconFile if info.icon else None
if iconFile:
self.imageId = fittingView.imageList.GetImageIndex(iconFile, "pack")
self.bitmap = bitmapLoader.getBitmap(iconFile, "pack")
self.imageId = fittingView.imageList.GetImageIndex(iconFile, "icons")
self.bitmap = bitmapLoader.getBitmap(iconFile, "icons")
else:
self.imageId = -1
self.mask = wx.LIST_MASK_IMAGE

4
gui/builtinViewColumns/misc.py
View File

@@ -35,8 +35,8 @@ class Miscellanea(ViewColumn):
"displayName": False}
ViewColumn.__init__(self, fittingView)
if params["showIcon"]:
self.imageId = fittingView.imageList.GetImageIndex("column_misc", "icons")
self.bitmap = bitmapLoader.getBitmap("column_misc", "icons")
self.imageId = fittingView.imageList.GetImageIndex("column_misc", "gui")
self.bitmap = bitmapLoader.getBitmap("column_misc", "gui")
self.mask = wx.LIST_MASK_IMAGE
else:
self.imageId = -1

4
gui/builtinViewColumns/price.py
View File

@@ -29,8 +29,8 @@ class Price(ViewColumn):
def __init__(self, fittingView, params):
ViewColumn.__init__(self, fittingView)
self.mask = wx.LIST_MASK_IMAGE
self.bitmap = bitmapLoader.getBitmap("totalPrice_small", "icons")
self.imageId = fittingView.imageList.GetImageIndex("totalPrice_small", "icons")
self.bitmap = bitmapLoader.getBitmap("totalPrice_small", "gui")
self.imageId = fittingView.imageList.GetImageIndex("totalPrice_small", "gui")
def getText(self, stuff):
if stuff.item is None or stuff.item.group.name == "Ship Modifiers":

4
gui/builtinViewColumns/propertyDisplay.py
View File

@@ -39,10 +39,10 @@ class PropertyDisplay(ViewColumn):
if params["showIcon"]:
if info.name == "power":
iconFile = "pg_small"
iconType = "icons"
iconType = "gui"
else:
iconFile = info.icon.iconFile if info.icon else None
iconType = "pack"
iconType = "icons"
if iconFile:
self.imageId = fittingView.imageList.GetImageIndex(iconFile, iconType)
else:

6
gui/builtinViewColumns/state.py
View File

@@ -43,8 +43,8 @@ class State(ViewColumn):
return State_.getName(mod.state).title()
def getImageId(self, stuff):
generic_active = self.fittingView.imageList.GetImageIndex("state_%s_small" % State_.getName(1).lower(), "icons")
generic_inactive = self.fittingView.imageList.GetImageIndex("state_%s_small" % State_.getName(-1).lower(), "icons")
generic_active = self.fittingView.imageList.GetImageIndex("state_%s_small" % State_.getName(1).lower(), "gui")
generic_inactive = self.fittingView.imageList.GetImageIndex("state_%s_small" % State_.getName(-1).lower(), "gui")
if isinstance(stuff, Drone):
if stuff.amountActive > 0:
@@ -57,7 +57,7 @@ class State(ViewColumn):
if stuff.isEmpty:
return -1
else:
return self.fittingView.imageList.GetImageIndex("state_%s_small" % State_.getName(stuff.state).lower(), "icons")
return self.fittingView.imageList.GetImageIndex("state_%s_small" % State_.getName(stuff.state).lower(), "gui")
elif isinstance(stuff, Fit):
fitID = self.mainFrame.getActiveFit()
projectionInfo = stuff.getProjectionInfo(fitID)