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

Merge remote-tracking branch 'origin/master' into i18n

Browse Source 
# Conflicts:
#	staticdata/fsd_binary/marketgroups.json
#	staticdata/fsd_binary/typedogma.json
#	staticdata/fsd_lite/evegroups.json
#	staticdata/fsd_lite/evetypes.json
#	staticdata/phobos/metadata.0.json
This commit is contained in:
blitzmann
2020-07-19 21:33:14 -04:00
parent 2239428b71 3ee0ee7e40
commit 6990a71d14
16 changed files with 607 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/builtinAdditionPanes/projectedView.py
View File

@@ -90,8 +90,6 @@ class ProjectedView(d.Display):
self.Bind(wx.EVT_LEFT_DCLICK, self.onLeftDoubleClick)
self.Bind(wx.EVT_KEY_UP, self.kbEvent)
self.droneView = gui.builtinAdditionPanes.droneView.DroneView
self.Bind(wx.EVT_CONTEXT_MENU, self.spawnMenu)
self.SetDropTarget(ProjectedViewDrop(self.handleListDrag))
@@ -162,7 +160,7 @@ class ProjectedView(d.Display):
if item.marketGroup is None:
item = item.metaGroup.parent
return (self.droneView.DRONE_ORDER.index(item.marketGroup.name),
return (gui.builtinAdditionPanes.droneView.DRONE_ORDER.index(item.marketGroup.name),
drone.item.name)
@staticmethod