Testing error fix

Author: mrvisscher

activity_browser/actions/metadatastore_open.py

@@ -3,7 +3,7 @@
 from activity_browser import application
 from activity_browser.actions.base import ABAction, exception_dialogs
 from activity_browser.ui.icons import qicons
-from activity_browser.ui.widgets.main_window import global_shortcut
+from activity_browser.ui.application import global_shortcut
 
 log = getLogger(__name__)
 
@@ -18,11 +18,6 @@ class MetaDataStoreOpen(ABAction):
     @exception_dialogs
     def run():
         from activity_browser.layouts import pages
-        print("Running MetaDataStoreOpen action")
-
-        # Create a details page for the activity
         page = pages.MetaDataStorePage()
         central = application.main_window.centralWidget()
-
-        # Add the details page to the "Activity Details" group in the central widget
         central.addToGroup("DEBUG", page)

activity_browser/ui/application.py

@@ -82,6 +82,11 @@ def main_window(self) -> QtWidgets.QMainWindow:
     def main_window(self, widget: QtWidgets.QMainWindow):
         self._main_window = widget
 
+        # connect global keyboard shortcuts to their respective functions
+        for seq, func in _global_shortcuts.items():
+            shortcut = QtWidgets.QShortcut(QtGui.QKeySequence(seq), widget)
+            shortcut.activated.connect(func)
+
     def show(self):
         self.main_window.showMaximized()
 
@@ -94,6 +99,20 @@ def deleteLater(self):
         self.main_window.deleteLater()
 
 
+def global_shortcut(key_sequence):
+    """
+    Decorator to register a global keyboard shortcut for the main window. Decorate a function with e.g.
+    @global_shortcut("Ctrl+S") to register it as a shortcut. Also works on the run method of actions as long as the
+    parameters of said action are taken care of.
+    """
+    def decorator(func):
+        _global_shortcuts[key_sequence] = func
+        return func
+    return decorator
+
+_global_shortcuts = {}
+
+
 application = ABApplication()
 
 

activity_browser/ui/widgets/main_window.py

@@ -27,7 +27,6 @@ def __init__(self, parent=None):
         self.setMenuBar(self.menu_bar)
 
         self.connect_signals()
-        self.connect_shortcuts()
 
     def sync(self):
         """
@@ -88,12 +87,6 @@ def connect_signals(self):
         # Keyboard shortcuts
         signals.project.changed.connect(self.sync)
 
-    def connect_shortcuts(self):
-        """Connect global keyboard shortcuts to their respective functions. Only called once during initialization."""
-        for seq, func in _main_window_shortcuts.items():
-            shortcut = QtWidgets.QShortcut(QtGui.QKeySequence(seq), self)
-            shortcut.activated.connect(func)
-
     def clearPanes(self):
         for pane in self.panes():
             pane.deleteLater()
@@ -116,16 +109,3 @@ def dialog_on_exception(self, exception: Exception):
             QtWidgets.QMessageBox.Ok,
         )
 
-
-def global_shortcut(key_sequence):
-    """
-    Decorator to register a global keyboard shortcut for the main window. Decorate a function with e.g.
-    @global_shortcut("Ctrl+S") to register it as a shortcut. Also works on the run method of actions as long as the
-    parameters of said action are taken care of.
-    """
-    def decorator(func):
-        _main_window_shortcuts[key_sequence] = func
-        return func
-    return decorator
-
-_main_window_shortcuts = {}