From 15e60c3d24cfae3bbac6f26f731e2526fe409403 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sat, 24 Feb 2018 21:11:53 -0500 Subject: [PATCH] Always open imports in a new tab (#1432) --- gui/builtinViews/fittingView.py | 3 ++- gui/mainFrame.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index 59a7fb64d..5702503f3 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -68,11 +68,12 @@ class FitSpawner(gui.multiSwitch.TabSpawner): pyfalog.critical(e) if count < 0: startup = getattr(event, "startup", False) # see OpenFitsThread in gui.mainFrame + from_import = getattr(event, "from_import", False) # always open imported into a new tab sFit = Fit.getInstance() openFitInNew = sFit.serviceFittingOptions["openFitInNew"] mstate = wx.GetMouseState() - if (not openFitInNew and mstate.CmdDown()) or startup or (openFitInNew and not mstate.CmdDown()): + if from_import or (not openFitInNew and mstate.CmdDown()) or startup or (openFitInNew and not mstate.CmdDown()): self.multiSwitch.AddPage() view = FittingView(self.multiSwitch) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 829450ba0..d4b23f3a4 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -965,7 +965,7 @@ class MainFrame(wx.Frame, IPortUser): if len(fits) > 0: if len(fits) == 1: fit = fits[0] - wx.PostEvent(self, FitSelected(fitID=fit.ID)) + wx.PostEvent(self, FitSelected(fitID=fit.ID, from_import=True)) wx.PostEvent(self.shipBrowser, Stage3Selected(shipID=fit.shipID, back=True)) else: fits.sort(key=lambda _fit: (_fit.ship.item.name, _fit.name))