From 9dee761f6dbfae2793f8195eaee39f4038b491bc Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Mon, 12 Jun 2017 01:17:00 -0400 Subject: [PATCH] Move addition pane views into their own directory --- gui/additionsPane.py | 19 +++++++++---------- gui/builtinAdditionPanes/__init__.py | 0 gui/{ => builtinAdditionPanes}/boosterView.py | 0 gui/{ => builtinAdditionPanes}/cargoView.py | 2 +- gui/{ => builtinAdditionPanes}/commandView.py | 10 +++++----- gui/{ => builtinAdditionPanes}/droneView.py | 0 gui/{ => builtinAdditionPanes}/fighterView.py | 0 gui/{ => builtinAdditionPanes}/implantView.py | 2 +- gui/{ => builtinAdditionPanes}/notesView.py | 0 .../projectedView.py | 11 ++++++----- gui/builtinViewColumns/baseName.py | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 gui/builtinAdditionPanes/__init__.py rename gui/{ => builtinAdditionPanes}/boosterView.py (100%) rename gui/{ => builtinAdditionPanes}/cargoView.py (99%) rename gui/{ => builtinAdditionPanes}/commandView.py (98%) rename gui/{ => builtinAdditionPanes}/droneView.py (100%) rename gui/{ => builtinAdditionPanes}/fighterView.py (100%) rename gui/{ => builtinAdditionPanes}/implantView.py (99%) rename gui/{ => builtinAdditionPanes}/notesView.py (100%) rename gui/{ => builtinAdditionPanes}/projectedView.py (99%) diff --git a/gui/additionsPane.py b/gui/additionsPane.py index 503fc4135..b12fe5036 100644 --- a/gui/additionsPane.py +++ b/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): diff --git a/gui/builtinAdditionPanes/__init__.py b/gui/builtinAdditionPanes/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/gui/boosterView.py b/gui/builtinAdditionPanes/boosterView.py similarity index 100% rename from gui/boosterView.py rename to gui/builtinAdditionPanes/boosterView.py diff --git a/gui/cargoView.py b/gui/builtinAdditionPanes/cargoView.py similarity index 99% rename from gui/cargoView.py rename to gui/builtinAdditionPanes/cargoView.py index 8230cb975..742ff11b1 100644 --- a/gui/cargoView.py +++ b/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 diff --git a/gui/commandView.py b/gui/builtinAdditionPanes/commandView.py similarity index 98% rename from gui/commandView.py rename to gui/builtinAdditionPanes/commandView.py index 8341e79fb..db7b916d2 100644 --- a/gui/commandView.py +++ b/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) diff --git a/gui/droneView.py b/gui/builtinAdditionPanes/droneView.py similarity index 100% rename from gui/droneView.py rename to gui/builtinAdditionPanes/droneView.py diff --git a/gui/fighterView.py b/gui/builtinAdditionPanes/fighterView.py similarity index 100% rename from gui/fighterView.py rename to gui/builtinAdditionPanes/fighterView.py diff --git a/gui/implantView.py b/gui/builtinAdditionPanes/implantView.py similarity index 99% rename from gui/implantView.py rename to gui/builtinAdditionPanes/implantView.py index c89c3e6d6..eb7997e4d 100644 --- a/gui/implantView.py +++ b/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 diff --git a/gui/notesView.py b/gui/builtinAdditionPanes/notesView.py similarity index 100% rename from gui/notesView.py rename to gui/builtinAdditionPanes/notesView.py diff --git a/gui/projectedView.py b/gui/builtinAdditionPanes/projectedView.py similarity index 99% rename from gui/projectedView.py rename to gui/builtinAdditionPanes/projectedView.py index 9a772e6ab..0e4176eed 100644 --- a/gui/projectedView.py +++ b/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) diff --git a/gui/builtinViewColumns/baseName.py b/gui/builtinViewColumns/baseName.py index aeae8339f..3a8bc6fa7 100644 --- a/gui/builtinViewColumns/baseName.py +++ b/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):