Changeset 103579 in vbox

Timestamp:

Feb 26, 2024 5:35:20 PM (13 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

161931

Message:

FE/Qt: UIShortcutPool: Make sure shortcuts for actions common for both Manager and Runtime action-pools not being overridden by temporary action-pools of other types; That means shortcut-pool is now aware of it's own type now.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UICommon.cpp (modified) (1 diff)
• UIShortcutPool.cpp (modified) (4 diffs)
• UIShortcutPool.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -748 +748 @@
 
     /* Create shortcut pool: */
-    UIShortcutPool::create();
+    UIShortcutPool::create(uiType());
 
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.cpp

@@ -111 +111 @@
 const QString UIShortcutPool::s_strShortcutKeyTemplateRuntime = s_strShortcutKeyTemplate.arg(GUI_Input_MachineShortcuts);
 
-void UIShortcutPool::create()
+void UIShortcutPool::create(UIType enmType)
 {
     /* Check that instance do NOT exists: */
@@ -118 +118 @@
 
     /* Create instance: */
-    new UIShortcutPool;
+    new UIShortcutPool(enmType);
 
     /* Prepare instance: */
@@ -204 +204 @@
             pAction->retranslateUi();
             /* Copy default and standard sequences from the action to the shortcut: */
-            existingShortcut.setDefaultSequence(pAction->defaultShortcut(pActionPool->type()));
-            existingShortcut.setStandardSequence(pAction->standardShortcut(pActionPool->type()));
+            if (pActionPool->type() == m_enmType)
+            {
+                existingShortcut.setDefaultSequence(pAction->defaultShortcut(pActionPool->type()));
+                existingShortcut.setStandardSequence(pAction->standardShortcut(pActionPool->type()));
+            }
         }
         /* If shortcut key is NOT known yet: */
@@ -292 +295 @@
 }
 
-UIShortcutPool::UIShortcutPool()
+UIShortcutPool::UIShortcutPool(UIType enmType)
+    : m_enmType(enmType)
 {
     /* Prepare instance: */

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.h

@@ -37 +37 @@
 /* GUI includes: */
 #include "QIWithRetranslateUI.h"
+#include "UIDefs.h"
 #include "UILibraryDefs.h"
 
@@ -139 +140 @@
     static UIShortcutPool *instance() { return s_pInstance; }
     /** Creates singleton instance. */
-    static void create();
+    static void create(UIType enmType);
     /** Destroys singleton instance. */
     static void destroy();
@@ -173 +174 @@
 
     /** Constructs shortcut pool. */
-    UIShortcutPool();
+    UIShortcutPool(UIType enmType);
     /** Destructs shortcut pool. */
-    ~UIShortcutPool();
+    virtual ~UIShortcutPool() RT_OVERRIDE;
 
     /** Prepares all. */
@@ -208 +209 @@
     static const QString   s_strShortcutKeyTemplateRuntime;
 
+    /** Holds the pool type. */
+    UIType                     m_enmType;
     /** Holds the pool shortcuts. */
-    QMap<QString, UIShortcut> m_shortcuts;
+    QMap<QString, UIShortcut>  m_shortcuts;
 };