Merge branch 'development' of https://github.com/pyfa-org/Pyfa into development

gui/builtinContextMenus/amount.py

@@ -4,6 +4,7 @@ import gui.mainFrame
 import gui.globalEvents as GE
 # noinspection PyPackageRequirements
 import wx
+import re
 from service.fit import Fit
 from eos.saveddata.cargo import Cargo as es_Cargo
 from eos.saveddata.fighter import Fighter as es_Fighter
@@ -61,15 +62,16 @@ class AmountChanger(wx.Dialog):
             return
 
         sFit = Fit.getInstance()
+        cleanInput = re.sub(r'[^0-9.]', '', self.input.GetLineText(0).strip())
         mainFrame = gui.mainFrame.MainFrame.getInstance()
         fitID = mainFrame.getActiveFit()
 
         if isinstance(self.thing, es_Cargo):
-            sFit.addCargo(fitID, self.thing.item.ID, int(float(self.input.GetLineText(0))), replace=True)
+            sFit.addCargo(fitID, self.thing.item.ID, int(float(cleanInput)), replace=True)
         elif isinstance(self.thing, es_Fit):
-            sFit.changeAmount(fitID, self.thing, int(float(self.input.GetLineText(0))))
+            sFit.changeAmount(fitID, self.thing, int(float(cleanInput)))
         elif isinstance(self.thing, es_Fighter):
-            sFit.changeActiveFighters(fitID, self.thing, int(float(self.input.GetLineText(0))))
+            sFit.changeActiveFighters(fitID, self.thing, int(float(cleanInput)))
 
         wx.PostEvent(mainFrame, GE.FitChanged(fitID=fitID))
 

gui/builtinContextMenus/metaSwap.py

@@ -14,6 +14,7 @@ from eos.saveddata.module import Module
 from eos.saveddata.drone import Drone
 from eos.saveddata.fighter import Fighter
 from eos.saveddata.implant import Implant
+from eos.saveddata.cargo import Cargo
 
 
 class MetaSwap(ContextMenu):
@@ -31,6 +32,7 @@ class MetaSwap(ContextMenu):
                 "fighterItem",
                 "boosterItem",
                 "implantItem",
+                "cargoItem",
         ):
             return False
 
@@ -185,6 +187,13 @@ class MetaSwap(ContextMenu):
                         sFit.addImplant(fitID, item.ID, True)
                         break
 
+            elif isinstance(selected_item, Cargo):
+                for idx, cargo_stack in enumerate(fit.cargo):
+                    if cargo_stack is selected_item:
+                        sFit.removeCargo(fitID, idx)
+                        sFit.addCargo(fitID, item.ID, cargo_stack.amount, True)
+                        break
+
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))