Merge branch 'master' into spoolup

gui/builtinAdditionPanes/fighterView.py

@@ -25,7 +25,7 @@ from gui.builtinMarketBrowser.events import ItemSelected, ITEM_SELECTED
 import gui.mainFrame
 import gui.display as d
 from gui.builtinViewColumns.state import State
-from eos.saveddata.module import Slot
+from eos.const import FittingSlot
 from gui.contextMenu import ContextMenu
 from gui.utils.staticHelpers import DragDropHelper
 from service.fit import Fit
@@ -93,9 +93,9 @@ class FighterView(wx.Panel):
         if fit:
             for x in self.labels:
                 if fit.isStructure:
-                    slot = getattr(Slot, "FS_{}".format(x.upper()))
+                    slot = getattr(FittingSlot, "FS_{}".format(x.upper()))
                 else:
-                    slot = getattr(Slot, "F_{}".format(x.upper()))
+                    slot = getattr(FittingSlot, "F_{}".format(x.upper()))
                 used = fit.getSlotsUsed(slot)
                 total = fit.getNumSlots(slot)
                 color = wx.Colour(204, 51, 51) if used > total else wx.SystemSettings.GetColour(

gui/builtinAdditionPanes/implantView.py

@@ -26,7 +26,7 @@ from gui.builtinViewColumns.state import State
 from gui.utils.staticHelpers import DragDropHelper
 from gui.contextMenu import ContextMenu
 import gui.globalEvents as GE
-from eos.saveddata.fit import ImplantLocation
+from eos.const import ImplantLocation
 from service.fit import Fit
 from service.market import Market
 import gui.fitCommands as cmd