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

Rework local module GUI commands

Browse Source
This commit is contained in:
DarkPhoenix
2019-04-14 22:47:00 +03:00
parent cc8575b275
commit 0b49bf201f
30 changed files with 375 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/builtinContextMenus/fillWithModule.py
View File

@@ -26,7 +26,7 @@ class FillWithModule(ContextMenu):
fitID = self.mainFrame.getActiveFit()
if srcContext == "fittingModule":
self.mainFrame.command.Submit(cmd.GuiFillWithModuleCommand(fitID, selection[0].itemID))
self.mainFrame.command.Submit(cmd.GuiFillWithModulesCommand(fitID, selection[0].itemID))
return # the command takes care of the PostEvent
wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))

4
gui/builtinContextMenus/itemRemove.py
View File

@@ -37,10 +37,10 @@ class ItemRemove(ContextMenu):
if srcContext == "fittingModule":
modules = [module for module in selection if module is not None]
self.mainFrame.command.Submit(cmd.GuiModuleRemoveCommand(fitID, modules))
self.mainFrame.command.Submit(cmd.GuiRemoveModuleCommand(fitID, modules))
return # the command takes care of the PostEvent
elif srcContext in ("fittingCharge", "projectedCharge"):
self.mainFrame.command.Submit(cmd.GuiModuleAddChargeCommand(fitID, None, selection))
self.mainFrame.command.Submit(cmd.GuiChangeModuleChargesCommand(fitID, None, selection))
return
elif srcContext == "droneItem":
self.mainFrame.command.Submit(cmd.GuiRemoveDroneCommand(fitID, fit.drones.index(selection[0]), 1))

2
gui/builtinContextMenus/moduleAmmoPicker.py
View File

@@ -228,7 +228,7 @@ class ModuleAmmoPicker(ContextMenu):
return
fitID = self.mainFrame.getActiveFit()
self.mainFrame.command.Submit(cmd.GuiModuleAddChargeCommand(fitID, charge.ID if charge is not None else None, self.modules))
self.mainFrame.command.Submit(cmd.GuiChangeModuleChargesCommand(fitID, charge.ID if charge is not None else None, self.modules))
ModuleAmmoPicker.register()

2
gui/builtinContextMenus/moduleGlobalAmmoPicker.py
View File

@@ -38,7 +38,7 @@ class ModuleGlobalAmmoPicker(ModuleAmmoPicker):
if mod.itemID == selectedModule.itemID:
allModules.append(mod)
self.mainFrame.command.Submit(cmd.GuiModuleAddChargeCommand(fitID, charge.ID if charge is not None else None, allModules))
self.mainFrame.command.Submit(cmd.GuiChangeModuleChargesCommand(fitID, charge.ID if charge is not None else None, allModules))
def display(self, srcContext, selection):
if not self.settings.get('moduleGlobalAmmoPicker'):

6
gui/builtinContextMenus/mutaplasmids.py
View File

@@ -3,7 +3,7 @@ import wx
import gui.globalEvents as GE
import gui.mainFrame
from gui.fitCommands import GuiMutaConvertCommand, GuiMutaRevertCommand
from gui.fitCommands import GuiConvertMutatedModuleCommand, GuiRevertMutatedModuleCommand
from gui.contextMenu import ContextMenu
from service.fit import Fit
from service.settings import ContextMenuSettings
@@ -58,14 +58,14 @@ class MutaplasmidCM(ContextMenu):
def handleMenu(self, event):
mutaplasmid, mod = self.eventIDs[event.Id]
self.mainFrame.command.Submit(GuiMutaConvertCommand(
self.mainFrame.command.Submit(GuiConvertMutatedModuleCommand(
fitID=self.mainFrame.getActiveFit(),
position=mod.modPosition,
mutaplasmid=mutaplasmid))
def activate(self, fullContext, selection, i):
mod = selection[0]
self.mainFrame.command.Submit(GuiMutaRevertCommand(
self.mainFrame.command.Submit(GuiRevertMutatedModuleCommand(
fitID=self.mainFrame.getActiveFit(),
position=mod.modPosition))

7
gui/builtinContextMenus/spoolUp.py
View File

@@ -24,7 +24,7 @@ class SpoolUp(ContextMenu):
return False
self.mod = selection[0]
self.context = srcContext
# self.context = srcContext
return self.mod.item.group.name in ("Precursor Weapon", "Mutadaptive Remote Armor Repairer")
@@ -75,12 +75,11 @@ class SpoolUp(ContextMenu):
spoolAmount = self.cycleMap[event.Id]
else:
return
self.mainFrame.command.Submit(cmd.GuiSetSpoolupCommand(
self.mainFrame.command.Submit(cmd.GuiChangeModuleSpoolCommand(
fitID=self.mainFrame.getActiveFit(),
position=self.mod.modPosition,
spoolType=spoolType,
spoolAmount=spoolAmount,
context=self.context))
spoolAmount=spoolAmount))
SpoolUp.register()