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

cleanup

Browse Source
This commit is contained in:
blitzmann
2017-07-11 02:06:09 -04:00
parent 60e5085724
commit b55fcfaf04
15 changed files with 60 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
gui/builtinShipBrowser/navigationPanel.py
View File

@@ -8,7 +8,7 @@ import gui.mainFrame
import gui.utils.colorUtils as colorUtils
import gui.utils.drawUtils as drawUtils
import gui.utils.fonts as fonts
from events import *
import events
from gui.bitmapLoader import BitmapLoader
from service.fit import Fit
@@ -87,7 +87,7 @@ class NavigationPanel(SFItem.SFBrowserItem):
realsearch = search.replace("*", "")
if len(realsearch) >= 3:
self.lastSearch = search
wx.PostEvent(self.shipBrowser, SearchSelected(text=search, back=False))
wx.PostEvent(self.shipBrowser, events.SearchSelected(text=search, back=False))
def ToggleSearchBox(self):
if self.BrowserSearchBox.IsShown():
@@ -122,7 +122,7 @@ class NavigationPanel(SFItem.SFBrowserItem):
self.btnRecent.normalBmp = self.recentBmpD
if emitEvent:
wx.PostEvent(self.shipBrowser, Stage1Selected())
wx.PostEvent(self.shipBrowser, events.Stage1Selected())
else:
self.shipBrowser.recentFits = True
self.btnRecent.label = "Hide Recent Fits"
@@ -131,7 +131,7 @@ class NavigationPanel(SFItem.SFBrowserItem):
if emitEvent:
sFit = Fit.getInstance()
fits = sFit.getRecentFits()
wx.PostEvent(self.shipBrowser, ImportSelected(fits=fits, back=True, recent=True))
wx.PostEvent(self.shipBrowser, events.ImportSelected(fits=fits, back=True, recent=True))
def ToggleEmptyGroupsView(self):
if self.shipBrowser.filterShipsWithNoFits:
@@ -146,10 +146,10 @@ class NavigationPanel(SFItem.SFBrowserItem):
stage = self.shipBrowser.GetActiveStage()
if stage == 1:
wx.PostEvent(self.shipBrowser, Stage1Selected())
wx.PostEvent(self.shipBrowser, events.Stage1Selected())
elif stage == 2:
categoryID = self.shipBrowser.GetStageData(stage)
wx.PostEvent(self.shipBrowser, Stage2Selected(categoryID=categoryID, back=True))
wx.PostEvent(self.shipBrowser, events.Stage2Selected(categoryID=categoryID, back=True))
def ShowNewFitButton(self, show):
self.btnNew.Show(show)
@@ -167,8 +167,8 @@ class NavigationPanel(SFItem.SFBrowserItem):
sFit = Fit.getInstance()
fitID = sFit.newFit(shipID, "%s fit" % shipName)
self.shipBrowser.fitIDMustEditName = fitID
wx.PostEvent(self.Parent, Stage3Selected(shipID=shipID))
wx.PostEvent(self.mainFrame, FitSelected(fitID=fitID))
wx.PostEvent(self.Parent, events.Stage3Selected(shipID=shipID))
wx.PostEvent(self.mainFrame, events.FitSelected(fitID=fitID))
def OnHistoryReset(self):
self.ToggleRecentShips(False, False)
@@ -259,16 +259,15 @@ class NavigationPanel(SFItem.SFBrowserItem):
def gotoStage(self, stage, data=None):
self.shipBrowser.recentFits = False
if stage == 1:
wx.PostEvent(self.Parent, Stage1Selected())
wx.PostEvent(self.Parent, events.Stage1Selected())
elif stage == 2:
wx.PostEvent(self.Parent, Stage2Selected(categoryID=data, back=True))
wx.PostEvent(self.Parent, events.Stage2Selected(categoryID=data, back=True))
elif stage == 3:
wx.PostEvent(self.Parent, Stage3Selected(shipID=data))
wx.PostEvent(self.Parent, events.Stage3Selected(shipID=data))
elif stage == 4:
self.shipBrowser._activeStage = 4
wx.PostEvent(self.Parent, SearchSelected(text=data, back=True))
wx.PostEvent(self.Parent, events.SearchSelected(text=data, back=True))
elif stage == 5:
wx.PostEvent(self.Parent, ImportSelected(fits=data))
wx.PostEvent(self.Parent, events.ImportSelected(fits=data))
else:
wx.PostEvent(self.Parent, Stage1Selected())
wx.PostEvent(self.Parent, events.Stage1Selected())