Merge branch 'master' into test-3

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

gui/builtinAdditionPanes/projectedView.py

@@ -191,7 +191,7 @@ class ProjectedView(d.Display):
 
         stuff = []
         if fit is not None:
-            pyfalog.debug("    Collecting list of stuff to display in ProjectedView")
+            # pyfalog.debug("    Collecting list of stuff to display in ProjectedView")
             self.modules = fit.projectedModules[:]
             self.drones = fit.projectedDrones[:]
             self.fighters = fit.projectedFighters[:]
@@ -218,13 +218,16 @@ class ProjectedView(d.Display):
             self.deselectItems()
 
         if not stuff:
-            stuff = [DummyEntry("Drag an item or fit, or use right-click menu for system effects")]
+            stuff = [DummyEntry("Drag an item or fit, or use right-click menu for wormhole effects")]
 
         self.update(stuff)
 
         event.Skip()
 
     def get(self, row):
+        if row == -1:
+            return None
+
         numMods = len(self.modules)
         numDrones = len(self.drones)
         numFighters = len(self.fighters)
@@ -262,13 +265,17 @@ class ProjectedView(d.Display):
             wx.CallAfter(self.spawnMenu)
 
     def spawnMenu(self):
+        fitID = self.mainFrame.getActiveFit()
+        if fitID is None:
+            return
+
         sel = self.GetFirstSelected()
-        menu = None
-        if sel != -1:
-            item = self.get(sel)
-            if item is None:
-                return
+        context = ()
+        item = self.get(sel)
+
+        if item is not None:
             sMkt = Market.getInstance()
+
             if isinstance(item, es_Drone):
                 srcContext = "projectedDrone"
                 itemContext = sMkt.getCategoryByItem(item.item).name
@@ -292,14 +299,10 @@ class ProjectedView(d.Display):
                 fitSrcContext = "projectedFit"
                 fitItemContext = item.name
                 context = ((fitSrcContext, fitItemContext),)
-            context += ("projected",),
-            menu = ContextMenu.getMenu((item,), *context)
-        elif sel == -1:
-            fitID = self.mainFrame.getActiveFit()
-            if fitID is None:
-                return
-            context = (("projected",),)
-            menu = ContextMenu.getMenu([], *context)
+
+        context += (("projected",),)
+        menu = ContextMenu.getMenu((item,) if item is not None else [], *context)
+
         if menu is not None:
             self.PopupMenu(menu)