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

Always show implant set menu item if you have sets, even if implant is selected

Browse Source
This commit is contained in:
DarkPhoenix
2019-04-18 00:44:43 +03:00
parent 614f3acc7e
commit 69f68bf4ea
21 changed files with 6 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gui/builtinAdditionPanes/implantView.py
View File

@@ -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)

3
gui/builtinContextMenus/cargoAdd.py
View File

@@ -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

3
gui/builtinContextMenus/cargoAddAmmo.py
View File

@@ -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

3
gui/builtinContextMenus/damagePatternChange.py
View File

@@ -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

3
gui/builtinContextMenus/droneAddStack.py
View File

@@ -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

3
gui/builtinContextMenus/droneSplitStack.py
View File

@@ -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):

3
gui/builtinContextMenus/envEffectAdd.py
View File

@@ -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):

3
gui/builtinContextMenus/fighterAbilities.py
View File

@@ -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

2
gui/builtinContextMenus/fitOpenNewTab.py
View File

@@ -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()

3
gui/builtinContextMenus/implantSetAdd.py
View File

@@ -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):

3
gui/builtinContextMenus/itemAmountChange.py
View File

@@ -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):

3
gui/builtinContextMenus/itemMarketJump.py
View File

@@ -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",

3
gui/builtinContextMenus/itemRemove.py
View File

@@ -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",

3
gui/builtinContextMenus/itemStats.py
View File

@@ -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",

3
gui/builtinContextMenus/moduleAmmoChange.py
View File

@@ -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

2
gui/builtinContextMenus/moduleFill.py
View File

@@ -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")

2
gui/builtinContextMenus/moduleMutations.py
View File

@@ -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]

3
gui/builtinContextMenus/shipJump.py
View File

@@ -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):

3
gui/builtinContextMenus/shipModeChange.py
View File

@@ -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

3
gui/builtinContextMenus/targetResists.py
View File

@@ -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

19
service/settings.py
View File

@@ -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,
}