Merge branch 'master' into ammo_graph

2020-01-21 15:25:39 +03:00
parent 78423f67dd 0fe54631ad
commit eacc97160b
64 changed files with 2392149 additions and 3277152 deletions
--- a/gui/builtinAdditionPanes/implantView.py
+++ b/gui/builtinAdditionPanes/implantView.py
@@ -299,7 +299,10 @@ class ImplantDisplay(d.Display):
        sourceContext1 = "implantItem" if fit.implantSource == ImplantLocation.FIT else "implantItemChar"
        sourceContext2 = "implantItemMisc" if fit.implantSource == ImplantLocation.FIT else "implantItemMiscChar"
        itemContext = None if mainImplant is None else Market.getInstance().getCategoryByItem(mainImplant.item).name
-        menu = ContextMenu.getMenu(self, mainImplant, selection, (sourceContext1, itemContext), (sourceContext2, itemContext))
+        menu = ContextMenu.getMenu(self, mainImplant, selection,
+                                   (sourceContext1, itemContext),
+                                   (sourceContext2, itemContext)
+                                   )
        if menu:
            self.PopupMenu(menu)