Rename context menu files

This commit is contained in:
DarkPhoenix
2019-04-16 18:16:53 +03:00
parent 98e834fd30
commit 5af211778b
29 changed files with 80 additions and 81 deletions

View File

@@ -25,7 +25,7 @@ import gui.display as d
import gui.globalEvents as GE
from gui.builtinShipBrowser.events import EVT_FIT_REMOVED
from eos.saveddata.drone import Drone as es_Drone
from gui.builtinContextMenus.commandFits import CommandFits
from gui.builtinContextMenus.commandFitAdd import AddCommandFit
from gui.builtinViewColumns.state import State
from gui.contextMenu import ContextMenu
from gui.utils.staticHelpers import DragDropHelper
@@ -68,8 +68,8 @@ class CommandView(d.Display):
self.lastFitId = None
self.mainFrame.Bind(GE.FIT_CHANGED, CommandFits.fitChanged)
self.mainFrame.Bind(EVT_FIT_REMOVED, CommandFits.populateFits)
self.mainFrame.Bind(GE.FIT_CHANGED, AddCommandFit.fitChanged)
self.mainFrame.Bind(EVT_FIT_REMOVED, AddCommandFit.populateFits)
self.mainFrame.Bind(GE.FIT_CHANGED, self.fitChanged)
self.Bind(wx.EVT_LEFT_DOWN, self.click)
self.Bind(wx.EVT_LEFT_DCLICK, self.remove)
@@ -128,7 +128,7 @@ class CommandView(d.Display):
sFit = Fit.getInstance()
fit = sFit.getFit(event.fitID)
CommandFits.populateFits(event)
AddCommandFit.populateFits(event)
self.Parent.Parent.DisablePage(self, not fit or fit.isStructure)

View File

@@ -7,7 +7,7 @@ from service.fit import Fit
from service.settings import ContextMenuSettings
class AmmoPattern(ContextMenu):
class AmmoToDmgPattern(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
@@ -40,4 +40,4 @@ class AmmoPattern(ContextMenu):
return None
AmmoPattern.register()
AmmoToDmgPattern.register()

View File

@@ -5,7 +5,7 @@ from service.fit import Fit
from service.settings import ContextMenuSettings
class Cargo(ContextMenu):
class AddToCargo(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
@@ -38,4 +38,4 @@ class Cargo(ContextMenu):
self.mainFrame.additionsPane.select("Cargo")
Cargo.register()
AddToCargo.register()

View File

@@ -4,7 +4,7 @@ from gui.contextMenu import ContextMenu
from service.settings import ContextMenuSettings
class CargoAmmo(ContextMenu):
class AddToCargoAmmo(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
@@ -32,4 +32,4 @@ class CargoAmmo(ContextMenu):
self.mainFrame.additionsPane.select("Cargo")
CargoAmmo.register()
AddToCargoAmmo.register()

View File

@@ -9,7 +9,7 @@ from service.market import Market
from service.settings import ContextMenuSettings
class CommandFits(ContextMenu):
class AddCommandFit(ContextMenu):
# Get list of items that define a command fit
sMkt = Market.getInstance()
grp = sMkt.getGroup(1770) # Command burst group
@@ -101,5 +101,5 @@ class CommandFits(ContextMenu):
self.mainFrame.command.Submit(cmd.GuiAddCommandFitCommand(fitID, fit.ID))
CommandFits.populateFits(None)
CommandFits.register()
AddCommandFit.populateFits(None)
AddCommandFit.register()

View File

@@ -12,7 +12,7 @@ from service.fit import Fit
from service.settings import ContextMenuSettings
class DamagePattern(ContextMenu):
class ChangeDamagePattern(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
@@ -115,4 +115,4 @@ class DamagePattern(ContextMenu):
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
DamagePattern.register()
ChangeDamagePattern.register()

View File

@@ -4,7 +4,7 @@ from gui.contextMenu import ContextMenu
from service.settings import ContextMenuSettings
class DroneStack(ContextMenu):
class DroneAddStack(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
@@ -34,4 +34,4 @@ class DroneStack(ContextMenu):
self.mainFrame.additionsPane.select('Drones')
DroneStack.register()
DroneAddStack.register()

View File

@@ -7,7 +7,7 @@ from service.fit import Fit
from service.settings import ContextMenuSettings
class ItemRemove(ContextMenu):
class DroneRemoveStack(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
@@ -33,4 +33,4 @@ class ItemRemove(ContextMenu):
fitID=fitID, itemID=drone.itemID, amount=math.inf))
ItemRemove.register()
DroneRemoveStack.register()

View File

@@ -10,7 +10,7 @@ from service.fit import Fit
from service.settings import ContextMenuSettings
class DroneSplit(ContextMenu):
class DroneSplitStack(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
@@ -44,7 +44,7 @@ class DroneSplit(ContextMenu):
amount=int(cleanInput)))
DroneSplit.register()
DroneSplitStack.register()
class DroneStackSplit(wx.Dialog):

View File

@@ -11,7 +11,7 @@ from service.market import Market
from service.settings import ContextMenuSettings
class WhProjector(ContextMenu):
class AddEnvironmentEffect(ContextMenu):
# CCP doesn't currently provide a mapping between the general Environment, and the specific environment effect
# (which can be random when going into Abyssal space). This is how we currently define it:
@@ -223,4 +223,4 @@ class WhProjector(ContextMenu):
return grouped, ()
WhProjector.register()
AddEnvironmentEffect.register()

View File

@@ -8,7 +8,7 @@ from service.fit import Fit
from service.settings import ContextMenuSettings
class FighterAbility(ContextMenu):
class FighterAbilities(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
@@ -69,4 +69,4 @@ class FighterAbility(ContextMenu):
FighterAbility.register()
FighterAbilities.register()

View File

@@ -8,7 +8,7 @@ from gui.contextMenu import ContextMenu
from service.fit import Fit
class TabbedFits(ContextMenu):
class AddCurrentlyOpenFit(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
@@ -59,4 +59,4 @@ class TabbedFits(ContextMenu):
self.mainFrame.command.Submit(cmd.GuiAddProjectedFitCommand(fitID=fitID, projectedFitID=fit.ID))
TabbedFits.register()
AddCurrentlyOpenFit.register()

View File

@@ -7,7 +7,7 @@ from gui.contextMenu import ContextMenu
from service.settings import ContextMenuSettings
class OpenFit(ContextMenu):
class OpenFitInNewTab(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
@@ -31,4 +31,4 @@ class OpenFit(ContextMenu):
wx.PostEvent(self.mainFrame, FitSelected(fitID=fit.ID, startup=2))
OpenFit.register()
OpenFitInNewTab.register()

View File

@@ -6,12 +6,11 @@ import gui.globalEvents as GE
import gui.mainFrame
from gui.contextMenu import ContextMenu
from service.character import Character
from service.fit import Fit
from service.implantSet import ImplantSets as s_ImplantSets
from service.settings import ContextMenuSettings
class ImplantSets(ContextMenu):
class addImplantSet(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
@@ -89,4 +88,4 @@ class ImplantSets(ContextMenu):
itemIDs=[i.itemID for i in set.implants]))
ImplantSets.register()
addImplantSet.register()

View File

@@ -14,7 +14,7 @@ from service.fit import Fit
from service.settings import ContextMenuSettings
class ChangeAmount(ContextMenu):
class ChangeItemAmount(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
@@ -66,7 +66,7 @@ class ChangeAmount(ContextMenu):
self.mainFrame.command.Submit(cmd.GuiChangeLocalFighterAmountCommand(fitID, fit.fighters.index(thing), cleanInput))
ChangeAmount.register()
ChangeItemAmount.register()
class AmountChanger(wx.Dialog):

View File

@@ -4,7 +4,7 @@ from service.market import Market
from service.settings import ContextMenuSettings
class MarketJump(ContextMenu):
class JumpToMarketItem(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
@@ -57,4 +57,4 @@ class MarketJump(ContextMenu):
self.mainFrame.marketBrowser.jump(item)
MarketJump.register()
JumpToMarketItem.register()

View File

@@ -5,7 +5,7 @@ from service.fit import Fit
from service.settings import ContextMenuSettings
class Project(ContextMenu):
class ProjectItem(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
@@ -45,4 +45,4 @@ class Project(ContextMenu):
self.mainFrame.additionsPane.select('Projected')
Project.register()
ProjectItem.register()

View File

@@ -5,7 +5,7 @@ from service.fit import Fit
from service.settings import ContextMenuSettings
class ItemRemove(ContextMenu):
class RemoveItem(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
@@ -73,4 +73,4 @@ class ItemRemove(ContextMenu):
fitID=fitID, commandFitID=selection[0].ID))
ItemRemove.register()
RemoveItem.register()

View File

@@ -9,7 +9,7 @@ from service.market import Market
from service.settings import ContextMenuSettings
class MetaSwap(ContextMenu):
class ChangeItemToVariation(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
@@ -170,4 +170,4 @@ class MetaSwap(ContextMenu):
fitID=fitID, position=position, newItemID=item.ID))
MetaSwap.register()
ChangeItemToVariation.register()

View File

@@ -10,7 +10,7 @@ from service.market import Market
from service.settings import ContextMenuSettings
class ModuleAmmoPicker(ContextMenu):
class ChangeModuleAmmo(ContextMenu):
DAMAGE_TYPES = ("em", "explosive", "kinetic", "thermal")
MISSILE_ORDER = ("em", "thermal", "kinetic", "explosive", "mixed")
@@ -235,4 +235,4 @@ class ModuleAmmoPicker(ContextMenu):
fitID=fitID, modules=self.modules, chargeItemID=charge.ID if charge is not None else None))
ModuleAmmoPicker.register()
ChangeModuleAmmo.register()

View File

@@ -1,14 +1,14 @@
import gui.fitCommands as cmd
import gui.mainFrame
from gui.builtinContextMenus.moduleAmmoPicker import ModuleAmmoPicker
from gui.builtinContextMenus.moduleAmmoChange import ChangeModuleAmmo
from service.fit import Fit
from service.settings import ContextMenuSettings
class ModuleGlobalAmmoPicker(ModuleAmmoPicker):
class ChangeModuleAmmoAll(ChangeModuleAmmo):
def __init__(self):
super(ModuleGlobalAmmoPicker, self).__init__()
super(ChangeModuleAmmoAll, self).__init__()
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
@@ -52,7 +52,7 @@ class ModuleGlobalAmmoPicker(ModuleAmmoPicker):
if selectionLen != 1:
return False
return super(ModuleGlobalAmmoPicker, self).display(srcContext, selection)
return super(ChangeModuleAmmoAll, self).display(srcContext, selection)
ModuleGlobalAmmoPicker.register()
ChangeModuleAmmoAll.register()

View File

@@ -7,7 +7,7 @@ from gui.fitCommands import GuiConvertMutatedLocalModuleCommand, GuiRevertMutate
from service.settings import ContextMenuSettings
class MutaplasmidCM(ContextMenu):
class ChangeModuleMutation(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
@@ -71,4 +71,4 @@ class MutaplasmidCM(ContextMenu):
return None
MutaplasmidCM.register()
ChangeModuleMutation.register()

View File

@@ -9,7 +9,7 @@ from gui.contextMenu import ContextMenu
from service.settings import ContextMenuSettings
class SpoolUp(ContextMenu):
class ChangeModuleSpool(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
@@ -89,4 +89,4 @@ class SpoolUp(ContextMenu):
spoolAmount=spoolAmount))
SpoolUp.register()
ChangeModuleSpool.register()

View File

@@ -8,7 +8,7 @@ from service.fit import Fit
from service.settings import ContextMenuSettings
class ShipJump(ContextMenu):
class JumpToShip(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
@@ -32,4 +32,4 @@ class ShipJump(ContextMenu):
wx.PostEvent(self.mainFrame.shipBrowser, Stage3Selected(shipID=stuff.item.ID, back=groupID))
ShipJump.register()
JumpToShip.register()

View File

@@ -8,7 +8,7 @@ from service.fit import Fit
from service.settings import ContextMenuSettings
class TacticalMode(ContextMenu):
class ChangeShipTacticalMode(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
@@ -64,4 +64,4 @@ class TacticalMode(ContextMenu):
self.mainFrame.command.Submit(cmd.GuiChangeShipModeCommand(fitID, self.modeIds[event.Id].item.ID))
TacticalMode.register()
ChangeShipTacticalMode.register()

View File

@@ -31,7 +31,7 @@ from eos.const import FittingSlot
from service.fit import Fit as FitSvc
from service.market import Market
from gui.viewColumn import ViewColumn
from gui.builtinContextMenus.whProjector import WhProjector
from gui.builtinContextMenus.envEffectAdd import AddEnvironmentEffect
import gui.mainFrame
pyfalog = Logger(__name__)
@@ -83,7 +83,7 @@ class BaseName(ViewColumn):
if self.projectedView:
# check for projected abyssal name
name_check = stuff.item.name[0:-2]
type = WhProjector.abyssal_mapping.get(name_check, None)
type = AddEnvironmentEffect.abyssal_mapping.get(name_check, None)
if type:
sMkt = Market.getInstance()
type = sMkt.getItem(type)

View File

@@ -204,35 +204,35 @@ class ContextMenu(object):
# noinspection PyUnresolvedReferences
from gui.builtinContextMenus import ( # noqa: E402,F401
openFit,
moduleGlobalAmmoPicker,
moduleAmmoPicker,
spoolUp,
fitOpenNewTab,
moduleAmmoChangeAll,
moduleAmmoChange,
moduleSpool,
itemStats,
damagePattern,
marketJump,
droneSplit,
damagePatternChange,
itemMarketJump,
droneSplitStack,
itemRemove,
fillWithModule,
itemVariationChange,
moduleFill,
droneRemoveStack,
ammoPattern,
ammoToDmgPattern,
factorReload,
droneStack,
cargo,
cargoAmmo,
project,
whProjector,
droneAddStack,
cargoAdd,
cargoAddAmmo,
itemProject,
envEffectAdd,
shipJump,
changeAffectingSkills,
tacticalMode,
skillAffectors,
shipModeChange,
targetResists,
priceOptions,
amount,
metaSwap,
implantSets,
itemAmountChange,
implantSetAdd,
fighterAbilities,
boosterSideEffects,
commandFits,
tabbedFits,
mutaplasmids,
commandFitAdd,
fitAddCurrentlyOpen,
moduleMutations,
)