Change to use BitmapLoader class
This commit is contained in:
@@ -3,7 +3,7 @@ from gui.contextMenu import ContextMenu
|
||||
import gui.mainFrame
|
||||
import service
|
||||
import wx
|
||||
from gui import bitmapLoader
|
||||
from gui.bitmapLoader import BitmapLoader
|
||||
from eos.types import Skill
|
||||
import gui.globalEvents as GE
|
||||
|
||||
@@ -74,7 +74,7 @@ class ChangeAffectingSkills(ContextMenu):
|
||||
grandSub = wx.Menu()
|
||||
skillItem.SetSubMenu(grandSub)
|
||||
if skill.learned:
|
||||
bitmap = bitmapLoader.getBitmap("lvl%s" % skill.level, "gui")
|
||||
bitmap = BitmapLoader.getBitmap("lvl%s" % skill.level, "gui")
|
||||
if bitmap is not None:
|
||||
skillItem.SetBitmap(bitmap)
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ import gui.mainFrame
|
||||
import service
|
||||
import gui.globalEvents as GE
|
||||
import wx
|
||||
from gui import bitmapLoader
|
||||
from gui.bitmapLoader import BitmapLoader
|
||||
|
||||
try:
|
||||
from collections import OrderedDict
|
||||
@@ -65,7 +65,7 @@ class DamagePattern(ContextMenu):
|
||||
dp = f.damagePattern
|
||||
|
||||
if dp == pattern:
|
||||
bitmap = bitmapLoader.getBitmap("state_active_small", "gui")
|
||||
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", "gui")
|
||||
bitmap = BitmapLoader.getBitmap("state_active_small", "gui")
|
||||
pitem.SetBitmap(bitmap)
|
||||
return False
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ import gui.mainFrame
|
||||
import service
|
||||
import gui.globalEvents as GE
|
||||
import wx
|
||||
from gui import bitmapLoader
|
||||
from gui.bitmapLoader import BitmapLoader
|
||||
|
||||
class FactorReload(ContextMenu):
|
||||
def __init__(self):
|
||||
@@ -27,7 +27,7 @@ class FactorReload(ContextMenu):
|
||||
fitID = self.mainFrame.getActiveFit()
|
||||
fit = sFit.getFit(fitID)
|
||||
if fit.factorReload:
|
||||
return bitmapLoader.getBitmap("state_active_small", "gui")
|
||||
return BitmapLoader.getBitmap("state_active_small", "gui")
|
||||
else:
|
||||
return None
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ from gui.contextMenu import ContextMenu
|
||||
import gui.mainFrame
|
||||
import service
|
||||
import wx
|
||||
from gui import bitmapLoader
|
||||
from gui.bitmapLoader import BitmapLoader
|
||||
from eos.types import Hardpoint
|
||||
import gui.globalEvents as GE
|
||||
|
||||
@@ -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, "icons")
|
||||
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, "gui")
|
||||
bitmap = BitmapLoader.getBitmap("%s_small" % type, "gui")
|
||||
if bitmap is not None:
|
||||
item.SetBitmap(bitmap)
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ from gui.contextMenu import ContextMenu
|
||||
import gui.mainFrame
|
||||
import service
|
||||
import wx
|
||||
from gui import bitmapLoader
|
||||
from gui.bitmapLoader import BitmapLoader
|
||||
from eos.types import Hardpoint
|
||||
import gui.globalEvents as GE
|
||||
from gui.builtinContextMenus.moduleAmmoPicker import ModuleAmmoPicker
|
||||
|
||||
@@ -3,7 +3,7 @@ import gui.mainFrame
|
||||
import service
|
||||
import gui.globalEvents as GE
|
||||
import wx
|
||||
from gui import bitmapLoader
|
||||
from gui.bitmapLoader import BitmapLoader
|
||||
|
||||
try:
|
||||
from collections import OrderedDict
|
||||
@@ -56,7 +56,7 @@ class TargetResists(ContextMenu):
|
||||
tr = f.targetResists
|
||||
|
||||
if tr == pattern:
|
||||
bitmap = bitmapLoader.getBitmap("state_active_small", "gui")
|
||||
bitmap = BitmapLoader.getBitmap("state_active_small", "gui")
|
||||
item.SetBitmap(bitmap)
|
||||
return item
|
||||
|
||||
|
||||
Reference in New Issue
Block a user