dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Merge branch 'master' into 1924-typo

Browse Source
This commit is contained in:
Anton Vorobyov
2019-04-16 19:43:13 +03:00
committed by GitHub
parent 4c739308f9 82adccadda
commit fa4c48c6c2
33 changed files with 143 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gui/builtinAdditionPanes/commandView.py
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)

41
gui/builtinContextMenus/__init__.py
View File

@@ -0,0 +1,41 @@
# noinspection PyUnresolvedReferences
from gui.builtinContextMenus import ( # noqa: E402,F401
# Various command and projected-related items which we want to have first,
# before generic commands
fitOpenNewTab,
envEffectAdd,
fitAddCurrentlyOpen,
commandFitAdd,
# Often-used item manipulations
shipModeChange,
moduleAmmoChange,
moduleSpool,
boosterSideEffects,
fighterAbilities,
# Item info
itemStats,
itemMarketJump,
shipJump,
# Generic item manipulations
itemRemove,
moduleMutations,
itemAmountChange,
droneSplitStack,
itemVariationChange,
moduleFill,
skillAffectors,
# Market stuff
droneAddStack,
cargoAdd,
cargoAddAmmo,
itemProject,
ammoToDmgPattern,
implantSetAdd,
# Price
priceOptions,
# Resistance panel
damagePatternChange,
# Firepower panel
factorReload,
targetResists,
)

4
gui/builtinContextMenus/ammoPattern.py → gui/builtinContextMenus/ammoToDmgPattern.py
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()

4
gui/builtinContextMenus/cargo.py → gui/builtinContextMenus/cargoAdd.py
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()

4
gui/builtinContextMenus/cargoAmmo.py → gui/builtinContextMenus/cargoAddAmmo.py
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()

6
gui/builtinContextMenus/commandFits.py → gui/builtinContextMenus/commandFitAdd.py
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()

4
gui/builtinContextMenus/damagePattern.py → gui/builtinContextMenus/damagePatternChange.py
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()

4
gui/builtinContextMenus/droneStack.py → gui/builtinContextMenus/droneAddStack.py
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()

36
gui/builtinContextMenus/droneRemoveStack.py
View File

@@ -1,36 +0,0 @@
import math
import gui.fitCommands as cmd
import gui.mainFrame
from gui.contextMenu import ContextMenu
from service.fit import Fit
from service.settings import ContextMenuSettings
class ItemRemove(ContextMenu):
def __init__(self):
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
def display(self, srcContext, selection):
if not self.settings.get('droneRemoveStack'):
return False
if srcContext not in ('droneItem', 'projectedDrone'):
return False
return True
def getText(self, itmContext, selection):
return "Remove {} Stack".format(itmContext)
def activate(self, fullContext, selection, i):
drone = selection[0]
fitID = self.mainFrame.getActiveFit()
if 'droneItem' in fullContext:
self.mainFrame.command.Submit(cmd.GuiRemoveLocalDroneCommand(
fitID=fitID, position=Fit.getInstance().getFit(fitID).drones.index(drone), amount=math.inf))
if 'projectedDrone' in fullContext:
self.mainFrame.command.Submit(cmd.GuiRemoveProjectedDroneCommand(
fitID=fitID, itemID=drone.itemID, amount=math.inf))
ItemRemove.register()

4
gui/builtinContextMenus/droneSplit.py → gui/builtinContextMenus/droneSplitStack.py
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):

4
gui/builtinContextMenus/whProjector.py → gui/builtinContextMenus/envEffectAdd.py
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()

3
gui/builtinContextMenus/factorReload.py
View File

@@ -14,9 +14,6 @@ class FactorReload(ContextMenu):
self.settings = ContextMenuSettings.getInstance()
def display(self, srcContext, selection):
if not self.settings.get('factorReload'):
return False
return srcContext == "firepowerViewFull"
@property

4
gui/builtinContextMenus/fighterAbilities.py
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()

4
gui/builtinContextMenus/tabbedFits.py → gui/builtinContextMenus/fitAddCurrentlyOpen.py
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()

4
gui/builtinContextMenus/openFit.py → gui/builtinContextMenus/fitOpenNewTab.py
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()

5
gui/builtinContextMenus/implantSets.py → gui/builtinContextMenus/implantSetAdd.py
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()

4
gui/builtinContextMenus/amount.py → gui/builtinContextMenus/itemAmountChange.py
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):

4
gui/builtinContextMenus/marketJump.py → gui/builtinContextMenus/itemMarketJump.py
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()

4
gui/builtinContextMenus/project.py → gui/builtinContextMenus/itemProject.py
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()

20
gui/builtinContextMenus/itemRemove.py
View File

@@ -1,3 +1,5 @@
import math
import gui.fitCommands as cmd
import gui.mainFrame
from gui.contextMenu import ContextMenu
@@ -5,7 +7,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()
@@ -14,10 +16,9 @@ class ItemRemove(ContextMenu):
if not self.settings.get('itemRemove'):
return False
return srcContext in ("fittingModule", "fittingCharge",
"droneItem", "implantItem",
"boosterItem", "projectedModule",
"projectedCharge", "cargoItem",
return srcContext in ("fittingModule", "droneItem",
"implantItem", "boosterItem",
"projectedModule", "cargoItem",
"projectedFit", "projectedDrone",
"fighterItem", "projectedFighter",
"commandFit")
@@ -40,7 +41,7 @@ class ItemRemove(ContextMenu):
fitID=fitID, modules=selection, chargeItemID=None))
elif srcContext == "droneItem":
self.mainFrame.command.Submit(cmd.GuiRemoveLocalDroneCommand(
fitID=fitID, position=fit.drones.index(selection[0]), amount=1))
fitID=fitID, position=fit.drones.index(selection[0]), amount=math.inf))
elif srcContext == "fighterItem":
self.mainFrame.command.Submit(cmd.GuiRemoveLocalFighterCommand(
fitID=fitID, position=fit.fighters.index(selection[0])))
@@ -61,16 +62,13 @@ class ItemRemove(ContextMenu):
fitID=fitID, position=fit.projectedModules.index(selection[0])))
elif srcContext == "projectedDrone":
self.mainFrame.command.Submit(cmd.GuiRemoveProjectedDroneCommand(
fitID=fitID, itemID=selection[0].itemID, amount=1))
fitID=fitID, itemID=selection[0].itemID, amount=math.inf))
elif srcContext == "projectedFighter":
self.mainFrame.command.Submit(cmd.GuiRemoveProjectedFighterCommand(
fitID=fitID, position=fit.projectedFighters.index(selection[0])))
elif srcContext == "projectedCharge":
self.mainFrame.command.Submit(cmd.GuiChangeProjectedModuleChargesCommand(
fitID=fitID, modules=[selection[0]], chargeItemID=None))
elif srcContext == "commandFit":
self.mainFrame.command.Submit(cmd.GuiRemoveCommandFitCommand(
fitID=fitID, commandFitID=selection[0].ID))
ItemRemove.register()
RemoveItem.register()

4
gui/builtinContextMenus/metaSwap.py → gui/builtinContextMenus/itemVariationChange.py
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()

37
gui/builtinContextMenus/moduleAmmoPicker.py → gui/builtinContextMenus/moduleAmmoChange.py
View File

@@ -6,11 +6,12 @@ import gui.mainFrame
from eos.const import FittingHardpoint
from gui.bitmap_loader import BitmapLoader
from gui.contextMenu import ContextMenu
from service.fit import Fit
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")
@@ -227,12 +228,32 @@ class ModuleAmmoPicker(ContextMenu):
return
fitID = self.mainFrame.getActiveFit()
if self.context == 'fittingModule':
self.mainFrame.command.Submit(cmd.GuiChangeLocalModuleChargesCommand(
fitID=fitID, modules=self.modules, chargeItemID=charge.ID if charge is not None else None))
elif self.context == 'projectedModule':
self.mainFrame.command.Submit(cmd.GuiChangeProjectedModuleChargesCommand(
fitID=fitID, modules=self.modules, chargeItemID=charge.ID if charge is not None else None))
# Set to all modules if ctrl is pressed
if wx.GetMouseState().CmdDown():
fit = Fit.getInstance().getFit(fitID)
selectedModule = self.modules[0]
if self.context == 'fittingModule':
self.mainFrame.command.Submit(cmd.GuiChangeLocalModuleChargesCommand(
fitID=fitID,
modules=[m for m in fit.modules if m.itemID is not None and m.itemID == selectedModule.itemID],
chargeItemID=charge.ID if charge is not None else None))
elif self.context == 'projectedModule':
self.mainFrame.command.Submit(cmd.GuiChangeProjectedModuleChargesCommand(
fitID=fitID,
modules=[m for m in fit.projectedModules if
m.itemID is not None and m.itemID == selectedModule.itemID],
chargeItemID=charge.ID if charge is not None else None))
else:
if self.context == 'fittingModule':
self.mainFrame.command.Submit(cmd.GuiChangeLocalModuleChargesCommand(
fitID=fitID,
modules=self.modules,
chargeItemID=charge.ID if charge is not None else None))
elif self.context == 'projectedModule':
self.mainFrame.command.Submit(cmd.GuiChangeProjectedModuleChargesCommand(
fitID=fitID,
modules=self.modules,
chargeItemID=charge.ID if charge is not None else None))
ModuleAmmoPicker.register()
ChangeModuleAmmo.register()

0
gui/builtinContextMenus/fillWithModule.py → gui/builtinContextMenus/moduleFill.py
View File

58
gui/builtinContextMenus/moduleGlobalAmmoPicker.py
View File

@@ -1,58 +0,0 @@
import gui.fitCommands as cmd
import gui.mainFrame
from gui.builtinContextMenus.moduleAmmoPicker import ModuleAmmoPicker
from service.fit import Fit
from service.settings import ContextMenuSettings
class ModuleGlobalAmmoPicker(ModuleAmmoPicker):
def __init__(self):
super(ModuleGlobalAmmoPicker, self).__init__()
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
self.settings = ContextMenuSettings.getInstance()
def getText(self, itmContext, selection):
return "Charge (All)"
def handleAmmoSwitch(self, event):
if len(self.modules) != 1:
event.Skip()
return
charge = self.chargeIds.get(event.Id, False)
if charge is False:
event.Skip()
return
fitID = self.mainFrame.getActiveFit()
fit = Fit.getInstance().getFit(fitID)
selectedModule = self.modules[0]
if self.context == 'fittingModule':
self.mainFrame.command.Submit(cmd.GuiChangeLocalModuleChargesCommand(
fitID=fitID,
modules=[m for m in fit.modules if m.itemID is not None and m.itemID == selectedModule.itemID],
chargeItemID=charge.ID if charge is not None else None))
elif self.context == 'projectedModule':
self.mainFrame.command.Submit(cmd.GuiChangeProjectedModuleChargesCommand(
fitID=fitID,
modules=[m for m in fit.projectedModules if m.itemID is not None and m.itemID == selectedModule.itemID],
chargeItemID=charge.ID if charge is not None else None))
def display(self, srcContext, selection):
if not self.settings.get('moduleGlobalAmmoPicker'):
return False
try:
selectionLen = len(selection)
except:
pass
else:
if selectionLen != 1:
return False
return super(ModuleGlobalAmmoPicker, self).display(srcContext, selection)
ModuleGlobalAmmoPicker.register()

4
gui/builtinContextMenus/mutaplasmids.py → gui/builtinContextMenus/moduleMutations.py
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()

4
gui/builtinContextMenus/spoolUp.py → gui/builtinContextMenus/moduleSpool.py
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()

4
gui/builtinContextMenus/shipJump.py
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()

4
gui/builtinContextMenus/tacticalMode.py → gui/builtinContextMenus/shipModeChange.py
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()

0
gui/builtinContextMenus/changeAffectingSkills.py → gui/builtinContextMenus/skillAffectors.py
View File

56
gui/builtinPreferenceViews/pyfaContextMenuPreferences.py
View File

@@ -44,8 +44,8 @@ class PFContextMenuPref(PreferenceView):
rbSizerRow1.Add(self.rbBox2, 1, wx.ALL, 5)
self.rbBox2.Bind(wx.EVT_RADIOBOX, self.OnSetting2Change)
self.rbBox3 = wx.RadioBox(panel, -1, "Factor in Reload Time", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS)
self.rbBox3.SetSelection(self.settings.get('factorReload'))
self.rbBox3 = wx.RadioBox(panel, -1, "Variations", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS)
self.rbBox3.SetSelection(self.settings.get('metaSwap'))
rbSizerRow1.Add(self.rbBox3, 1, wx.ALL, 5)
self.rbBox3.Bind(wx.EVT_RADIOBOX, self.OnSetting3Change)
@@ -54,42 +54,27 @@ class PFContextMenuPref(PreferenceView):
# Row 2
rbSizerRow2 = wx.BoxSizer(wx.HORIZONTAL)
self.rbBox4 = wx.RadioBox(panel, -1, "Variations", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS)
self.rbBox4.SetSelection(self.settings.get('metaSwap'))
self.rbBox4 = wx.RadioBox(panel, -1, "Project onto Fit", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS)
self.rbBox4.SetSelection(self.settings.get('project'))
rbSizerRow2.Add(self.rbBox4, 1, wx.ALL, 5)
self.rbBox4.Bind(wx.EVT_RADIOBOX, self.OnSetting4Change)
# self.rbBox5 = wx.RadioBox(panel, -1, "Charge", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS)
# self.rbBox5.SetSelection(self.settings.get('moduleAmmoPicker'))
# rbSizerRow2.Add(self.rbBox5, 0, wx.ALL, 5)
# self.rbBox5.Bind(wx.EVT_RADIOBOX, self.OnSetting5Change)
self.rbBox5 = wx.RadioBox(panel, -1, "Fill with module", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS)
self.rbBox5.SetSelection(self.settings.get('moduleFill'))
rbSizerRow2.Add(self.rbBox5, 1, wx.ALL, 5)
self.rbBox5.Bind(wx.EVT_RADIOBOX, self.OnSetting5Change)
self.rbBox6 = wx.RadioBox(panel, -1, "Charge (All)", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS)
self.rbBox6.SetSelection(self.settings.get('moduleGlobalAmmoPicker'))
self.rbBox6 = wx.RadioBox(panel, -1, "Spoolup", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS)
self.rbBox6.SetSelection(self.settings.get('spoolup'))
rbSizerRow2.Add(self.rbBox6, 1, wx.ALL, 5)
self.rbBox6.Bind(wx.EVT_RADIOBOX, self.OnSetting6Change)
self.rbBox7 = wx.RadioBox(panel, -1, "Project onto Fit", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS)
self.rbBox7.SetSelection(self.settings.get('project'))
rbSizerRow2.Add(self.rbBox7, 1, wx.ALL, 5)
self.rbBox7.Bind(wx.EVT_RADIOBOX, self.OnSetting7Change)
mainSizer.Add(rbSizerRow2, 1, wx.ALL | wx.EXPAND, 0)
# Row 3
rbSizerRow3 = wx.BoxSizer(wx.HORIZONTAL)
self.rbBox8 = wx.RadioBox(panel, -1, "Fill with module", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS)
self.rbBox8.SetSelection(self.settings.get('moduleFill'))
rbSizerRow3.Add(self.rbBox8, 1, wx.ALL, 5)
self.rbBox8.Bind(wx.EVT_RADIOBOX, self.OnSetting8Change)
self.rbBox9 = wx.RadioBox(panel, -1, "Spoolup", wx.DefaultPosition, wx.DefaultSize, ['Disabled', 'Enabled'], 1, wx.RA_SPECIFY_COLS)
self.rbBox9.SetSelection(self.settings.get('spoolup'))
rbSizerRow3.Add(self.rbBox9, 1, wx.ALL, 5)
self.rbBox9.Bind(wx.EVT_RADIOBOX, self.OnSetting9Change)
mainSizer.Add(rbSizerRow3, 1, wx.ALL | wx.EXPAND, 0)
# rbSizerRow3 = wx.BoxSizer(wx.HORIZONTAL)
#
# mainSizer.Add(rbSizerRow3, 1, wx.ALL | wx.EXPAND, 0)
panel.SetSizer(mainSizer)
panel.Layout()
@@ -101,24 +86,15 @@ class PFContextMenuPref(PreferenceView):
self.settings.set('changeAffectingSkills', event.GetInt())
def OnSetting3Change(self, event):
self.settings.set('factorReload', event.GetInt())
def OnSetting4Change(self, event):
self.settings.set('metaSwap', event.GetInt())
def OnSetting5Change(self, event):
self.settings.set('moduleAmmoPicker', event.GetInt())
def OnSetting6Change(self, event):
self.settings.set('moduleGlobalAmmoPicker', event.GetInt())
def OnSetting7Change(self, event):
def OnSetting4Change(self, event):
self.settings.set('project', event.GetInt())
def OnSetting8Change(self, event):
def OnSetting5Change(self, event):
self.settings.set('moduleFill', event.GetInt())
def OnSetting9Change(self, event):
def OnSetting6Change(self, event):
self.settings.set('spoolup', event.GetInt())
def getImage(self):

4
gui/builtinViewColumns/baseName.py
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)

35
gui/contextMenu.py
View File

@@ -202,37 +202,4 @@ class ContextMenu(object):
'''If menu item is enabled. Allows an item to display, but not be selected'''
return True
# noinspection PyUnresolvedReferences
from gui.builtinContextMenus import ( # noqa: E402,F401
openFit,
moduleGlobalAmmoPicker,
moduleAmmoPicker,
spoolUp,
itemStats,
damagePattern,
marketJump,
droneSplit,
itemRemove,
fillWithModule,
droneRemoveStack,
ammoPattern,
factorReload,
droneStack,
cargo,
cargoAmmo,
project,
whProjector,
shipJump,
changeAffectingSkills,
tacticalMode,
targetResists,
priceOptions,
amount,
metaSwap,
implantSets,
fighterAbilities,
boosterSideEffects,
commandFits,
tabbedFits,
mutaplasmids,
)
import gui.builtinContextMenus

2
service/settings.py
View File

@@ -474,7 +474,6 @@ class ContextMenuSettings(object):
"droneRemoveStack" : 1,
"droneSplit" : 1,
"droneStack" : 1,
"factorReload" : 1,
"fighterAbilities" : 1,
"implantSets" : 1,
"itemStats" : 1,
@@ -482,7 +481,6 @@ class ContextMenuSettings(object):
"marketJump" : 1,
"metaSwap" : 1,
"moduleAmmoPicker" : 1,
"moduleGlobalAmmoPicker": 1,
"openFit" : 1,
"priceClear" : 1,
"project" : 1,