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

Always show target resist switcher

Browse Source
This commit is contained in:
DarkPhoenix
2019-12-06 19:35:20 +03:00
parent 4431753570
commit 1e32dfa463
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gui/builtinContextMenus/targetProfile/switcher.py
View File

@@ -17,14 +17,12 @@ class TargetProfileSwitcher(ContextMenuUnconditional):
self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.mainFrame = gui.mainFrame.MainFrame.getInstance()
def display(self, callingWindow, srcContext): def display(self, callingWindow, srcContext):
if self.mainFrame.getActiveFit() is None or srcContext != 'firepowerViewFull': if srcContext != 'firepowerViewFull':
return False return False
if self.mainFrame.getActiveFit() is None:
sTR = svc_TargetProfile.getInstance() return False
self.profiles = list(chain(sTR.getBuiltinTargetProfileList(), sTR.getUserTargetProfileList())) # We always show "No Profile" anyway
self.profiles.sort(key=lambda p: (p.name in ['None'], p.name)) return True
return len(self.profiles) > 0
def getText(self, callingWindow, itmContext): def getText(self, callingWindow, itmContext):
# We take into consideration just target resists, so call menu item accordingly # We take into consideration just target resists, so call menu item accordingly
@@ -60,10 +58,13 @@ class TargetProfileSwitcher(ContextMenuUnconditional):
return menuItem return menuItem
def getSubMenu(self, callingWindow, context, rootMenu, i, pitem): def getSubMenu(self, callingWindow, context, rootMenu, i, pitem):
self.profileEventMap = {} sTR = svc_TargetProfile.getInstance()
profiles = list(chain(sTR.getBuiltinTargetProfileList(), sTR.getUserTargetProfileList()))
profiles.sort(key=lambda p: (p.name in ['None'], p.name))
self.profileEventMap = {}
self.items = (OrderedDict(), OrderedDict()) self.items = (OrderedDict(), OrderedDict())
for profile in self.profiles: for profile in profiles:
remainingName = profile.name.strip() remainingName = profile.name.strip()
container = self.items container = self.items
while True: while True:
@@ -83,7 +84,8 @@ class TargetProfileSwitcher(ContextMenuUnconditional):
mitem, checked = self._addProfile(rootMenu if msw else parentMenu, None, 'No Profile') mitem, checked = self._addProfile(rootMenu if msw else parentMenu, None, 'No Profile')
menu.Append(mitem) menu.Append(mitem)
mitem.Check(checked) mitem.Check(checked)
menu.AppendSeparator() if len(container[0]) > 0 or len(container[1]) > 0:
menu.AppendSeparator()
for name, pattern in container[0].items(): for name, pattern in container[0].items():
menuItem, checked = self._addProfile(rootMenu if msw else parentMenu, pattern, name) menuItem, checked = self._addProfile(rootMenu if msw else parentMenu, pattern, name)
menu.Append(menuItem) menu.Append(menuItem)