From f3729f028728a3c12eaf42178a0d8c1c5cc1eb35 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Sun, 28 Nov 2010 22:51:08 +0200 Subject: [PATCH] Updated FitChanged in all files --- gui/boosterView.py | 6 +++--- gui/builtinContextMenus/ammoPattern.py | 3 ++- gui/builtinContextMenus/damagePattern.py | 4 ++-- gui/builtinContextMenus/droneSplit.py | 4 ++-- gui/builtinContextMenus/factorReload.py | 4 ++-- gui/builtinContextMenus/moduleAmmoPicker.py | 4 ++-- gui/builtinContextMenus/project.py | 4 ++-- gui/characterEditor.py | 4 ++-- gui/droneView.py | 8 ++++---- gui/implantView.py | 9 ++++----- gui/projectedView.py | 8 ++++---- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/gui/boosterView.py b/gui/boosterView.py index c86bc918e..a095e72a1 100644 --- a/gui/boosterView.py +++ b/gui/boosterView.py @@ -55,7 +55,7 @@ class BoosterView(d.Display): fitID = self.mainFrame.getActiveFit() trigger = cFit.addBooster(fitID, event.itemID) if trigger: - wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) self.mainFrame.additionsPane.select("Boosters") event.Skip() @@ -66,7 +66,7 @@ class BoosterView(d.Display): fitID = self.mainFrame.getActiveFit() cFit = service.Fit.getInstance() cFit.removeBooster(fitID, self.GetItemData(row)) - wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) def click(self, event): event.Skip() @@ -77,7 +77,7 @@ class BoosterView(d.Display): fitID = self.mainFrame.getActiveFit() cFit = service.Fit.getInstance() cFit.toggleBooster(fitID, row) - wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) def scheduleMenu(self, event): diff --git a/gui/builtinContextMenus/ammoPattern.py b/gui/builtinContextMenus/ammoPattern.py index dcee923e5..dbccefc08 100644 --- a/gui/builtinContextMenus/ammoPattern.py +++ b/gui/builtinContextMenus/ammoPattern.py @@ -2,6 +2,7 @@ from gui.contextMenu import ContextMenu import gui.mainFrame import service import wx +import gui.globalEvents as GE from gui import bitmapLoader class AmmoPattern(ContextMenu): @@ -28,7 +29,7 @@ class AmmoPattern(ContextMenu): fit = self.mainFrame.getActiveFit() sFit = service.Fit.getInstance() sFit.setAsPattern(fit, item) - wx.PostEvent(self.mainFrame, gui.builtinViews.fittingView.FitChanged(fitID=fit)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fit)) def getBitmap(self, context, selection): return None diff --git a/gui/builtinContextMenus/damagePattern.py b/gui/builtinContextMenus/damagePattern.py index ff8e741eb..3e60fc662 100644 --- a/gui/builtinContextMenus/damagePattern.py +++ b/gui/builtinContextMenus/damagePattern.py @@ -1,7 +1,7 @@ from gui.contextMenu import ContextMenu import gui.mainFrame import service -import gui.builtinViews.fittingView +import gui.globalEvents as GE import wx from gui import bitmapLoader @@ -26,7 +26,7 @@ class DamagePattern(ContextMenu): fitID = self.mainFrame.getActiveFit() sFit.setDamagePattern(fitID, self.patterns[i]) setattr(self.mainFrame,"_activeDmgPattern",self.patterns[i]) - wx.PostEvent(self.mainFrame, gui.builtinViews.fittingView.FitChanged(fitID=fitID)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) def getBitmap(self, context, selection): sFit = service.Fit.getInstance() diff --git a/gui/builtinContextMenus/droneSplit.py b/gui/builtinContextMenus/droneSplit.py index a48fd5023..c954d7964 100644 --- a/gui/builtinContextMenus/droneSplit.py +++ b/gui/builtinContextMenus/droneSplit.py @@ -1,7 +1,7 @@ from gui.contextMenu import ContextMenu from gui.itemStats import ItemStatsDialog import gui.mainFrame -import gui.builtinViews.fittingView +import gui.globalEvents import service import wx @@ -54,5 +54,5 @@ class DroneSpinner(wx.Dialog): sFit.splitDroneStack(fitID, self.drone, self.spinner.GetValue()) else: sFit.splitProjectedDroneStack(fitID, self.drone, self.spinner.GetValue()) - wx.PostEvent(mainFrame, gui.builtinViews.fittingView.FitChanged(fitID=fitID)) + wx.PostEvent(mainFrame, GE.FitChanged(fitID=fitID)) event.Skip() diff --git a/gui/builtinContextMenus/factorReload.py b/gui/builtinContextMenus/factorReload.py index fbf2ad0bf..7a033fc77 100644 --- a/gui/builtinContextMenus/factorReload.py +++ b/gui/builtinContextMenus/factorReload.py @@ -1,7 +1,7 @@ from gui.contextMenu import ContextMenu import gui.mainFrame import service -import gui.builtinViews.fittingView +import gui.globalEvents as GE import wx from gui import bitmapLoader @@ -19,7 +19,7 @@ class FactorReload(ContextMenu): sFit = service.Fit.getInstance() fitID = self.mainFrame.getActiveFit() sFit.toggleFactorReload(fitID) - wx.PostEvent(self.mainFrame, gui.builtinViews.fittingView.FitChanged(fitID=fitID)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) def getBitmap(self, context, selection): sFit = service.Fit.getInstance() diff --git a/gui/builtinContextMenus/moduleAmmoPicker.py b/gui/builtinContextMenus/moduleAmmoPicker.py index 3b172b313..ed3e4fa93 100644 --- a/gui/builtinContextMenus/moduleAmmoPicker.py +++ b/gui/builtinContextMenus/moduleAmmoPicker.py @@ -4,7 +4,7 @@ import service import wx from gui import bitmapLoader from eos.types import Hardpoint -import gui.builtinViews.fittingView +import gui.globalEvents as GE class ModuleAmmoPicker(ContextMenu): def __init__(self): @@ -179,6 +179,6 @@ class ModuleAmmoPicker(ContextMenu): fitID = self.mainFrame.getActiveFit() sFit.setAmmo(fitID, charge.ID if charge is not None else None, self.modules) - wx.PostEvent(self.mainFrame, gui.builtinViews.fittingView.FitChanged(fitID=fitID)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) ModuleAmmoPicker.register() diff --git a/gui/builtinContextMenus/project.py b/gui/builtinContextMenus/project.py index ec9d5747c..8d8ee98cb 100644 --- a/gui/builtinContextMenus/project.py +++ b/gui/builtinContextMenus/project.py @@ -1,7 +1,7 @@ from gui.contextMenu import ContextMenu import gui.mainFrame import service -import gui.builtinViews.fittingView +import gui.globalEvents as GE import wx class Project(ContextMenu): @@ -22,6 +22,6 @@ class Project(ContextMenu): sFit = service.Fit.getInstance() fitID = self.mainFrame.getActiveFit() sFit.project(fitID, selection[0]) - wx.PostEvent(self.mainFrame, gui.builtinViews.fittingView.FitChanged(fitID=fitID)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) Project.register() diff --git a/gui/characterEditor.py b/gui/characterEditor.py index 351742d16..6590003d6 100644 --- a/gui/characterEditor.py +++ b/gui/characterEditor.py @@ -27,7 +27,7 @@ import service import gui.display as d from gui.contextMenu import ContextMenu import sys -import gui.builtinViews.fittingView as fv +import gui.globalEvents as GE CharListUpdated, CHAR_LIST_UPDATED = wx.lib.newevent.NewEvent() CharChanged, CHAR_CHANGED = wx.lib.newevent.NewEvent() @@ -247,7 +247,7 @@ class CharacterEditor(wx.Frame): fitID = self.mainFrame.getActiveFit() if fitID is not None: cFit.clearFit(fitID) - wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) wx.Frame.Destroy(self) diff --git a/gui/droneView.py b/gui/droneView.py index b21837fe9..592a8dff4 100644 --- a/gui/droneView.py +++ b/gui/droneView.py @@ -83,7 +83,7 @@ class DroneView(d.Display): sFit = service.Fit.getInstance() fitID = self.mainFrame.getActiveFit() if sFit.mergeDrones(fitID, self.drones[src], self.drones[dst]): - wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) DRONE_ORDER = ('Light Scout Drones', 'Medium Scout Drones', 'Heavy Attack Drones', 'Sentry Drones', 'Fighters', @@ -115,7 +115,7 @@ class DroneView(d.Display): fitID = self.mainFrame.getActiveFit() trigger = cFit.addDrone(fitID, event.itemID) if trigger: - wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) self.mainFrame.additionsPane.select("Drones") event.Skip() @@ -129,7 +129,7 @@ class DroneView(d.Display): cFit = service.Fit.getInstance() drone = self.drones[self.GetItemData(row)] cFit.removeDrone(fitID, self.original.index(drone)) - wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) def click(self, event): event.Skip() @@ -141,7 +141,7 @@ class DroneView(d.Display): cFit = service.Fit.getInstance() drone = self.drones[row] cFit.toggleDrone(fitID, self.original.index(drone)) - wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) def scheduleMenu(self, event): event.Skip() diff --git a/gui/implantView.py b/gui/implantView.py index c7eddcc34..89217f322 100644 --- a/gui/implantView.py +++ b/gui/implantView.py @@ -20,7 +20,6 @@ import wx import service import gui.display as d -import gui.builtinViews.fittingView as fv import gui.marketBrowser as mb from gui.builtinViewColumns.state import State from gui.contextMenu import ContextMenu @@ -51,7 +50,7 @@ class ImplantView(d.Display): if row != -1: cFit.removeImplant(fitID, self.GetItemData(row)) row = self.GetNextSelected(row) - wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) def fitChanged(self, event): cFit = service.Fit.getInstance() @@ -69,7 +68,7 @@ class ImplantView(d.Display): fitID = self.mainFrame.getActiveFit() trigger = cFit.addImplant(fitID, event.itemID) if trigger: - wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) self.mainFrame.additionsPane.select("Implants") event.Skip() @@ -81,7 +80,7 @@ class ImplantView(d.Display): cFit = service.Fit.getInstance() implant = self.implants[self.GetItemData(row)] cFit.removeImplant(fitID, self.original.index(implant)) - wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) def click(self, event): event.Skip() @@ -92,7 +91,7 @@ class ImplantView(d.Display): fitID = self.mainFrame.getActiveFit() cFit = service.Fit.getInstance() cFit.toggleImplant(fitID, row) - wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) def scheduleMenu(self, event): event.Skip() diff --git a/gui/projectedView.py b/gui/projectedView.py index bc53471e6..021958719 100644 --- a/gui/projectedView.py +++ b/gui/projectedView.py @@ -66,7 +66,7 @@ class ProjectedView(d.Display): sFit = service.Fit.getInstance() draggedFit = sFit.getFit(fitID) sFit.project(activeFit,draggedFit) - wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=activeFit)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=activeFit)) def startDrag(self, event): row = event.GetIndex() @@ -90,7 +90,7 @@ class ProjectedView(d.Display): sFit = service.Fit.getInstance() fitID = self.mainFrame.getActiveFit() if sFit.mergeDrones(fitID, self.get(src), dstDrone, True): - wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) def moduleSort(self, module): @@ -148,7 +148,7 @@ class ProjectedView(d.Display): fitID = self.mainFrame.getActiveFit() cFit = service.Fit.getInstance() cFit.toggleProjected(fitID, item, "right" if event.Button == 3 else "left") - wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) elif event.Button == 3: if isinstance(item, eos.types.Drone): context = ("projectedDrone",) @@ -172,4 +172,4 @@ class ProjectedView(d.Display): fitID = self.mainFrame.getActiveFit() cFit = service.Fit.getInstance() cFit.removeProjected(fitID, self.get(row)) - wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID)) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))