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

Do not fill with module while adding anything via alt-number from market

Browse Source
This commit is contained in:
DarkPhoenix
2019-04-21 23:42:14 +03:00
parent 8a19bf78ce
commit d45857f1fc
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gui/builtinViews/fittingView.py
View File

@@ -360,12 +360,12 @@ class FittingView(d.Display):
if item is None:
event.Skip()
return
mstate = wx.GetMouseState()
batchOp = wx.GetMouseState().altDown and getattr(event, 'allowBatch', None) is not False
# If we've selected ammo, then apply to the selected module(s)
if item.isCharge:
positions = []
fit = Fit.getInstance().getFit(fitID)
if mstate.altDown:
if batchOp:
for position, mod in enumerate(fit.modules):
if isinstance(mod, Module) and not mod.isEmpty:
positions.append(position)
@@ -384,9 +384,9 @@ class FittingView(d.Display):
if len(positions) > 0:
self.mainFrame.command.Submit(cmd.GuiChangeLocalModuleChargesCommand(
fitID=fitID, positions=positions, chargeItemID=itemID))
elif (item.isModule and not mstate.altDown) or item.isSubsystem:
elif (item.isModule and not batchOp) or item.isSubsystem:
self.mainFrame.command.Submit(cmd.GuiAddLocalModuleCommand(fitID=fitID, itemID=itemID))
elif item.isModule and mstate.altDown:
elif item.isModule and batchOp:
self.mainFrame.command.Submit(cmd.GuiFillWithNewLocalModulesCommand(fitID=fitID, itemID=itemID))
event.Skip()

2
gui/mainFrame.py
View File

@@ -685,7 +685,7 @@ class MainFrame(wx.Frame):
activeListing = getattr(self.marketBrowser.itemView, 'active', None)
if activeListing and selItem < len(activeListing):
wx.PostEvent(self, ItemSelected(itemID=self.marketBrowser.itemView.active[selItem].ID))
wx.PostEvent(self, ItemSelected(itemID=self.marketBrowser.itemView.active[selItem].ID, allowBatch=False))
def CTabNext(self, event):
self.fitMultiSwitch.NextPage()