From 474f270b26ea19aa59409e49d51fa9dabaf88184 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Thu, 24 Sep 2015 12:17:17 -0400 Subject: [PATCH] Change to new icon locations --- gui/additionsPane.py | 12 ++--- .../changeAffectingSkills.py | 2 +- gui/builtinContextMenus/damagePattern.py | 4 +- gui/builtinContextMenus/factorReload.py | 2 +- gui/builtinContextMenus/moduleAmmoPicker.py | 4 +- gui/builtinContextMenus/targetResists.py | 2 +- gui/builtinGraphs/fitDps.py | 2 +- .../pyfaGaugePreferences.py | 2 +- .../pyfaGeneralPreferences.py | 2 +- .../pyfaHTMLExportPreferences.py | 2 +- .../pyfaNetworkPreferences.py | 2 +- .../pyfaUpdatePreferences.py | 2 +- gui/builtinStatsViews/capacitorViewFull.py | 4 +- gui/builtinStatsViews/firepowerViewFull.py | 6 +-- gui/builtinStatsViews/miningyieldViewFull.py | 6 +-- gui/builtinStatsViews/priceViewFull.py | 2 +- gui/builtinStatsViews/rechargeViewFull.py | 4 +- gui/builtinStatsViews/resistancesViewFull.py | 4 +- gui/builtinStatsViews/resourcesViewFull.py | 4 +- gui/builtinViewColumns/ammo.py | 4 +- gui/builtinViewColumns/ammoIcon.py | 2 +- gui/builtinViewColumns/attributeDisplay.py | 4 +- gui/builtinViewColumns/baseIcon.py | 6 +-- gui/builtinViewColumns/baseName.py | 2 +- gui/builtinViewColumns/capacitorUse.py | 4 +- gui/builtinViewColumns/maxRange.py | 4 +- gui/builtinViewColumns/misc.py | 4 +- gui/builtinViewColumns/price.py | 4 +- gui/builtinViewColumns/propertyDisplay.py | 4 +- gui/builtinViewColumns/state.py | 6 +-- gui/builtinViews/fittingView.py | 2 +- gui/builtinViews/fleetView.py | 6 +-- gui/characterEditor.py | 12 ++--- gui/characterSelection.py | 8 +-- gui/chromeTabs.py | 10 ++-- gui/fleetBrowser.py | 14 ++--- gui/graphFrame.py | 2 +- gui/itemStats.py | 40 +++++++------- gui/mainFrame.py | 6 +-- gui/mainMenuBar.py | 10 ++-- gui/marketBrowser.py | 8 +-- gui/patternEditor.py | 12 ++--- gui/preferenceDialog.py | 2 +- gui/pyfatogglepanel.py | 6 +-- gui/resistsEditor.py | 4 +- gui/shipBrowser.py | 52 +++++++++---------- 46 files changed, 153 insertions(+), 153 deletions(-) diff --git a/gui/additionsPane.py b/gui/additionsPane.py index cefa7937d..d88e0eea8 100644 --- a/gui/additionsPane.py +++ b/gui/additionsPane.py @@ -51,12 +51,12 @@ class AdditionsPane(TogglePanel): self.notebook.SetMinSize(size) baseSizer.Add(self.notebook, 1, wx.EXPAND) - droneImg = bitmapLoader.getImage("drone_small", "icons") - implantImg = bitmapLoader.getImage("implant_small", "icons") - boosterImg = bitmapLoader.getImage("booster_small", "icons") - projectedImg = bitmapLoader.getImage("projected_small", "icons") - gangImg = bitmapLoader.getImage("fleet_fc_small", "icons") - cargoImg = bitmapLoader.getImage("cargo_small", "icons") + droneImg = bitmapLoader.getImage("drone_small", "gui") + implantImg = bitmapLoader.getImage("implant_small", "gui") + boosterImg = bitmapLoader.getImage("booster_small", "gui") + projectedImg = bitmapLoader.getImage("projected_small", "gui") + gangImg = bitmapLoader.getImage("fleet_fc_small", "gui") + cargoImg = bitmapLoader.getImage("cargo_small", "gui") self.notebook.AddPage(DroneView(self.notebook), "Drones", tabImage = droneImg, showClose = False) self.notebook.AddPage(CargoView(self.notebook), "Cargo", tabImage = cargoImg, showClose = False) diff --git a/gui/builtinContextMenus/changeAffectingSkills.py b/gui/builtinContextMenus/changeAffectingSkills.py index 32530bdb6..816eefa00 100644 --- a/gui/builtinContextMenus/changeAffectingSkills.py +++ b/gui/builtinContextMenus/changeAffectingSkills.py @@ -74,7 +74,7 @@ class ChangeAffectingSkills(ContextMenu): grandSub = wx.Menu() skillItem.SetSubMenu(grandSub) if skill.learned: - bitmap = bitmapLoader.getBitmap("lvl%s" % skill.level, "icons") + bitmap = bitmapLoader.getBitmap("lvl%s" % skill.level, "gui") if bitmap is not None: skillItem.SetBitmap(bitmap) diff --git a/gui/builtinContextMenus/damagePattern.py b/gui/builtinContextMenus/damagePattern.py index 29a029389..5171be8e6 100644 --- a/gui/builtinContextMenus/damagePattern.py +++ b/gui/builtinContextMenus/damagePattern.py @@ -65,7 +65,7 @@ class DamagePattern(ContextMenu): dp = f.damagePattern if dp == pattern: - bitmap = bitmapLoader.getBitmap("state_active_small", "icons") + bitmap = bitmapLoader.getBitmap("state_active_small", "gui") menuItem.SetBitmap(bitmap) return menuItem @@ -80,7 +80,7 @@ class DamagePattern(ContextMenu): self.patternIds[id] = self.singles[i] rootMenu.Bind(wx.EVT_MENU, self.handlePatternSwitch, pitem) if self.patternIds[id] == self.fit.damagePattern: - bitmap = bitmapLoader.getBitmap("state_active_small", "icons") + bitmap = bitmapLoader.getBitmap("state_active_small", "gui") pitem.SetBitmap(bitmap) return False diff --git a/gui/builtinContextMenus/factorReload.py b/gui/builtinContextMenus/factorReload.py index 133acad51..3495cad6e 100644 --- a/gui/builtinContextMenus/factorReload.py +++ b/gui/builtinContextMenus/factorReload.py @@ -27,7 +27,7 @@ class FactorReload(ContextMenu): fitID = self.mainFrame.getActiveFit() fit = sFit.getFit(fitID) if fit.factorReload: - return bitmapLoader.getBitmap("state_active_small", "icons") + return bitmapLoader.getBitmap("state_active_small", "gui") else: return None diff --git a/gui/builtinContextMenus/moduleAmmoPicker.py b/gui/builtinContextMenus/moduleAmmoPicker.py index d64ec5321..7532be63d 100644 --- a/gui/builtinContextMenus/moduleAmmoPicker.py +++ b/gui/builtinContextMenus/moduleAmmoPicker.py @@ -105,7 +105,7 @@ class ModuleAmmoPicker(ContextMenu): menu.Bind(wx.EVT_MENU, self.handleAmmoSwitch, item) item.charge = charge if charge is not None and charge.icon is not None: - bitmap = bitmapLoader.getBitmap(charge.icon.iconFile, "pack") + bitmap = bitmapLoader.getBitmap(charge.icon.iconFile, "icons") if bitmap is not None: item.SetBitmap(bitmap) @@ -181,7 +181,7 @@ class ModuleAmmoPicker(ContextMenu): type = currType item = wx.MenuItem(m, wx.ID_ANY, type.capitalize()) - bitmap = bitmapLoader.getBitmap("%s_small" % type, "icons") + bitmap = bitmapLoader.getBitmap("%s_small" % type, "gui") if bitmap is not None: item.SetBitmap(bitmap) diff --git a/gui/builtinContextMenus/targetResists.py b/gui/builtinContextMenus/targetResists.py index 27e6c5153..6d7651db5 100644 --- a/gui/builtinContextMenus/targetResists.py +++ b/gui/builtinContextMenus/targetResists.py @@ -56,7 +56,7 @@ class TargetResists(ContextMenu): tr = f.targetResists if tr == pattern: - bitmap = bitmapLoader.getBitmap("state_active_small", "icons") + bitmap = bitmapLoader.getBitmap("state_active_small", "gui") item.SetBitmap(bitmap) return item diff --git a/gui/builtinGraphs/fitDps.py b/gui/builtinGraphs/fitDps.py index 7b36b7d0d..b15a995f6 100644 --- a/gui/builtinGraphs/fitDps.py +++ b/gui/builtinGraphs/fitDps.py @@ -56,7 +56,7 @@ class FitDpsGraph(Graph): sAttr = service.Attribute.getInstance() for key, attrName in self.propertyAttributeMap.iteritems(): iconFile = sAttr.getAttributeInfo(attrName).icon.iconFile - bitmap = bitmapLoader.getBitmap(iconFile, "pack") + bitmap = bitmapLoader.getBitmap(iconFile, "icons") if bitmap: icons[key] = bitmap diff --git a/gui/builtinPreferenceViews/pyfaGaugePreferences.py b/gui/builtinPreferenceViews/pyfaGaugePreferences.py index f96e67618..26015b03f 100644 --- a/gui/builtinPreferenceViews/pyfaGaugePreferences.py +++ b/gui/builtinPreferenceViews/pyfaGaugePreferences.py @@ -313,7 +313,7 @@ class PFGaugePref ( PreferenceView): self.cp103105E.Bind( wx.EVT_COLOURPICKER_CHANGED, self.OnColourChanged ) def getImage(self): - return bitmapLoader.getBitmap("pref-gauges_big", "icons") + return bitmapLoader.getBitmap("pref-gauges_big", "gui") def InitDefaultColours(self): self.c0100S = wx.Colour(191, 191, 191, 255) diff --git a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py index 87f506ba6..2b5505cd7 100644 --- a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py +++ b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py @@ -144,6 +144,6 @@ class PFGeneralPref ( PreferenceView): self.sFit.serviceFittingOptions["showMarketShortcuts"] = self.cbMarketShortcuts.GetValue() def getImage(self): - return bitmapLoader.getBitmap("prefs_settings", "icons") + return bitmapLoader.getBitmap("prefs_settings", "gui") PFGeneralPref.register() diff --git a/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py b/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py index 992fff1a3..e19d072b9 100644 --- a/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py +++ b/gui/builtinPreferenceViews/pyfaHTMLExportPreferences.py @@ -76,6 +76,6 @@ class PFHTMLExportPref ( PreferenceView): self.HTMLExportSettings.setEnabled(self.exportEnabled.GetValue()) def getImage(self): - return bitmapLoader.getBitmap("prefs_html", "icons") + return bitmapLoader.getBitmap("prefs_html", "gui") PFHTMLExportPref.register() diff --git a/gui/builtinPreferenceViews/pyfaNetworkPreferences.py b/gui/builtinPreferenceViews/pyfaNetworkPreferences.py index 059a505de..aea5a4905 100644 --- a/gui/builtinPreferenceViews/pyfaNetworkPreferences.py +++ b/gui/builtinPreferenceViews/pyfaNetworkPreferences.py @@ -223,6 +223,6 @@ class PFNetworkPref ( PreferenceView): self.editProxySettingsPort.Disable() def getImage(self): - return bitmapLoader.getBitmap("prefs_proxy", "icons") + return bitmapLoader.getBitmap("prefs_proxy", "gui") PFNetworkPref.register() diff --git a/gui/builtinPreferenceViews/pyfaUpdatePreferences.py b/gui/builtinPreferenceViews/pyfaUpdatePreferences.py index f76542b39..4dd6ebe95 100644 --- a/gui/builtinPreferenceViews/pyfaUpdatePreferences.py +++ b/gui/builtinPreferenceViews/pyfaUpdatePreferences.py @@ -99,6 +99,6 @@ class PFUpdatePref (PreferenceView): wx.LaunchDefaultBrowser('https://github.com/DarkFenX/Pyfa/releases/tag/'+self.UpdateSettings.get('version')) def getImage(self): - return bitmapLoader.getBitmap("prefs_update", "icons") + return bitmapLoader.getBitmap("prefs_update", "gui") PFUpdatePref.register() diff --git a/gui/builtinStatsViews/capacitorViewFull.py b/gui/builtinStatsViews/capacitorViewFull.py index b140aea36..79f98551d 100644 --- a/gui/builtinStatsViews/capacitorViewFull.py +++ b/gui/builtinStatsViews/capacitorViewFull.py @@ -48,7 +48,7 @@ class CapacitorViewFull(StatsView): baseBox = wx.BoxSizer(wx.HORIZONTAL) sizerCapacitor.Add(baseBox, 0, wx.ALIGN_LEFT) - bitmap = bitmapLoader.getStaticBitmap("capacitorInfo_big", parent, "icons") + bitmap = bitmapLoader.getStaticBitmap("capacitorInfo_big", parent, "gui") tooltip = wx.ToolTip("Capacitor stability") bitmap.SetToolTip(tooltip) baseBox.Add(bitmap, 0, wx.ALIGN_CENTER) @@ -83,7 +83,7 @@ class CapacitorViewFull(StatsView): sizerCapacitor.Add(baseBox, 0, wx.ALIGN_CENTER_HORIZONTAL) tooltip = wx.ToolTip("Capacitor throughput") - bitmap = bitmapLoader.getStaticBitmap("capacitorRecharge_big", parent, "icons") + bitmap = bitmapLoader.getStaticBitmap("capacitorRecharge_big", parent, "gui") bitmap.SetToolTip(tooltip) baseBox.Add(bitmap, 0, wx.ALIGN_CENTER) diff --git a/gui/builtinStatsViews/firepowerViewFull.py b/gui/builtinStatsViews/firepowerViewFull.py index a7180252e..b99e14257 100644 --- a/gui/builtinStatsViews/firepowerViewFull.py +++ b/gui/builtinStatsViews/firepowerViewFull.py @@ -61,7 +61,7 @@ class FirepowerViewFull(StatsView): baseBox = wx.BoxSizer(wx.HORIZONTAL) sizerFirepower.Add(baseBox, 1, wx.ALIGN_LEFT if counter == 0 else wx.ALIGN_CENTER_HORIZONTAL) - baseBox.Add(bitmapLoader.getStaticBitmap("%s_big" % image, parent, "icons"), 0, wx.ALIGN_CENTER) + baseBox.Add(bitmapLoader.getStaticBitmap("%s_big" % image, parent, "gui"), 0, wx.ALIGN_CENTER) box = wx.BoxSizer(wx.VERTICAL) baseBox.Add(box, 0, wx.ALIGN_CENTER) @@ -82,7 +82,7 @@ class FirepowerViewFull(StatsView): baseBox = wx.BoxSizer(wx.HORIZONTAL) targetSizer.Add(baseBox, 0, wx.ALIGN_RIGHT) - baseBox.Add(bitmapLoader.getStaticBitmap("volley_big", parent, "icons"), 0, wx.ALIGN_CENTER) + baseBox.Add(bitmapLoader.getStaticBitmap("volley_big", parent, "gui"), 0, wx.ALIGN_CENTER) gridS = wx.GridSizer(2,2,0,0) @@ -103,7 +103,7 @@ class FirepowerViewFull(StatsView): gridS.Add(lbl, 0, wx.ALIGN_LEFT) - image = bitmapLoader.getBitmap("mining_small", "icons") + image = bitmapLoader.getBitmap("mining_small", "gui") self.miningyield = wx.BitmapButton(contentPanel, -1, image) self.miningyield.SetToolTip(wx.ToolTip("Click to toggle to Mining Yield ")) self.miningyield.Bind(wx.EVT_BUTTON, self.switchToMiningYieldView) diff --git a/gui/builtinStatsViews/miningyieldViewFull.py b/gui/builtinStatsViews/miningyieldViewFull.py index a83800d70..b9c8f9e69 100644 --- a/gui/builtinStatsViews/miningyieldViewFull.py +++ b/gui/builtinStatsViews/miningyieldViewFull.py @@ -55,7 +55,7 @@ class MiningYieldViewFull(StatsView): baseBox = wx.BoxSizer(wx.HORIZONTAL) sizerMiningYield.Add(baseBox, 1, wx.ALIGN_LEFT if counter == 0 else wx.ALIGN_CENTER_HORIZONTAL) - baseBox.Add(bitmapLoader.getStaticBitmap("%s_big" % image, parent, "icons"), 0, wx.ALIGN_CENTER) + baseBox.Add(bitmapLoader.getStaticBitmap("%s_big" % image, parent, "gui"), 0, wx.ALIGN_CENTER) box = wx.BoxSizer(wx.VERTICAL) baseBox.Add(box, 0, wx.ALIGN_CENTER) @@ -76,7 +76,7 @@ class MiningYieldViewFull(StatsView): baseBox = wx.BoxSizer(wx.HORIZONTAL) targetSizer.Add(baseBox, 0, wx.ALIGN_LEFT) - baseBox.Add(bitmapLoader.getStaticBitmap("cargoBay_big", parent, "icons"), 0, wx.ALIGN_CENTER) + baseBox.Add(bitmapLoader.getStaticBitmap("cargoBay_big", parent, "gui"), 0, wx.ALIGN_CENTER) box = wx.BoxSizer(wx.VERTICAL) baseBox.Add(box, 0, wx.EXPAND) @@ -92,7 +92,7 @@ class MiningYieldViewFull(StatsView): self._cachedValues.append(0) - image = bitmapLoader.getBitmap("turret_small", "icons") + image = bitmapLoader.getBitmap("turret_small", "gui") firepower = wx.BitmapButton(contentPanel, -1, image) firepower.SetToolTip(wx.ToolTip("Click to toggle to Firepower View")) firepower.Bind(wx.EVT_BUTTON, self.switchToFirepowerView) diff --git a/gui/builtinStatsViews/priceViewFull.py b/gui/builtinStatsViews/priceViewFull.py index f1d3fbd1d..06c1fd8ae 100644 --- a/gui/builtinStatsViews/priceViewFull.py +++ b/gui/builtinStatsViews/priceViewFull.py @@ -56,7 +56,7 @@ class PriceViewFull(StatsView): box = wx.BoxSizer(wx.HORIZONTAL) gridPrice.Add(box, 0, wx.ALIGN_TOP) - box.Add(bitmapLoader.getStaticBitmap(image, contentPanel, "icons"), 0, wx.ALIGN_CENTER) + box.Add(bitmapLoader.getStaticBitmap(image, contentPanel, "gui"), 0, wx.ALIGN_CENTER) vbox = wx.BoxSizer(wx.VERTICAL) box.Add(vbox, 1, wx.EXPAND) diff --git a/gui/builtinStatsViews/rechargeViewFull.py b/gui/builtinStatsViews/rechargeViewFull.py index 8ec9a9b55..3cd7b5138 100644 --- a/gui/builtinStatsViews/rechargeViewFull.py +++ b/gui/builtinStatsViews/rechargeViewFull.py @@ -62,14 +62,14 @@ class RechargeViewFull(StatsView): sizerTankStats.Add(wx.StaticText(contentPanel, wx.ID_ANY, ""), 0) toolTipText = {"shieldPassive" : "Passive shield recharge", "shieldActive" : "Active shield boost", "armorActive" : "Armor repair amount", "hullActive" : "Hull repair amount"} for tankType in ("shieldPassive", "shieldActive", "armorActive", "hullActive"): - bitmap = bitmapLoader.getStaticBitmap("%s_big" % tankType, contentPanel, "icons") + bitmap = bitmapLoader.getStaticBitmap("%s_big" % tankType, contentPanel, "gui") tooltip = wx.ToolTip(toolTipText[tankType]) bitmap.SetToolTip(tooltip) sizerTankStats.Add(bitmap, 0, wx.ALIGN_CENTER) toolTipText = {"reinforced" : "Reinforced", "sustained" : "Sustained"} for stability in ("reinforced", "sustained"): - bitmap = bitmapLoader.getStaticBitmap("regen%s_big" % stability.capitalize(), contentPanel, "icons") + bitmap = bitmapLoader.getStaticBitmap("regen%s_big" % stability.capitalize(), contentPanel, "gui") tooltip = wx.ToolTip(toolTipText[stability]) bitmap.SetToolTip(tooltip) sizerTankStats.Add(bitmap, 0, wx.ALIGN_CENTER) diff --git a/gui/builtinStatsViews/resistancesViewFull.py b/gui/builtinStatsViews/resistancesViewFull.py index 2b0d94b5f..d014aab29 100644 --- a/gui/builtinStatsViews/resistancesViewFull.py +++ b/gui/builtinStatsViews/resistancesViewFull.py @@ -82,7 +82,7 @@ class ResistancesViewFull(StatsView): col+=1 toolTipText = {"em" : "Electromagnetic resistance", "thermal" : "Thermal resistance", "kinetic" : "Kinetic resistance", "explosive" : "Explosive resistance"} for damageType in ("em", "thermal", "kinetic", "explosive"): - bitmap = bitmapLoader.getStaticBitmap("%s_big" % damageType, contentPanel, "icons") + bitmap = bitmapLoader.getStaticBitmap("%s_big" % damageType, contentPanel, "gui") tooltip = wx.ToolTip(toolTipText[damageType]) bitmap.SetToolTip(tooltip) sizerResistances.Add(bitmap, wx.GBPosition( row, col ), wx.GBSpan( 1, 1 ), wx.ALIGN_CENTER) @@ -104,7 +104,7 @@ class ResistancesViewFull(StatsView): toolTipText = {"shield" : "Shield resistance", "armor" : "Armor resistance", "hull" : "Hull resistance", "damagePattern" : "Incoming damage pattern"} for tankType in ("shield", "armor", "hull", "separator", "damagePattern"): if tankType != "separator": - bitmap = bitmapLoader.getStaticBitmap("%s_big" % tankType, contentPanel, "icons") + bitmap = bitmapLoader.getStaticBitmap("%s_big" % tankType, contentPanel, "gui") tooltip = wx.ToolTip(toolTipText[tankType]) bitmap.SetToolTip(tooltip) sizerResistances.Add(bitmap, wx.GBPosition( row, col ), wx.GBSpan( 1, 1 ), wx.ALIGN_CENTER) diff --git a/gui/builtinStatsViews/resourcesViewFull.py b/gui/builtinStatsViews/resourcesViewFull.py index a06c75a7e..ce995d7ac 100644 --- a/gui/builtinStatsViews/resourcesViewFull.py +++ b/gui/builtinStatsViews/resourcesViewFull.py @@ -91,7 +91,7 @@ class ResourcesViewFull(StatsView): for type in ("turret", "launcher", "drones", "calibration"): box = wx.BoxSizer(wx.HORIZONTAL) - bitmap = bitmapLoader.getStaticBitmap("%s_big" % type, parent, "icons") + bitmap = bitmapLoader.getStaticBitmap("%s_big" % type, parent, "gui") tooltip = wx.ToolTip(tooltipText[type]) bitmap.SetToolTip(tooltip) @@ -119,7 +119,7 @@ class ResourcesViewFull(StatsView): for type in group: capitalizedType = type[0].capitalize() + type[1:] - bitmap = bitmapLoader.getStaticBitmap(type + "_big", parent, "icons") + bitmap = bitmapLoader.getStaticBitmap(type + "_big", parent, "gui") tooltip = wx.ToolTip(tooltipText[type]) bitmap.SetToolTip(tooltip) diff --git a/gui/builtinViewColumns/ammo.py b/gui/builtinViewColumns/ammo.py index fe50c6fbd..1c5e02ca4 100644 --- a/gui/builtinViewColumns/ammo.py +++ b/gui/builtinViewColumns/ammo.py @@ -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: diff --git a/gui/builtinViewColumns/ammoIcon.py b/gui/builtinViewColumns/ammoIcon.py index 19d55364e..2e6378e9e 100644 --- a/gui/builtinViewColumns/ammoIcon.py +++ b/gui/builtinViewColumns/ammoIcon.py @@ -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 diff --git a/gui/builtinViewColumns/attributeDisplay.py b/gui/builtinViewColumns/attributeDisplay.py index 86966574b..db5d6d41b 100644 --- a/gui/builtinViewColumns/attributeDisplay.py +++ b/gui/builtinViewColumns/attributeDisplay.py @@ -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) diff --git a/gui/builtinViewColumns/baseIcon.py b/gui/builtinViewColumns/baseIcon.py index 975267f4a..bb7f5efa0 100644 --- a/gui/builtinViewColumns/baseIcon.py +++ b/gui/builtinViewColumns/baseIcon.py @@ -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 diff --git a/gui/builtinViewColumns/baseName.py b/gui/builtinViewColumns/baseName.py index 97b992337..d422756a9 100644 --- a/gui/builtinViewColumns/baseName.py +++ b/gui/builtinViewColumns/baseName.py @@ -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) diff --git a/gui/builtinViewColumns/capacitorUse.py b/gui/builtinViewColumns/capacitorUse.py index 497869a66..edf461313 100644 --- a/gui/builtinViewColumns/capacitorUse.py +++ b/gui/builtinViewColumns/capacitorUse.py @@ -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): diff --git a/gui/builtinViewColumns/maxRange.py b/gui/builtinViewColumns/maxRange.py index 17d27ef5d..a55090552 100644 --- a/gui/builtinViewColumns/maxRange.py +++ b/gui/builtinViewColumns/maxRange.py @@ -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 diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py index 75b127bbd..1bb8269c6 100644 --- a/gui/builtinViewColumns/misc.py +++ b/gui/builtinViewColumns/misc.py @@ -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 diff --git a/gui/builtinViewColumns/price.py b/gui/builtinViewColumns/price.py index c046a4b55..e9b117050 100644 --- a/gui/builtinViewColumns/price.py +++ b/gui/builtinViewColumns/price.py @@ -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": diff --git a/gui/builtinViewColumns/propertyDisplay.py b/gui/builtinViewColumns/propertyDisplay.py index bd471f351..8cdd9a50f 100644 --- a/gui/builtinViewColumns/propertyDisplay.py +++ b/gui/builtinViewColumns/propertyDisplay.py @@ -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: diff --git a/gui/builtinViewColumns/state.py b/gui/builtinViewColumns/state.py index 8110a85ad..263d5b892 100644 --- a/gui/builtinViewColumns/state.py +++ b/gui/builtinViewColumns/state.py @@ -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) diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index efec5898f..d7c995c2f 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -294,7 +294,7 @@ class FittingView(d.Display): sFit = service.Fit.getInstance() fit = sFit.getFit(self.getActiveFit()) - bitmap = bitmapLoader.getImage("race_%s_small" % fit.ship.item.race, "icons") + bitmap = bitmapLoader.getImage("race_%s_small" % fit.ship.item.race, "gui") text = "%s: %s" % (fit.ship.item.name, fit.name) pageIndex = self.parent.GetPageIndex(self) diff --git a/gui/builtinViews/fleetView.py b/gui/builtinViews/fleetView.py index fa9916d63..8124dd119 100644 --- a/gui/builtinViews/fleetView.py +++ b/gui/builtinViews/fleetView.py @@ -28,7 +28,7 @@ class FleetView(wx.gizmos.TreeListCtrl): self.tabManager = parent self.fleetId = None - self.fleetImg = bitmapLoader.getImage("53_16", "pack") + self.fleetImg = bitmapLoader.getImage("53_16", "icons") self.imageList = wx.ImageList(16, 16) self.SetImageList(self.imageList) @@ -38,9 +38,9 @@ class FleetView(wx.gizmos.TreeListCtrl): self.SetMainColumn(1) self.icons = {} - self.addImage = self.imageList.Add(bitmapLoader.getBitmap("add_small", "icons")) + self.addImage = self.imageList.Add(bitmapLoader.getBitmap("add_small", "gui")) for icon in ("fb", "fc", "sb", "sc", "wb", "wc"): - self.icons[icon] = self.imageList.Add(bitmapLoader.getBitmap("fleet_%s_small" % icon, "icons")) + self.icons[icon] = self.imageList.Add(bitmapLoader.getBitmap("fleet_%s_small" % icon, "gui")) self.Bind(wx.EVT_TREE_ITEM_ACTIVATED, self.checkNew) self.mainFrame = gui.mainFrame.MainFrame.getInstance() diff --git a/gui/characterEditor.py b/gui/characterEditor.py index 55fa8d403..a35349d5c 100644 --- a/gui/characterEditor.py +++ b/gui/characterEditor.py @@ -34,7 +34,7 @@ class CharacterEditor(wx.Frame): wx.Frame.__init__ (self, parent, id=wx.ID_ANY, title=u"pyfa: Character Editor", pos=wx.DefaultPosition, size=wx.Size(641, 600), style=wx.DEFAULT_FRAME_STYLE|wx.FRAME_FLOAT_ON_PARENT|wx.TAB_TRAVERSAL) - i = wx.IconFromBitmap(bitmapLoader.getBitmap("character_small", "icons")) + i = wx.IconFromBitmap(bitmapLoader.getBitmap("character_small", "gui")) self.SetIcon(i) self.disableWin= wx.WindowDisabler(self) @@ -67,7 +67,7 @@ class CharacterEditor(wx.Frame): self.navSizer.Add(self.btnSave, 0, wx.ALIGN_CENTER) buttons = (("new", wx.ART_NEW), - ("rename", bitmapLoader.getBitmap("rename", "icons")), + ("rename", bitmapLoader.getBitmap("rename", "gui")), ("copy", wx.ART_COPY), ("delete", wx.ART_DELETE)) @@ -281,7 +281,7 @@ class SkillTreeView (wx.Panel): self.imageList = wx.ImageList(16, 16) tree.SetImageList(self.imageList) - self.skillBookImageId = self.imageList.Add(bitmapLoader.getBitmap("skill_small", "icons")) + self.skillBookImageId = self.imageList.Add(bitmapLoader.getBitmap("skill_small", "gui")) tree.AddColumn("Skill") tree.AddColumn("Level") @@ -388,7 +388,7 @@ class ImplantsTreeView (wx.Panel): def addMarketViewImage(self, iconFile): if iconFile is None: return -1 - bitmap = bitmapLoader.getBitmap(iconFile, "pack") + bitmap = bitmapLoader.getBitmap(iconFile, "icons") if bitmap is None: return -1 else: @@ -416,9 +416,9 @@ class ImplantsTreeView (wx.Panel): buttonSizer = wx.BoxSizer(wx.VERTICAL) pmainSizer.Add(buttonSizer, 0, wx.TOP, 5) - self.btnAdd = GenBitmapButton(self, wx.ID_ADD, bitmapLoader.getBitmap("fit_add_small", "icons"), style = wx.BORDER_NONE) + self.btnAdd = GenBitmapButton(self, wx.ID_ADD, bitmapLoader.getBitmap("fit_add_small", "gui"), style = wx.BORDER_NONE) buttonSizer.Add(self.btnAdd, 0) - self.btnRemove = GenBitmapButton(self, wx.ID_REMOVE, bitmapLoader.getBitmap("fit_delete_small", "icons"), style = wx.BORDER_NONE) + self.btnRemove = GenBitmapButton(self, wx.ID_REMOVE, bitmapLoader.getBitmap("fit_delete_small", "gui"), style = wx.BORDER_NONE) buttonSizer.Add(self.btnRemove, 0) self.pluggedImplantsTree = AvailableImplantsView(self, style=wx.LC_SINGLE_SEL) diff --git a/gui/characterSelection.py b/gui/characterSelection.py index 855882e78..f49bc103c 100644 --- a/gui/characterSelection.py +++ b/gui/characterSelection.py @@ -41,10 +41,10 @@ class CharacterSelection(wx.Panel): self.refreshCharacterList() - self.cleanSkills = bitmapLoader.getBitmap("skill_big", "icons") - self.redSkills = bitmapLoader.getBitmap("skillRed_big", "icons") - self.greenSkills = bitmapLoader.getBitmap("skillGreen_big", "icons") - self.refresh = bitmapLoader.getBitmap("refresh", "icons") + self.cleanSkills = bitmapLoader.getBitmap("skill_big", "gui") + self.redSkills = bitmapLoader.getBitmap("skillRed_big", "gui") + self.greenSkills = bitmapLoader.getBitmap("skillGreen_big", "gui") + self.refresh = bitmapLoader.getBitmap("refresh", "gui") self.btnRefresh = wx.BitmapButton(self, wx.ID_ANY, self.refresh) size = self.btnRefresh.GetSize() diff --git a/gui/chromeTabs.py b/gui/chromeTabs.py index 8e4c07aaa..3115737b5 100644 --- a/gui/chromeTabs.py +++ b/gui/chromeTabs.py @@ -336,10 +336,10 @@ class PFTabRenderer: closeButton -- True if tab can be closed """ # tab left/right zones inclination - self.ctabLeft = bitmapLoader.getImage("ctableft", "icons") - self.ctabMiddle = bitmapLoader.getImage("ctabmiddle", "icons") - self.ctabRight = bitmapLoader.getImage("ctabright", "icons") - self.ctabClose = bitmapLoader.getImage("ctabclose", "icons") + self.ctabLeft = bitmapLoader.getImage("ctableft", "gui") + self.ctabMiddle = bitmapLoader.getImage("ctabmiddle", "gui") + self.ctabRight = bitmapLoader.getImage("ctabright", "gui") + self.ctabClose = bitmapLoader.getImage("ctabclose", "gui") self.leftWidth = self.ctabLeft.GetWidth() self.rightWidth = self.ctabRight.GetWidth() @@ -595,7 +595,7 @@ class PFTabRenderer: class PFAddRenderer: def __init__(self): """Renders the add tab button""" - self.addImg = bitmapLoader.getImage("ctabadd", "icons") + self.addImg = bitmapLoader.getImage("ctabadd", "gui") self.width = self.addImg.GetWidth() self.height = self.addImg.GetHeight() diff --git a/gui/fleetBrowser.py b/gui/fleetBrowser.py index 3e287de29..7a509bd23 100644 --- a/gui/fleetBrowser.py +++ b/gui/fleetBrowser.py @@ -135,7 +135,7 @@ class FleetBrowserHeader (wx.Panel): wx.Panel.__init__ (self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition, size=wx.Size(500, 24), style=wx.TAB_TRAVERSAL) self.SetBackgroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_BTNFACE ) ) - self.newBmp = bitmapLoader.getBitmap("fit_add_small","icons") + self.newBmp = bitmapLoader.getBitmap("fit_add_small","gui") bmpSize = (16,16) mainSizer = wx.BoxSizer(wx.HORIZONTAL) @@ -264,11 +264,11 @@ class FleetItem(SFItem.SFBrowserItem): self.fontNormal = wx.FontFromPixelSize((0,14),wx.SWISS, wx.NORMAL, wx.NORMAL, False) self.fontSmall = wx.FontFromPixelSize((0,12),wx.SWISS, wx.NORMAL, wx.NORMAL, False) - self.copyBmp = bitmapLoader.getBitmap("fit_add_small", "icons") - self.renameBmp = bitmapLoader.getBitmap("fit_rename_small", "icons") - self.deleteBmp = bitmapLoader.getBitmap("fit_delete_small","icons") - self.acceptBmp = bitmapLoader.getBitmap("faccept_small", "icons") - self.fleetBmp = bitmapLoader.getBitmap("fleet_item_big", "icons") + self.copyBmp = bitmapLoader.getBitmap("fit_add_small", "gui") + self.renameBmp = bitmapLoader.getBitmap("fit_rename_small", "gui") + self.deleteBmp = bitmapLoader.getBitmap("fit_delete_small","gui") + self.acceptBmp = bitmapLoader.getBitmap("faccept_small", "gui") + self.fleetBmp = bitmapLoader.getBitmap("fleet_item_big", "gui") fleetImg = self.fleetBmp.ConvertToImage() fleetImg = fleetImg.Blur(2) @@ -453,4 +453,4 @@ class PFGenBitmapButton(GenBitmapButton): self.bgcolor = wx.Brush(color) def GetBackgroundBrush(self, dc): - return self.bgcolor \ No newline at end of file + return self.bgcolor diff --git a/gui/graphFrame.py b/gui/graphFrame.py index 96472812a..ad001447d 100644 --- a/gui/graphFrame.py +++ b/gui/graphFrame.py @@ -70,7 +70,7 @@ class GraphFrame(wx.Frame): wx.Frame.__init__(self, parent, title=u"pyfa: Graph Generator", style=style, size=(520, 390)) - i = wx.IconFromBitmap(bitmapLoader.getBitmap("graphs_small", "icons")) + i = wx.IconFromBitmap(bitmapLoader.getBitmap("graphs_small", "gui")) self.SetIcon(i) self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.CreateStatusBar() diff --git a/gui/itemStats.py b/gui/itemStats.py index 9d971aaa7..b6a39166e 100644 --- a/gui/itemStats.py +++ b/gui/itemStats.py @@ -77,7 +77,7 @@ class ItemStatsDialog(wx.Dialog): 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, "pack") + itemImg = bitmapLoader.getBitmap(iconFile, "icons") if itemImg is not None: self.SetIcon(wx.IconFromBitmap(itemImg)) self.SetTitle("%s: %s" % ("%s Stats" % itmContext if itmContext is not None else "Stats", item.name)) @@ -364,16 +364,16 @@ class ItemParams (wx.Panel): if info: if info.icon is not None: iconFile = info.icon.iconFile - icon = bitmapLoader.getBitmap(iconFile, "pack") + icon = bitmapLoader.getBitmap(iconFile, "icons") if icon is None: - icon = bitmapLoader.getBitmap("transparent16x16", "icons") + icon = bitmapLoader.getBitmap("transparent16x16", "gui") attrIcon = self.imageList.Add(icon) else: - attrIcon = self.imageList.Add(bitmapLoader.getBitmap("07_15", "pack")) + attrIcon = self.imageList.Add(bitmapLoader.getBitmap("07_15", "icons")) else: - attrIcon = self.imageList.Add(bitmapLoader.getBitmap("07_15", "pack")) + attrIcon = self.imageList.Add(bitmapLoader.getBitmap("07_15", "icons")) index = self.paramList.InsertImageStringItem(sys.maxint, attrName,attrIcon) @@ -461,7 +461,7 @@ class ItemRequirements ( wx.Panel ): self.imageList = wx.ImageList(16, 16) self.reqTree.SetImageList(self.imageList) - skillBookId = self.imageList.Add(bitmapLoader.getBitmap("skill_small", "icons")) + skillBookId = self.imageList.Add(bitmapLoader.getBitmap("skill_small", "gui")) self.getFullSkillTree(item,self.root,skillBookId) @@ -753,7 +753,7 @@ class ItemAffectedBy (wx.Panel): if thing == self.stuff: parent = root else: # projected fit - icon = self.imageList.Add(bitmapLoader.getBitmap("ship_small", "icons")) + icon = self.imageList.Add(bitmapLoader.getBitmap("ship_small", "gui")) child = self.affectedBy.AppendItem(root, "{} ({})".format(thing.name, thing.ship.item.name), icon) parent = child @@ -767,14 +767,14 @@ class ItemAffectedBy (wx.Panel): if attrInfo: if attrInfo.icon is not None: iconFile = attrInfo.icon.iconFile - icon = bitmapLoader.getBitmap(iconFile, "pack") + icon = bitmapLoader.getBitmap(iconFile, "icons") if icon is None: - icon = bitmapLoader.getBitmap("transparent16x16", "icons") + icon = bitmapLoader.getBitmap("transparent16x16", "gui") attrIcon = self.imageList.Add(icon) else: - attrIcon = self.imageList.Add(bitmapLoader.getBitmap("07_15", "pack")) + attrIcon = self.imageList.Add(bitmapLoader.getBitmap("07_15", "icons")) else: - attrIcon = self.imageList.Add(bitmapLoader.getBitmap("07_15", "pack")) + attrIcon = self.imageList.Add(bitmapLoader.getBitmap("07_15", "icons")) if self.showRealNames: display = attrName @@ -794,9 +794,9 @@ class ItemAffectedBy (wx.Panel): afflictorType, afflictor, item, attrModifier, attrAmount, projected = itemInfo if afflictorType == Ship: - itemIcon = self.imageList.Add(bitmapLoader.getBitmap("ship_small", "icons")) + itemIcon = self.imageList.Add(bitmapLoader.getBitmap("ship_small", "gui")) elif item.icon: - bitmap = bitmapLoader.getBitmap(item.icon.iconFile, "pack") + bitmap = bitmapLoader.getBitmap(item.icon.iconFile, "icons") itemIcon = self.imageList.Add(bitmap) if bitmap else -1 else: itemIcon = -1 @@ -884,7 +884,7 @@ class ItemAffectedBy (wx.Panel): if thing == self.stuff: parent = root else: # projected fit - icon = self.imageList.Add(bitmapLoader.getBitmap("ship_small", "icons")) + icon = self.imageList.Add(bitmapLoader.getBitmap("ship_small", "gui")) child = self.affectedBy.AppendItem(root, "{} ({})".format(thing.name, thing.ship.item.name), icon) parent = child @@ -897,9 +897,9 @@ class ItemAffectedBy (wx.Panel): afflictorType, afflictors, attrData, item, projected = info counter = len(afflictors) if afflictorType == Ship: - itemIcon = self.imageList.Add(bitmapLoader.getBitmap("ship_small", "icons")) + itemIcon = self.imageList.Add(bitmapLoader.getBitmap("ship_small", "gui")) elif item.icon: - bitmap = bitmapLoader.getBitmap(item.icon.iconFile, "pack") + bitmap = bitmapLoader.getBitmap(item.icon.iconFile, "icons") itemIcon = self.imageList.Add(bitmap) if bitmap else -1 else: itemIcon = -1 @@ -925,15 +925,15 @@ class ItemAffectedBy (wx.Panel): if attrInfo: if attrInfo.icon is not None: iconFile = attrInfo.icon.iconFile - icon = bitmapLoader.getBitmap(iconFile, "pack") + icon = bitmapLoader.getBitmap(iconFile, "icons") if icon is None: - icon = bitmapLoader.getBitmap("transparent16x16", "icons") + icon = bitmapLoader.getBitmap("transparent16x16", "gui") attrIcon = self.imageList.Add(icon) else: - attrIcon = self.imageList.Add(bitmapLoader.getBitmap("07_15", "pack")) + attrIcon = self.imageList.Add(bitmapLoader.getBitmap("07_15", "icons")) else: - attrIcon = self.imageList.Add(bitmapLoader.getBitmap("07_15", "pack")) + attrIcon = self.imageList.Add(bitmapLoader.getBitmap("07_15", "icons")) if attrModifier == "s*": attrModifier = "*" diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 6f89df091..25b9b6895 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -114,7 +114,7 @@ class MainFrame(wx.Frame): self.SetBackgroundColour( wx.SystemSettings.GetColour( wx.SYS_COLOUR_BTNFACE ) ) #Load and set the icon for pyfa main window - i = wx.IconFromBitmap(bitmapLoader.getBitmap("pyfa", "icons")) + i = wx.IconFromBitmap(bitmapLoader.getBitmap("pyfa", "gui")) self.SetIcon(i) #Create the layout and windows @@ -139,8 +139,8 @@ class MainFrame(wx.Frame): self.notebookBrowsers = gui.chromeTabs.PFNotebook(self.splitter, False) - marketImg = bitmapLoader.getImage("market_small", "icons") - shipBrowserImg = bitmapLoader.getImage("ship_small", "icons") + marketImg = bitmapLoader.getImage("market_small", "gui") + shipBrowserImg = bitmapLoader.getImage("ship_small", "gui") self.marketBrowser = MarketBrowser(self.notebookBrowsers) self.notebookBrowsers.AddPage(self.marketBrowser, "Market", tabImage = marketImg, showClose = False) diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py index 06e1dfabf..3e9efd623 100644 --- a/gui/mainMenuBar.py +++ b/gui/mainMenuBar.py @@ -76,23 +76,23 @@ class MainMenuBar(wx.MenuBar): self.Append(windowMenu, "&Window") charEditItem = wx.MenuItem(windowMenu, self.characterEditorId, "&Character Editor\tCTRL+E") - charEditItem.SetBitmap(bitmapLoader.getBitmap("character_small", "icons")) + charEditItem.SetBitmap(bitmapLoader.getBitmap("character_small", "gui")) windowMenu.AppendItem(charEditItem) damagePatternEditItem = wx.MenuItem(windowMenu, self.damagePatternEditorId, "Damage Pattern Editor\tCTRL+D") - damagePatternEditItem.SetBitmap(bitmapLoader.getBitmap("damagePattern_small", "icons")) + damagePatternEditItem.SetBitmap(bitmapLoader.getBitmap("damagePattern_small", "gui")) windowMenu.AppendItem(damagePatternEditItem) targetResistsEditItem = wx.MenuItem(windowMenu, self.targetResistsEditorId, "Target Resists Editor\tCTRL+R") - targetResistsEditItem.SetBitmap(bitmapLoader.getBitmap("explosive_big", "icons")) + targetResistsEditItem.SetBitmap(bitmapLoader.getBitmap("explosive_big", "gui")) windowMenu.AppendItem(targetResistsEditItem) graphFrameItem = wx.MenuItem(windowMenu, self.graphFrameId, "Graphs\tCTRL+G") - graphFrameItem.SetBitmap(bitmapLoader.getBitmap("graphs_small", "icons")) + graphFrameItem.SetBitmap(bitmapLoader.getBitmap("graphs_small", "gui")) windowMenu.AppendItem(graphFrameItem) preferencesItem = wx.MenuItem(windowMenu, wx.ID_PREFERENCES, "Preferences\tCTRL+P") - preferencesItem.SetBitmap(bitmapLoader.getBitmap("preferences_small", "icons")) + preferencesItem.SetBitmap(bitmapLoader.getBitmap("preferences_small", "gui")) windowMenu.AppendItem(preferencesItem) # Help menu diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py index 1c8329a1b..88a72d023 100644 --- a/gui/marketBrowser.py +++ b/gui/marketBrowser.py @@ -105,8 +105,8 @@ class MarketBrowser(wx.Panel): class SearchBox(SBox.PFSearchBox): def __init__(self, parent): SBox.PFSearchBox.__init__(self, parent) - cancelBitmap = bitmapLoader.getBitmap("fit_delete_small","icons") - searchBitmap = bitmapLoader.getBitmap("fsearch_small","icons") + cancelBitmap = bitmapLoader.getBitmap("fit_delete_small","gui") + searchBitmap = bitmapLoader.getBitmap("fsearch_small","gui") self.SetSearchBitmap(searchBitmap) self.SetCancelBitmap(cancelBitmap) self.ShowSearchButton() @@ -134,13 +134,13 @@ class MarketTree(wx.TreeCtrl): self.SortChildren(self.root) # Add recently used modules node - rumIconId = self.addImage("market_small", "icons") + rumIconId = self.addImage("market_small", "gui") self.AppendItem(self.root, "Recently Used Modules", rumIconId, data = wx.TreeItemData(RECENTLY_USED_MODULES)) # Bind our lookup method to when the tree gets expanded self.Bind(wx.EVT_TREE_ITEM_EXPANDING, self.expandLookup) - def addImage(self, iconFile, location = "pack"): + def addImage(self, iconFile, location="icons"): if iconFile is None: return -1 return self.imageList.GetImageIndex(iconFile, location) diff --git a/gui/patternEditor.py b/gui/patternEditor.py index e0be21587..8dce4c18e 100644 --- a/gui/patternEditor.py +++ b/gui/patternEditor.py @@ -61,7 +61,7 @@ class DmgPatternEditorDlg(wx.Dialog): size = None headerSizer.Add(self.ccDmgPattern, 1, wx.ALIGN_CENTER_VERTICAL | wx.RIGHT|wx.LEFT, 3) buttons = (("new", wx.ART_NEW), - ("rename", bitmapLoader.getBitmap("rename", "icons")), + ("rename", bitmapLoader.getBitmap("rename", "gui")), ("copy", wx.ART_COPY), ("delete", wx.ART_DELETE)) for name, art in buttons: @@ -90,10 +90,10 @@ class DmgPatternEditorDlg(wx.Dialog): mainSizer.Add(self.sl, 0, wx.EXPAND | wx.TOP | wx.BOTTOM, 5) contentSizer = wx.BoxSizer(wx.VERTICAL) - self.embitmap = bitmapLoader.getBitmap("em_big", "icons") - self.thermbitmap = bitmapLoader.getBitmap("thermal_big", "icons") - self.kinbitmap = bitmapLoader.getBitmap("kinetic_big", "icons") - self.expbitmap = bitmapLoader.getBitmap("explosive_big", "icons") + self.embitmap = bitmapLoader.getBitmap("em_big", "gui") + self.thermbitmap = bitmapLoader.getBitmap("thermal_big", "gui") + self.kinbitmap = bitmapLoader.getBitmap("kinetic_big", "gui") + self.expbitmap = bitmapLoader.getBitmap("explosive_big", "gui") dmgeditSizer = wx.FlexGridSizer(2, 6, 0, 2) dmgeditSizer.AddGrowableCol(0) @@ -105,7 +105,7 @@ class DmgPatternEditorDlg(wx.Dialog): defSize = wx.Size(width,-1) for i, type in enumerate(self.DAMAGE_TYPES): - bmp = wx.StaticBitmap(self, wx.ID_ANY, bitmapLoader.getBitmap("%s_big"%type, "icons")) + bmp = wx.StaticBitmap(self, wx.ID_ANY, bitmapLoader.getBitmap("%s_big"%type, "gui")) if i%2: style = wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT | wx.LEFT border = 10 diff --git a/gui/preferenceDialog.py b/gui/preferenceDialog.py index 4061f2731..bdf5afb35 100644 --- a/gui/preferenceDialog.py +++ b/gui/preferenceDialog.py @@ -26,7 +26,7 @@ class PreferenceDialog(wx.Dialog): def __init__(self, parent): wx.Dialog.__init__(self, parent, id=wx.ID_ANY, size=wx.DefaultSize, style=wx.DEFAULT_DIALOG_STYLE) self.SetTitle("pyfa - Preferences") - i = wx.IconFromBitmap(bitmapLoader.getBitmap("preferences_small", "icons")) + i = wx.IconFromBitmap(bitmapLoader.getBitmap("preferences_small", "gui")) self.SetIcon(i) mainSizer = wx.BoxSizer(wx.VERTICAL) diff --git a/gui/pyfatogglepanel.py b/gui/pyfatogglepanel.py index 7cf088b24..c5eeec026 100644 --- a/gui/pyfatogglepanel.py +++ b/gui/pyfatogglepanel.py @@ -54,8 +54,8 @@ class TogglePanel ( wx.Panel ): # Load expanded/collapsed bitmaps from the icons folder - self.bmpExpanded = bitmapLoader.getBitmap("down-arrow2","icons") - self.bmpCollapsed = bitmapLoader.getBitmap("up-arrow2","icons") + self.bmpExpanded = bitmapLoader.getBitmap("down-arrow2","gui") + self.bmpCollapsed = bitmapLoader.getBitmap("up-arrow2","gui") # Make the bitmaps have the same color as window text @@ -207,4 +207,4 @@ class TogglePanel ( wx.Panel ): x, y = self.GetBestSize() self.OnStateChange((x, y)) else: - self.parent.Layout() \ No newline at end of file + self.parent.Layout() diff --git a/gui/resistsEditor.py b/gui/resistsEditor.py index acebfb10a..97b8fb16d 100644 --- a/gui/resistsEditor.py +++ b/gui/resistsEditor.py @@ -55,7 +55,7 @@ class ResistsEditorDlg(wx.Dialog): headerSizer.Add(self.ccResists, 1, wx.ALIGN_CENTER_VERTICAL | wx.RIGHT | wx.LEFT, 3) buttons = (("new", wx.ART_NEW), - ("rename", bitmapLoader.getBitmap("rename", "icons")), + ("rename", bitmapLoader.getBitmap("rename", "gui")), ("copy", wx.ART_COPY), ("delete", wx.ART_DELETE)) for name, art in buttons: @@ -103,7 +103,7 @@ class ResistsEditorDlg(wx.Dialog): style = wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT border = 5 - bmp = wx.StaticBitmap(self, wx.ID_ANY, bitmapLoader.getBitmap("%s_big"%type, "icons")) + bmp = wx.StaticBitmap(self, wx.ID_ANY, bitmapLoader.getBitmap("%s_big"%type, "gui")) resistEditSizer.Add(bmp, 0, style, border) # set text edit setattr(self, "%sEdit"%type, wx.TextCtrl(self, wx.ID_ANY, "", wx.DefaultPosition, defSize)) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index c5d81c3f1..5629adce7 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -107,9 +107,9 @@ class RaceSelector(wx.Window): self.buttonsPadding = 4 if layout == wx.VERTICAL: - self.bmpArrow = bitmapLoader.getBitmap("down-arrow2","icons") + self.bmpArrow = bitmapLoader.getBitmap("down-arrow2","gui") else: - self.bmpArrow = bitmapLoader.getBitmap("up-arrow2","icons") + self.bmpArrow = bitmapLoader.getBitmap("up-arrow2","gui") # Make the bitmaps have the same color as window text @@ -207,7 +207,7 @@ class RaceSelector(wx.Window): self.raceBmps = [] for race in races: if race: - self.raceBmps.append(bitmapLoader.getBitmap("race_%s_small" % race, "icons")) + self.raceBmps.append(bitmapLoader.getBitmap("race_%s_small" % race, "gui")) self.raceNames = races self.CalcButtonsBarPos() self.Refresh() @@ -328,14 +328,14 @@ class NavigationPanel(SFItem.SFBrowserItem): def __init__(self,parent, size = (-1, 24)): SFItem.SFBrowserItem.__init__(self,parent,size = size) - self.rewBmpH = bitmapLoader.getBitmap("frewind_small","icons") - self.forwBmp = bitmapLoader.getBitmap("fforward_small","icons") - self.searchBmpH = bitmapLoader.getBitmap("fsearch_small","icons") - self.newBmpH = bitmapLoader.getBitmap("fit_add_small","icons") - self.resetBmpH = bitmapLoader.getBitmap("freset_small","icons") - self.switchBmpH = bitmapLoader.getBitmap("fit_switch_view_mode_small","icons") + self.rewBmpH = bitmapLoader.getBitmap("frewind_small","gui") + self.forwBmp = bitmapLoader.getBitmap("fforward_small","gui") + self.searchBmpH = bitmapLoader.getBitmap("fsearch_small","gui") + self.newBmpH = bitmapLoader.getBitmap("fit_add_small","gui") + self.resetBmpH = bitmapLoader.getBitmap("freset_small","gui") + self.switchBmpH = bitmapLoader.getBitmap("fit_switch_view_mode_small","gui") - switchImg = bitmapLoader.getImage("fit_switch_view_mode_small","icons") + switchImg = bitmapLoader.getImage("fit_switch_view_mode_small","gui") switchImg = switchImg.AdjustChannels(1,1,1,0.4) self.switchBmpD = wx.BitmapFromImage(switchImg) @@ -967,7 +967,7 @@ class CategoryItem(SFItem.SFBrowserItem): SFItem.SFBrowserItem.__init__(self,parent,size = size) if categoryID: - self.shipBmp = bitmapLoader.getBitmap("ship_small","icons") + self.shipBmp = bitmapLoader.getBitmap("ship_small","gui") else: self.shipBmp = wx.EmptyBitmap(16,16) @@ -1099,26 +1099,26 @@ class ShipItem(SFItem.SFBrowserItem): self.shipBmp = None if shipID: - self.shipBmp = bitmapLoader.getBitmap(str(shipID),"ships") + self.shipBmp = bitmapLoader.getBitmap(str(shipID), "renders") if not self.shipBmp: - self.shipBmp = bitmapLoader.getBitmap("ship_no_image_big","icons") + self.shipBmp = bitmapLoader.getBitmap("ship_no_image_big", "gui") self.shipFittingInfo = shipFittingInfo self.shipName, self.shipFits = shipFittingInfo - self.newBmp = bitmapLoader.getBitmap("fit_add_small", "icons") - self.acceptBmp = bitmapLoader.getBitmap("faccept_small", "icons") + self.newBmp = bitmapLoader.getBitmap("fit_add_small", "gui") + self.acceptBmp = bitmapLoader.getBitmap("faccept_small", "gui") - self.shipEffBk = bitmapLoader.getBitmap("fshipbk_big","icons") + self.shipEffBk = bitmapLoader.getBitmap("fshipbk_big","gui") img = wx.ImageFromBitmap(self.shipEffBk) img = img.Mirror(False) self.shipEffBkMirrored = wx.BitmapFromImage(img) - self.raceBmp = bitmapLoader.getBitmap("race_%s_small" % self.shipRace, "icons") + self.raceBmp = bitmapLoader.getBitmap("race_%s_small" % self.shipRace, "gui") if not self.raceBmp: - self.raceBmp = bitmapLoader.getBitmap("fit_delete_small","icons") + self.raceBmp = bitmapLoader.getBitmap("fit_delete_small","gui") self.raceDropShadowBmp = drawUtils.CreateDropShadowBitmap(self.raceBmp, 0.2) @@ -1429,10 +1429,10 @@ class FitItem(SFItem.SFBrowserItem): self.deleted = False if shipID: - self.shipBmp = bitmapLoader.getBitmap(str(shipID),"ships") + self.shipBmp = bitmapLoader.getBitmap(str(shipID),"renders") if not self.shipBmp: - self.shipBmp = bitmapLoader.getBitmap("ship_no_image_big","icons") + self.shipBmp = bitmapLoader.getBitmap("ship_no_image_big","gui") self.shipFittingInfo = shipFittingInfo self.shipName, self.fitName, self.fitBooster, self.timestamp = shipFittingInfo @@ -1440,13 +1440,13 @@ class FitItem(SFItem.SFBrowserItem): # see GH issue #62 if self.fitBooster is None: self.fitBooster = False - self.boosterBmp = bitmapLoader.getBitmap("fleet_fc_small", "icons") - self.copyBmp = bitmapLoader.getBitmap("fit_add_small", "icons") - self.renameBmp = bitmapLoader.getBitmap("fit_rename_small", "icons") - self.deleteBmp = bitmapLoader.getBitmap("fit_delete_small","icons") - self.acceptBmp = bitmapLoader.getBitmap("faccept_small", "icons") + self.boosterBmp = bitmapLoader.getBitmap("fleet_fc_small", "gui") + self.copyBmp = bitmapLoader.getBitmap("fit_add_small", "gui") + self.renameBmp = bitmapLoader.getBitmap("fit_rename_small", "gui") + self.deleteBmp = bitmapLoader.getBitmap("fit_delete_small","gui") + self.acceptBmp = bitmapLoader.getBitmap("faccept_small", "gui") - self.shipEffBk = bitmapLoader.getBitmap("fshipbk_big","icons") + self.shipEffBk = bitmapLoader.getBitmap("fshipbk_big","gui") img = wx.ImageFromBitmap(self.shipEffBk) img = img.Mirror(False)