Allow pasting non-mutated modules via ctrl-v

pyfa-org · Feb 3, 2020 · f22a4f1 · f22a4f1
1 parent fc9337d
commit f22a4f1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/gui/mainFrame.py b/gui/mainFrame.py
@@ -747,9 +747,12 @@ def importFromClipboard(self, event):
         activeFit = self.getActiveFit()
         try:
             importType, importData = Port().importFitFromBuffer(clipboard, activeFit)
-            if importType == "MutatedItem":
-                # we've imported an Abyssal module, need to fire off the command to add it to the fit
-                self.command.Submit(cmd.GuiImportLocalMutatedModuleCommand(activeFit, *importData[0]))
+            if importType == "FittingItem":
+                baseItem, mutaplasmidItem, mutations = importData[0]
+                if mutaplasmidItem:
+                    self.command.Submit(cmd.GuiImportLocalMutatedModuleCommand(activeFit, baseItem, mutaplasmidItem, mutations))
+                else:
+                    self.command.Submit(cmd.GuiAddLocalModuleCommand(activeFit, baseItem.ID))
                 return
             if importType == "AdditionsDrones":
                 if self.command.Submit(cmd.GuiImportLocalDronesCommand(activeFit, [(i.ID, a) for i, a in importData[0]])):

diff --git a/service/port/port.py b/service/port/port.py
@@ -256,8 +256,8 @@ def importAuto(cls, string, path=None, activeFit=None, iportuser=None):
             except:
                 pass
             else:
-                if baseItem is not None and mutaplasmidItem is not None:
-                    return "MutatedItem", False, ((baseItem, mutaplasmidItem, mutations),)
+                if baseItem is not None:
+                    return "FittingItem", False, ((baseItem, mutaplasmidItem, mutations),)
             # Try to import into one of additions panels
             isDrone, droneData = isValidDroneImport(string)
             if isDrone: