From 69f68bf4ea762c9c0a47fb0f95e3d7bc43c85b21 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 18 Apr 2019 00:44:43 +0300 Subject: [PATCH] Always show implant set menu item if you have sets, even if implant is selected --- gui/builtinAdditionPanes/implantView.py | 8 ++++---- gui/builtinContextMenus/cargoAdd.py | 3 --- gui/builtinContextMenus/cargoAddAmmo.py | 3 --- .../damagePatternChange.py | 3 --- gui/builtinContextMenus/droneAddStack.py | 3 --- gui/builtinContextMenus/droneSplitStack.py | 3 --- gui/builtinContextMenus/envEffectAdd.py | 3 --- gui/builtinContextMenus/fighterAbilities.py | 3 --- gui/builtinContextMenus/fitOpenNewTab.py | 2 -- gui/builtinContextMenus/implantSetAdd.py | 3 --- gui/builtinContextMenus/itemAmountChange.py | 3 --- gui/builtinContextMenus/itemMarketJump.py | 3 --- gui/builtinContextMenus/itemRemove.py | 3 --- gui/builtinContextMenus/itemStats.py | 3 --- gui/builtinContextMenus/moduleAmmoChange.py | 3 --- gui/builtinContextMenus/moduleFill.py | 2 +- gui/builtinContextMenus/moduleMutations.py | 2 +- gui/builtinContextMenus/shipJump.py | 3 --- gui/builtinContextMenus/shipModeChange.py | 3 --- gui/builtinContextMenus/targetResists.py | 3 --- service/settings.py | 19 ------------------- 21 files changed, 6 insertions(+), 75 deletions(-) diff --git a/gui/builtinAdditionPanes/implantView.py b/gui/builtinAdditionPanes/implantView.py index 9f027d7d2..fd86a905e 100644 --- a/gui/builtinAdditionPanes/implantView.py +++ b/gui/builtinAdditionPanes/implantView.py @@ -241,13 +241,13 @@ class ImplantDisplay(d.Display): sMkt = Market.getInstance() sourceContext = "implantItem" if fit.implantSource == ImplantLocation.FIT else "implantItemChar" itemContext = sMkt.getCategoryByItem(implant.item).name - - menu = ContextMenu.getMenu((implant,), (sourceContext, itemContext)) + fullContext = ((sourceContext, itemContext), ("implantView",)) + menu = ContextMenu.getMenu((implant,), *fullContext) elif sel == -1 and fit.implantSource == ImplantLocation.FIT: fitID = self.mainFrame.getActiveFit() if fitID is None: return - context = (("implantView",),) - menu = ContextMenu.getMenu([], *context) + context = ("implantView",) + menu = ContextMenu.getMenu([], context) if menu is not None: self.PopupMenu(menu) diff --git a/gui/builtinContextMenus/cargoAdd.py b/gui/builtinContextMenus/cargoAdd.py index e62d83337..aa6589f62 100644 --- a/gui/builtinContextMenus/cargoAdd.py +++ b/gui/builtinContextMenus/cargoAdd.py @@ -11,9 +11,6 @@ class AddToCargo(ContextMenu): self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, selection): - if not self.settings.get('cargo'): - return False - if srcContext not in ("marketItemGroup", "marketItemMisc"): return False diff --git a/gui/builtinContextMenus/cargoAddAmmo.py b/gui/builtinContextMenus/cargoAddAmmo.py index 3f7c8dd90..19534f907 100644 --- a/gui/builtinContextMenus/cargoAddAmmo.py +++ b/gui/builtinContextMenus/cargoAddAmmo.py @@ -10,9 +10,6 @@ class AddToCargoAmmo(ContextMenu): self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, selection): - if not self.settings.get('cargoAmmo'): - return False - if srcContext not in ("marketItemGroup", "marketItemMisc") or self.mainFrame.getActiveFit() is None: return False diff --git a/gui/builtinContextMenus/damagePatternChange.py b/gui/builtinContextMenus/damagePatternChange.py index 5ece19850..d3b451933 100644 --- a/gui/builtinContextMenus/damagePatternChange.py +++ b/gui/builtinContextMenus/damagePatternChange.py @@ -18,9 +18,6 @@ class ChangeDamagePattern(ContextMenu): self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, selection): - if not self.settings.get('damagePattern'): - return False - return srcContext == "resistancesViewFull" @property diff --git a/gui/builtinContextMenus/droneAddStack.py b/gui/builtinContextMenus/droneAddStack.py index d24ba9d28..c693daf62 100644 --- a/gui/builtinContextMenus/droneAddStack.py +++ b/gui/builtinContextMenus/droneAddStack.py @@ -11,9 +11,6 @@ class DroneAddStack(ContextMenu): self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, selection): - if not self.settings.get('droneStack'): - return False - if srcContext not in ('marketItemGroup', 'marketItemMisc') or self.mainFrame.getActiveFit() is None: return False diff --git a/gui/builtinContextMenus/droneSplitStack.py b/gui/builtinContextMenus/droneSplitStack.py index fff6b3004..31eb9e276 100644 --- a/gui/builtinContextMenus/droneSplitStack.py +++ b/gui/builtinContextMenus/droneSplitStack.py @@ -16,9 +16,6 @@ class DroneSplitStack(ContextMenu): self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, selection): - if not self.settings.get('droneSplit'): - return False - return srcContext == "droneItem" and selection[0].amount > 1 def getText(self, itmContext, selection): diff --git a/gui/builtinContextMenus/envEffectAdd.py b/gui/builtinContextMenus/envEffectAdd.py index 1da3044a8..11f02d713 100644 --- a/gui/builtinContextMenus/envEffectAdd.py +++ b/gui/builtinContextMenus/envEffectAdd.py @@ -29,9 +29,6 @@ class AddEnvironmentEffect(ContextMenu): self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, selection): - if not self.settings.get('whProjector'): - return False - return srcContext == "projected" def getText(self, itmContext, selection): diff --git a/gui/builtinContextMenus/fighterAbilities.py b/gui/builtinContextMenus/fighterAbilities.py index 5433a7b8a..73b4686c9 100644 --- a/gui/builtinContextMenus/fighterAbilities.py +++ b/gui/builtinContextMenus/fighterAbilities.py @@ -15,9 +15,6 @@ class FighterAbilities(ContextMenu): self.isProjected = None def display(self, srcContext, selection): - if not self.settings.get('fighterAbilities'): - return False - if self.mainFrame.getActiveFit() is None or srcContext not in ("fighterItem", "projectedFighter"): return False diff --git a/gui/builtinContextMenus/fitOpenNewTab.py b/gui/builtinContextMenus/fitOpenNewTab.py index e064d0dc5..8592e961a 100644 --- a/gui/builtinContextMenus/fitOpenNewTab.py +++ b/gui/builtinContextMenus/fitOpenNewTab.py @@ -13,8 +13,6 @@ class OpenFitInNewTab(ContextMenu): self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, selection): - if not self.settings.get('openFit'): - return False if srcContext not in ("projectedFit", "commandFit"): return False currentFitID = self.mainFrame.getActiveFit() diff --git a/gui/builtinContextMenus/implantSetAdd.py b/gui/builtinContextMenus/implantSetAdd.py index ffa0aa186..b8fe8254c 100644 --- a/gui/builtinContextMenus/implantSetAdd.py +++ b/gui/builtinContextMenus/implantSetAdd.py @@ -16,15 +16,12 @@ class addImplantSet(ContextMenu): self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, selection): - if not self.settings.get('implantSets'): - return False sIS = s_ImplantSets.getInstance() implantSets = sIS.getImplantSetList() if len(implantSets) == 0: return False - return srcContext in ("implantView", "implantEditor") def getText(self, itmContext, selection): diff --git a/gui/builtinContextMenus/itemAmountChange.py b/gui/builtinContextMenus/itemAmountChange.py index 75ed89629..0fd8791a9 100644 --- a/gui/builtinContextMenus/itemAmountChange.py +++ b/gui/builtinContextMenus/itemAmountChange.py @@ -20,9 +20,6 @@ class ChangeItemAmount(ContextMenu): self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, selection): - if not self.settings.get('amount'): - return False - return srcContext in ("droneItem", "projectedDrone", "cargoItem", "projectedFit", "fighterItem", "projectedFighter") def getText(self, itmContext, selection): diff --git a/gui/builtinContextMenus/itemMarketJump.py b/gui/builtinContextMenus/itemMarketJump.py index 010f35fd7..049686f7c 100644 --- a/gui/builtinContextMenus/itemMarketJump.py +++ b/gui/builtinContextMenus/itemMarketJump.py @@ -10,9 +10,6 @@ class JumpToMarketItem(ContextMenu): self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, selection): - if not self.settings.get('marketJump'): - return False - validContexts = ("marketItemMisc", "fittingModule", "fittingCharge", "droneItem", "implantItem", "boosterItem", diff --git a/gui/builtinContextMenus/itemRemove.py b/gui/builtinContextMenus/itemRemove.py index 16cdcc7e4..123c320e4 100644 --- a/gui/builtinContextMenus/itemRemove.py +++ b/gui/builtinContextMenus/itemRemove.py @@ -13,9 +13,6 @@ class RemoveItem(ContextMenu): self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, selection): - if not self.settings.get('itemRemove'): - return False - return srcContext in ("fittingModule", "droneItem", "implantItem", "boosterItem", "projectedModule", "cargoItem", diff --git a/gui/builtinContextMenus/itemStats.py b/gui/builtinContextMenus/itemStats.py index b1cef2204..fd0d7cac3 100644 --- a/gui/builtinContextMenus/itemStats.py +++ b/gui/builtinContextMenus/itemStats.py @@ -14,9 +14,6 @@ class ItemStats(ContextMenu): self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, selection): - if not self.settings.get('itemStats'): - return False - return srcContext in ("marketItemGroup", "marketItemMisc", "fittingModule", "fittingCharge", "fittingShip", "baseShip", diff --git a/gui/builtinContextMenus/moduleAmmoChange.py b/gui/builtinContextMenus/moduleAmmoChange.py index 2d485b426..8e1b38ce4 100644 --- a/gui/builtinContextMenus/moduleAmmoChange.py +++ b/gui/builtinContextMenus/moduleAmmoChange.py @@ -20,9 +20,6 @@ class ChangeModuleAmmo(ContextMenu): self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, selection): - if not self.settings.get('moduleAmmoPicker'): - return False - if self.mainFrame.getActiveFit() is None or srcContext not in ("fittingModule", "projectedModule"): return False diff --git a/gui/builtinContextMenus/moduleFill.py b/gui/builtinContextMenus/moduleFill.py index a05bd79df..c91038c0e 100644 --- a/gui/builtinContextMenus/moduleFill.py +++ b/gui/builtinContextMenus/moduleFill.py @@ -16,7 +16,7 @@ class FillWithModule(ContextMenu): def display(self, srcContext, selection): if not self.settings.get('moduleFill'): return False - return srcContext in ("fittingModule") + return srcContext == "fittingModule" def getText(self, itmContext, selection): return u"Fill With {0}".format(itmContext if itmContext is not None else "Module") diff --git a/gui/builtinContextMenus/moduleMutations.py b/gui/builtinContextMenus/moduleMutations.py index 549a60528..25d9fe33e 100644 --- a/gui/builtinContextMenus/moduleMutations.py +++ b/gui/builtinContextMenus/moduleMutations.py @@ -18,7 +18,7 @@ class ChangeModuleMutation(ContextMenu): # if not self.settings.get('ammoPattern'): # return False - if srcContext not in "fittingModule" or self.mainFrame.getActiveFit() is None: + if srcContext != "fittingModule" or self.mainFrame.getActiveFit() is None: return False mod = selection[0] diff --git a/gui/builtinContextMenus/shipJump.py b/gui/builtinContextMenus/shipJump.py index 7dac4296b..8eb6cdc4d 100644 --- a/gui/builtinContextMenus/shipJump.py +++ b/gui/builtinContextMenus/shipJump.py @@ -14,9 +14,6 @@ class JumpToShip(ContextMenu): self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, selection): - if not self.settings.get('shipJump'): - return False - return srcContext == "fittingShip" def getText(self, itmContext, selection): diff --git a/gui/builtinContextMenus/shipModeChange.py b/gui/builtinContextMenus/shipModeChange.py index b7b3057bb..cd68462dd 100644 --- a/gui/builtinContextMenus/shipModeChange.py +++ b/gui/builtinContextMenus/shipModeChange.py @@ -14,9 +14,6 @@ class ChangeShipTacticalMode(ContextMenu): self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, selection): - if not self.settings.get('tacticalMode'): - return False - if self.mainFrame.getActiveFit() is None or srcContext != "fittingShip": return False diff --git a/gui/builtinContextMenus/targetResists.py b/gui/builtinContextMenus/targetResists.py index 9827bf34a..84df42d5f 100644 --- a/gui/builtinContextMenus/targetResists.py +++ b/gui/builtinContextMenus/targetResists.py @@ -18,9 +18,6 @@ class TargetResists(ContextMenu): self.settings = ContextMenuSettings.getInstance() def display(self, srcContext, selection): - if not self.settings.get('targetResists'): - return False - if self.mainFrame.getActiveFit() is None or srcContext != "firepowerViewFull": return False diff --git a/service/settings.py b/service/settings.py index cd05d1fa0..19426abf1 100644 --- a/service/settings.py +++ b/service/settings.py @@ -466,28 +466,9 @@ class ContextMenuSettings(object): # 1 - Show ContextMenuDefaultSettings = { "ammoPattern" : 1, - "amount" : 1, - "cargo" : 1, - "cargoAmmo" : 1, "changeAffectingSkills" : 1, - "damagePattern" : 1, - "droneRemoveStack" : 1, - "droneSplit" : 1, - "droneStack" : 1, - "fighterAbilities" : 1, - "implantSets" : 1, - "itemStats" : 1, - "itemRemove" : 1, - "marketJump" : 1, "metaSwap" : 1, - "moduleAmmoPicker" : 1, - "openFit" : 1, - "priceClear" : 1, "project" : 1, - "shipJump" : 1, - "tacticalMode" : 1, - "targetResists" : 1, - "whProjector" : 1, "moduleFill" : 1, "spoolup" : 1, }