From fc2d7cf7b8e7b47a8c43bf91af01cd31f22fe4c6 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 1 Aug 2019 11:26:02 +0300 Subject: [PATCH] Search by short ship name in fit browser lite as well --- gui/builtinContextMenus/fitAddBrowse.py | 2 +- gui/{builtinViews => }/fitBrowserLite.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) rename gui/{builtinViews => }/fitBrowserLite.py (93%) diff --git a/gui/builtinContextMenus/fitAddBrowse.py b/gui/builtinContextMenus/fitAddBrowse.py index f2b4d6289..836121f40 100644 --- a/gui/builtinContextMenus/fitAddBrowse.py +++ b/gui/builtinContextMenus/fitAddBrowse.py @@ -19,7 +19,7 @@ class AddBrowsedFits(ContextMenuUnconditional): return 'Add Fit...' def activate(self, callingWindow, fullContext, i): - from gui.builtinViews.fitBrowserLite import FitBrowserLiteDialog + from gui.fitBrowserLite import FitBrowserLiteDialog titles = { 'projected': 'Add Projected Fits', 'commandView': 'Add Command Fits', diff --git a/gui/builtinViews/fitBrowserLite.py b/gui/fitBrowserLite.py similarity index 93% rename from gui/builtinViews/fitBrowserLite.py rename to gui/fitBrowserLite.py index 99a5b8639..04241291f 100644 --- a/gui/builtinViews/fitBrowserLite.py +++ b/gui/fitBrowserLite.py @@ -72,7 +72,11 @@ class FitBrowserLiteDialog(wx.Dialog): def isMatch(fit, searchTokens): for token in searchTokens: - if token not in fit.name.lower() and token not in fit.shipName.lower(): + if ( + token not in fit.name.lower() and + token not in fit.shipName.lower() and + token not in fit.shipNameShort.lower() + ): return False return True