Merge branch 'qol/additionPanes' into qol/file-reorg

gui/additionsPane.py

@@ -19,19 +19,18 @@
 
 # noinspection PyPackageRequirements
 import wx
-from gui.boosterView import BoosterView
-from gui.droneView import DroneView
-from gui.fighterView import FighterView
-from gui.cargoView import CargoView
-from gui.implantView import ImplantView
-from gui.projectedView import ProjectedView
 
-from gui.commandView import CommandView
-from gui.notesView import NotesView
-from gui.pyfatogglepanel import TogglePanel
 from gui.bitmapLoader import BitmapLoader
-
+from gui.builtinAdditionPanes.boosterView import BoosterView
+from gui.builtinAdditionPanes.cargoView import CargoView
+from gui.builtinAdditionPanes.commandView import CommandView
+from gui.builtinAdditionPanes.droneView import DroneView
+from gui.builtinAdditionPanes.fighterView import FighterView
+from gui.builtinAdditionPanes.implantView import ImplantView
+from gui.builtinAdditionPanes.notesView import NotesView
+from gui.builtinAdditionPanes.projectedView import ProjectedView
 from gui.chromeTabs import PFNotebook
+from gui.pyfatogglepanel import TogglePanel
 
 
 class AdditionsPane(TogglePanel):

gui/builtinAdditionPanes/cargoView.py

@@ -22,7 +22,7 @@ import wx
 import gui.display as d
 from gui.builtinViewColumns.state import State
 from gui.contextMenu import ContextMenu
-import globalEvents as GE
+import gui.globalEvents as GE
 from gui.utils.staticHelpers import DragDropHelper
 from service.fit import Fit
 from service.market import Market

gui/builtinAdditionPanes/commandView.py

@@ -19,16 +19,16 @@
 
 # noinspection PyPackageRequirements
 import wx
+
+import gui.builtinAdditionPanes.droneView
 import gui.display as d
 import gui.globalEvents as GE
-
-import gui.droneView
+from eos.saveddata.drone import Drone as es_Drone
+from gui.builtinContextMenus.commandFits import CommandFits
 from gui.builtinViewColumns.state import State
 from gui.contextMenu import ContextMenu
-from gui.builtinContextMenus.commandFits import CommandFits
 from gui.utils.staticHelpers import DragDropHelper
 from service.fit import Fit
-from eos.saveddata.drone import Drone as es_Drone
 
 
 class DummyItem(object):
@@ -73,7 +73,7 @@ class CommandView(d.Display):
         self.Bind(wx.EVT_LEFT_DCLICK, self.remove)
         self.Bind(wx.EVT_KEY_UP, self.kbEvent)
 
-        self.droneView = gui.droneView.DroneView
+        self.droneView = gui.builtinAdditionPanes.droneView.DroneView
 
         if "__WXGTK__" in wx.PlatformInfo:
             self.Bind(wx.EVT_RIGHT_UP, self.scheduleMenu)

gui/builtinAdditionPanes/implantView.py

@@ -24,7 +24,7 @@ import gui.marketBrowser as marketBrowser
 import gui.mainFrame
 from gui.builtinViewColumns.state import State
 from gui.contextMenu import ContextMenu
-import globalEvents as GE
+import gui.globalEvents as GE
 from eos.saveddata.fit import ImplantLocation
 from service.fit import Fit
 from service.market import Market

gui/builtinAdditionPanes/projectedView.py

@@ -20,17 +20,18 @@
 # noinspection PyPackageRequirements
 import wx
 from logbook import Logger
+
+import gui.builtinAdditionPanes.droneView
 import gui.display as d
 import gui.globalEvents as GE
-import gui.droneView
+from eos.saveddata.drone import Drone as es_Drone
+from eos.saveddata.fighter import Fighter as es_Fighter
+from eos.saveddata.module import Module as es_Module
 from gui.builtinViewColumns.state import State
 from gui.contextMenu import ContextMenu
 from gui.utils.staticHelpers import DragDropHelper
 from service.fit import Fit
 from service.market import Market
-from eos.saveddata.drone import Drone as es_Drone
-from eos.saveddata.fighter import Fighter as es_Fighter
-from eos.saveddata.module import Module as es_Module
 
 pyfalog = Logger(__name__)
 
@@ -80,7 +81,7 @@ class ProjectedView(d.Display):
         self.Bind(wx.EVT_LEFT_DCLICK, self.remove)
         self.Bind(wx.EVT_KEY_UP, self.kbEvent)
 
-        self.droneView = gui.droneView.DroneView
+        self.droneView = gui.builtinAdditionPanes.droneView.DroneView
 
         if "__WXGTK__" in wx.PlatformInfo:
             self.Bind(wx.EVT_RIGHT_UP, self.scheduleMenu)

gui/builtinViewColumns/baseName.py

@@ -44,7 +44,7 @@ class BaseName(ViewColumn):
         self.columnText = "Name"
         self.shipImage = fittingView.imageList.GetImageIndex("ship_small", "gui")
         self.mask = wx.LIST_MASK_TEXT
-        self.projectedView = isinstance(fittingView, gui.projectedView.ProjectedView)
+        self.projectedView = isinstance(fittingView, gui.builtinAdditionPanes.projectedView.ProjectedView)
 
     def getText(self, stuff):
         if isinstance(stuff, Drone):