Skip to content

Commit

Permalink
Resolve helplist when we have outcome without headings
Browse files Browse the repository at this point in the history
Due to my latest changes in the 'flag' order without headings we had an
empty list
  • Loading branch information
Littlesat committed Jan 4, 2025
1 parent 83f3b90 commit 57cd26b
Showing 1 changed file with 20 additions and 10 deletions.
30 changes: 20 additions & 10 deletions lib/python/Components/HelpMenuList.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,16 +136,26 @@ def getActionmapGroupKey(actionmap, context):

self.list = []
extendedPadding = (None, ) if formatFlags & self.EXTENDED else ()
for (actionmap, context, actions) in sorted(helplist, key=self._sortHeadingsAlpha):
actionmapGroupKey = getActionmapGroupKey(actionmap, context)
print(actionmapGroupKey)
if headings and actionmapGroupKey in actionMapHelp:
if sortKey:
actionMapHelp[actionmapGroupKey].sort(key=sortKey)
self.addListBoxContext(actionMapHelp[actionmapGroupKey], formatFlags)
self.list.append((None, actionmap.description if getattr(actionmap, "description", None) else _(re.sub(r"(?:(?=(?<=[^A-Z])[A-Z])|(?=Actions|Select))(?!(?<=Pi)P)", " ", context)), None) + extendedPadding)
self.list.extend(actionMapHelp[actionmapGroupKey])
del actionMapHelp[actionmapGroupKey]
if headings:
for (actionmap, context, actions) in sorted(helplist, key=self._sortHeadingsAlpha):
actionmapGroupKey = getActionmapGroupKey(actionmap, context)
print(actionmapGroupKey)
if actionmapGroupKey in actionMapHelp:
if sortKey:
actionMapHelp[actionmapGroupKey].sort(key=sortKey)
self.addListBoxContext(actionMapHelp[actionmapGroupKey], formatFlags)
self.list.append((None, actionmap.description if getattr(actionmap, "description", None) else _(re.sub(r"(?:(?=(?<=[^A-Z])[A-Z])|(?=Actions|Select))(?!(?<=Pi)P)", " ", context)), None) + extendedPadding)
self.list.extend(actionMapHelp[actionmapGroupKey])
del actionMapHelp[actionmapGroupKey]
else:
for (actionmap, context, actions) in helplist:
actionmapGroupKey = getActionmapGroupKey(actionmap, context)
if actionmapGroupKey in actionMapHelp:
self.list.extend(actionMapHelp[actionmapGroupKey])
del actionMapHelp[actionmapGroupKey]
if sortKey:
self.list.sort(key=sortKey)
self.addListBoxContext(self.list, formatFlags)

for i, ent in enumerate(self.list):
if ent[0] is not None:
Expand Down

0 comments on commit 57cd26b

Please sign in to comment.