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

Merge branch 'master' into test-3

Browse Source 
Conflicts:
	eos/gamedata.py
	eos/saveddata/booster.py
	eos/saveddata/character.py
	gui/builtinAdditionPanes/commandView.py
	gui/builtinContextMenus/commandFits.py
	gui/builtinMarketBrowser/itemView.py
	gui/builtinMarketBrowser/marketTree.py
	gui/builtinPreferenceViews/pyfaGeneralPreferences.py
	gui/builtinShipBrowser/categoryItem.py
	gui/builtinShipBrowser/fitItem.py
	gui/builtinShipBrowser/navigationPanel.py
	gui/builtinShipBrowser/raceSelector.py
	gui/builtinShipBrowser/shipItem.py
	gui/builtinStatsViews/priceViewFull.py
	gui/builtinViews/fittingView.py
	gui/characterEditor.py
	gui/characterSelection.py
	gui/chromeTabs.py
	gui/crestFittings.py
	gui/itemStats.py
	gui/mainFrame.py
	scripts/itemDiff.py
	service/price.py
This commit is contained in:
blitzmann
2017-11-23 11:19:05 -05:00
parent 4a33365195 455fea75c0
commit b30b3fcbf1
462 changed files with 12862 additions and 2421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gui/shipBrowser.py
View File

@@ -11,7 +11,7 @@ from gui.builtinShipBrowser.shipItem import ShipItem
from service.fit import Fit
from service.market import Market
from gui.builtinShipBrowser.events import *
import gui.builtinShipBrowser.events as events
from gui.builtinShipBrowser.pfWidgetContainer import PFWidgetsContainer
from gui.builtinShipBrowser.navigationPanel import NavigationPanel
from gui.builtinShipBrowser.raceSelector import RaceSelector
@@ -76,11 +76,11 @@ class ShipBrowser(wx.Panel):
self.Show()
self.Bind(wx.EVT_SIZE, self.SizeRefreshList)
self.Bind(EVT_SB_STAGE2_SEL, self.stage2)
self.Bind(EVT_SB_STAGE1_SEL, self.stage1)
self.Bind(EVT_SB_STAGE3_SEL, self.stage3)
self.Bind(EVT_SB_SEARCH_SEL, self.searchStage)
self.Bind(EVT_SB_IMPORT_SEL, self.importStage)
self.Bind(events.EVT_SB_STAGE2_SEL, self.stage2)
self.Bind(events.EVT_SB_STAGE1_SEL, self.stage1)
self.Bind(events.EVT_SB_STAGE3_SEL, self.stage3)
self.Bind(events.EVT_SB_SEARCH_SEL, self.searchStage)
self.Bind(events.EVT_SB_IMPORT_SEL, self.importStage)
self.mainFrame.Bind(GE.FIT_CHANGED, self.RefreshList)
@@ -378,6 +378,10 @@ class ShipBrowser(wx.Panel):
for ID, name, shipID, shipName, booster, timestamp, notes in fitList:
ship = sMkt.getItem(shipID)
if not sMkt.getPublicityByItem(ship):
continue
shipTrait = ship.traits.traitText if (ship.traits is not None) else "" # empty string if no traits
self.lpane.AddWidget(FitItem(self.lpane, ID, (shipName, shipTrait, name, booster, timestamp, notes), shipID))
@@ -440,7 +444,3 @@ class ShipBrowser(wx.Panel):
if self.showRacesFilterInStage2Only:
self.raceselect.Show(False)
self.Layout()