Merge branch 'master' of https://github.com/cbhaley/calibre

src/calibre/gui2/actions/manage_categories.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # License: GPLv3 Copyright: 2022, Charles Haley
 #
-from qt.core import QToolButton
+from qt.core import QPoint
 
 from calibre.gui2.actions import InterfaceAction
 
@@ -12,14 +12,43 @@ class ManageCategoriesAction(InterfaceAction):
     action_spec = (_('Manage categories'), 'tags.png',
                    _('Manage categories: authors, tags, series, etc.'), '')
     action_type = 'current'
-    popup_type = QToolButton.ToolButtonPopupMode.InstantPopup
     action_add_menu = True
     dont_add_to = frozenset(['context-menu-device', 'menubar-device'])
 
     def genesis(self):
         self.menu = m = self.qaction.menu()
+        self.qaction.triggered.connect(self.show_menu)
         m.aboutToShow.connect(self.about_to_show_menu)
 
+    # We want to show the menu when a toolbar button is clicked. Apparently
+    # the only way to do that is to scan the toolbar(s) for the action button
+    # then exec the associated menu. The search is done here to take adding and
+    # removing the action from toolbars into account.
+    #
+    # If a shortcut is triggered and there isn't a toolbar button visible then
+    # show the menu in the upper left corner of the library view pane. Yes, this
+    # is a bit weird but it works as well as a popping up a dialog.
+    def show_menu(self):
+        for x in self.gui.bars_manager.main_bars + self.gui.bars_manager.child_bars:
+            try:
+                w = x.widgetForAction(self.qaction)
+                # It seems that multiple copies of the action can exist, such as
+                # when the device-connected menu is changed while the device is
+                # connected. Use the one that has an actual position.
+                if w.pos().x() == 0:
+                    continue
+                # The button might be hidden
+                if not w.isVisible():
+                    continue
+                # The w.height() assures that the menu opens below the button.
+                self.menu.exec(w.mapToGlobal(QPoint(0, w.height())))
+                return
+            except:
+                continue
+        # No visible button found. Fall back to displaying in upper left corner
+        # of the library view.
+        self.menu.exec(self.gui.library_view.mapToGlobal(QPoint(10, 10)))
+
     def about_to_show_menu(self):
         db = self.gui.current_db
         self.gui.populate_manage_categories_menu(db, self.menu)