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

Change to use BitmapLoader class

Browse Source
This commit is contained in:
blitzmann
2015-09-24 12:21:50 -04:00
parent ec6914d4aa
commit e9d02ce4c8
50 changed files with 184 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/builtinViewColumns/ammo.py
View File

@@ -19,7 +19,7 @@
from gui import builtinViewColumns
from gui.viewColumn import ViewColumn
from gui import bitmapLoader
from gui.bitmapLoader import BitmapLoader
import wx
class Ammo(ViewColumn):
@@ -28,7 +28,7 @@ class Ammo(ViewColumn):
ViewColumn.__init__(self, fittingView)
self.mask = wx.LIST_MASK_IMAGE
self.imageId = fittingView.imageList.GetImageIndex("damagePattern_small", "gui")
self.bitmap = bitmapLoader.getBitmap("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

@@ -19,7 +19,7 @@
from gui import builtinViewColumns
from gui.viewColumn import ViewColumn
from gui import bitmapLoader
from gui.bitmapLoader import BitmapLoader
import wx
from eos.types import Module

4
gui/builtinViewColumns/attributeDisplay.py
View File

@@ -19,7 +19,7 @@
from gui import builtinViewColumns
from gui.viewColumn import ViewColumn
from gui import bitmapLoader
from gui.bitmapLoader import BitmapLoader
from gui.utils.numberFormatter import formatAmount
import service
@@ -41,7 +41,7 @@ class AttributeDisplay(ViewColumn):
iconType = "icons"
if iconFile:
self.imageId = fittingView.imageList.GetImageIndex(iconFile, iconType)
self.bitmap = bitmapLoader.getBitmap(iconFile, iconType)
self.bitmap = BitmapLoader.getBitmap(iconFile, iconType)
else:
self.imageId = -1

2
gui/builtinViewColumns/baseIcon.py
View File

@@ -1,6 +1,6 @@
from gui import builtinViewColumns
from gui.viewColumn import ViewColumn
from gui import bitmapLoader
from gui.bitmapLoader import BitmapLoader
import wx
from eos.types import Drone, Fit, Module, Slot, Rack

4
gui/builtinViewColumns/capacitorUse.py
View File

@@ -22,7 +22,7 @@ import service
from gui.utils.numberFormatter import formatAmount
from gui.viewColumn import ViewColumn
from gui import bitmapLoader
from gui.bitmapLoader import BitmapLoader
from eos.types import Mode
class CapacitorUse(ViewColumn):
@@ -35,7 +35,7 @@ class CapacitorUse(ViewColumn):
sAttr = service.Attribute.getInstance()
info = sAttr.getAttributeInfo("capacitorNeed")
self.imageId = fittingView.imageList.GetImageIndex("capacitorRecharge_small", "gui")
self.bitmap = bitmapLoader.getBitmap("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

@@ -19,7 +19,7 @@
from gui import builtinViewColumns
from gui.viewColumn import ViewColumn
from gui import bitmapLoader
from gui.bitmapLoader import BitmapLoader
import service
from gui.utils.numberFormatter import formatAmount
import wx
@@ -40,7 +40,7 @@ class MaxRange(ViewColumn):
iconFile = info.icon.iconFile if info.icon else None
if iconFile:
self.imageId = fittingView.imageList.GetImageIndex(iconFile, "icons")
self.bitmap = bitmapLoader.getBitmap(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

@@ -20,7 +20,7 @@
import gui.mainFrame
from gui.viewColumn import ViewColumn
from gui import bitmapLoader
from gui.bitmapLoader import BitmapLoader
from gui.utils.numberFormatter import formatAmount
from gui.utils.listFormatter import formatList
from service.fit import Fit, Market
@@ -36,7 +36,7 @@ class Miscellanea(ViewColumn):
ViewColumn.__init__(self, fittingView)
if params["showIcon"]:
self.imageId = fittingView.imageList.GetImageIndex("column_misc", "gui")
self.bitmap = bitmapLoader.getBitmap("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

@@ -18,7 +18,7 @@
#===============================================================================
from gui.viewColumn import ViewColumn
from gui import bitmapLoader
from gui.bitmapLoader import BitmapLoader
from gui.utils.numberFormatter import formatAmount
from eos.types import Drone, Cargo
import wx
@@ -29,7 +29,7 @@ class Price(ViewColumn):
def __init__(self, fittingView, params):
ViewColumn.__init__(self, fittingView)
self.mask = wx.LIST_MASK_IMAGE
self.bitmap = bitmapLoader.getBitmap("totalPrice_small", "gui")
self.bitmap = BitmapLoader.getBitmap("totalPrice_small", "gui")
self.imageId = fittingView.imageList.GetImageIndex("totalPrice_small", "gui")
def getText(self, stuff):

2
gui/builtinViewColumns/propertyDisplay.py
View File

@@ -18,7 +18,7 @@
#===============================================================================
from gui.viewColumn import ViewColumn
from gui import bitmapLoader
from gui.bitmapLoader import BitmapLoader
from gui.utils.numberFormatter import formatAmount
import wx
import service

2
gui/builtinViewColumns/state.py
View File

@@ -18,7 +18,7 @@
#===============================================================================
from gui.viewColumn import ViewColumn
from gui import bitmapLoader
from gui.bitmapLoader import BitmapLoader
import gui.mainFrame
import wx