From f22a4f13e57e665765eade626f7f0a9cf81d9498 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Mon, 3 Feb 2020 15:54:22 +0300 Subject: [PATCH] Allow pasting non-mutated modules via ctrl-v --- gui/mainFrame.py | 9 ++++++--- service/port/port.py | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index ac209bd91..c1b3f04a7 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -747,9 +747,12 @@ class MainFrame(wx.Frame): 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 index 3c10d9abe..6f61805eb 100644 --- a/service/port/port.py +++ b/service/port/port.py @@ -256,8 +256,8 @@ class Port: 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: