dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

Add import stage to goTo logic, and fixed a bug with search initiating a goTo to the last hx item

Browse Source
This commit is contained in:
blitzmann
2015-02-09 00:07:22 -05:00
parent 6d29fd6bc1
commit dc77ee9353
2 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/mainFrame.py
View File

@@ -601,9 +601,9 @@ class MainFrame(wx.Frame):
if len(fits) == 1: if len(fits) == 1:
fit = fits[0] fit = fits[0]
wx.PostEvent(self, FitSelected(fitID=fit.ID)) wx.PostEvent(self, FitSelected(fitID=fit.ID))
wx.PostEvent(self.shipBrowser, Stage3Selected(shipID=fit.shipID, back=0)) wx.PostEvent(self.shipBrowser, Stage3Selected(shipID=fit.shipID, back=True))
else: else:
wx.PostEvent(self.shipBrowser, ImportSelected(fits=fits, back=False)) wx.PostEvent(self.shipBrowser, ImportSelected(fits=fits, back=True))
def backupToXml(self, event): def backupToXml(self, event):
""" Back up all fits to EVE XML file """ """ Back up all fits to EVE XML file """

33
gui/shipBrowser.py
View File

@@ -375,19 +375,10 @@ class NavigationPanel(SFItem.SFBrowserItem):
search = self.BrowserSearchBox.GetValue() search = self.BrowserSearchBox.GetValue()
# Make sure we do not count wildcard as search symbol # Make sure we do not count wildcard as search symbol
realsearch = search.replace("*", "") realsearch = search.replace("*", "")
if len(realsearch) < 3 and len(realsearch) >= 0: if len(realsearch) >= 3:
if self.inSearch == True: self.lastSearch = search
self.inSearch = False wx.PostEvent(self.shipBrowser,SearchSelected(text=search, back = False))
if len(self.shipBrowser.browseHist) > 0:
stage,data = self.shipBrowser.browseHist.pop()
self.gotoStage(stage,data)
else:
if search:
self.lastSearch = search
wx.PostEvent(self.shipBrowser,SearchSelected(text=search, back = False))
self.inSearch = True
else:
self.inSearch = False
def ToggleSearchBox(self): def ToggleSearchBox(self):
if self.BrowserSearchBox.IsShown(): if self.BrowserSearchBox.IsShown():
@@ -543,6 +534,8 @@ class NavigationPanel(SFItem.SFBrowserItem):
elif stage == 4: elif stage == 4:
self.shipBrowser._activeStage = 4 self.shipBrowser._activeStage = 4
wx.PostEvent(self.Parent, SearchSelected(text=data, back=True)) wx.PostEvent(self.Parent, SearchSelected(text=data, back=True))
elif stage == 5:
wx.PostEvent(self.Parent, ImportSelected(fits=data))
else: else:
wx.PostEvent(self.Parent, Stage1Selected()) wx.PostEvent(self.Parent, Stage1Selected())
@@ -909,17 +902,14 @@ class ShipBrowser(wx.Panel):
self.navpanel.ShowNewFitButton(False) self.navpanel.ShowNewFitButton(False)
self.navpanel.ShowSwitchEmptyGroupsButton(False) self.navpanel.ShowSwitchEmptyGroupsButton(False)
if getattr(event, "back", False):
if self._activeStage == 4 and self.navpanel.lastSearch != "":
self.browseHist.append((4, self.navpanel.lastSearch))
else:
self.browseHist.append((self._activeStage, self.lastdata)) self.browseHist.append((self._activeStage, self.lastdata))
self._lastStage = self._activeStage self._lastStage = self._activeStage
self._activeStage = 5 self._activeStage = 5
fits = event.fits fits = event.fits
self.lastdata = fits
self.lpane.Freeze() self.lpane.Freeze()
self.lpane.RemoveAllChildren() self.lpane.RemoveAllChildren()
@@ -1659,10 +1649,15 @@ class FitItem(SFItem.SFBrowserItem):
self.deleted = True self.deleted = True
sFit = service.Fit.getInstance() sFit = service.Fit.getInstance()
fit = sFit.getFit(self.fitID)
sFit.deleteFit(self.fitID) sFit.deleteFit(self.fitID)
if self.shipBrowser.GetActiveStage() == 4: if self.shipBrowser.GetActiveStage() == 5:
if fit in self.shipBrowser.lastdata: # remove fit from import cache
self.shipBrowser.lastdata.remove(fit)
wx.PostEvent(self.shipBrowser, ImportSelected(fits=self.shipBrowser.lastdata))
elif self.shipBrowser.GetActiveStage() == 4:
wx.PostEvent(self.shipBrowser, SearchSelected(text=self.shipBrowser.navpanel.lastSearch, back=True)) wx.PostEvent(self.shipBrowser, SearchSelected(text=self.shipBrowser.navpanel.lastSearch, back=True))
else: else:
wx.PostEvent(self.shipBrowser, Stage3Selected(shipID=self.shipID)) wx.PostEvent(self.shipBrowser, Stage3Selected(shipID=self.shipID))