Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'all-actions-all-menu' of https://github.com/un-pogaz/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2024-02-19 18:32:43 +05:30
commit 60bc1b2b68
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/gui2/actions/all_actions.py
View File

@ -125,7 +125,7 @@ class AllGUIActions(InterfaceAction):
menu_text = f'{display_name}{shortcuts}' menu_text = f'{display_name}{shortcuts}'
icon = name_data[display_name]['icon'] icon = name_data[display_name]['icon']
if act.popup_type == QToolButton.ToolButtonPopupMode.MenuButtonPopup: if act.popup_type == QToolButton.ToolButtonPopupMode.MenuButtonPopup:
if act.action_add_menu: if act.action_add_menu or act.qaction.menu() and act.qaction.menu().children():
# The action offers both a 'click' and a menu. Use the menu. # The action offers both a 'click' and a menu. Use the menu.
menu.addAction(icon, menu_text, partial(self._do_menu, display_name, act)) menu.addAction(icon, menu_text, partial(self._do_menu, display_name, act))
else: else: