Changeset 44448 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 29, 2013 6:37:30 PM (12 years ago)

Author:

vboxsync

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

83440

Message:

FE/Qt: 6065: Global/machine keyboard shortcut processing: Make sure shortcuts will be updated at runtime.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (3 diffs)
• globals/UIActionPool.h (modified) (1 diff)
• globals/UIExtraDataEventHandler.cpp (modified) (5 diffs)
• globals/UIExtraDataEventHandler.h (modified) (2 diffs)
• globals/UIShortcutPool.cpp (modified) (6 diffs)
• globals/UIShortcutPool.h (modified) (4 diffs)
• runtime/UIActionPoolRuntime.cpp (modified) (1 diff)
• runtime/UIActionPoolRuntime.h (modified) (1 diff)
• selector/UIActionPoolSelector.cpp (modified) (2 diffs)
• selector/UIActionPoolSelector.h (modified) (1 diff)

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

@@ -72 +72 @@
 void UIAction::setShortcut(const QKeySequence &shortcut)
 {
-    /* Call to base-class: */
-    QAction::setShortcut(shortcut);
-    /* Remember shortcut: */
-    m_shortcut = shortcut;
+    /* Only for selector's action-pool: */
+    if (m_actionPoolType == UIActionPoolType_Selector)
+    {
+        /* Call to base-class: */
+        QAction::setShortcut(shortcut);
+        /* Remember shortcut: */
+        m_shortcut = shortcut;
+    }
     /* Update text according new shortcut: */
     updateText();
@@ -568 +572 @@
     createMenus();
     /* Apply shortcuts: */
-    gShortcutPool->applyShortcuts(this);
+        sltApplyShortcuts();
 }
 
@@ -608 +612 @@
     }
     return false;
+}
+
+void UIActionPool::sltApplyShortcuts()
+{
+    gShortcutPool->applyShortcuts(this);
 }
 

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

@@ -259 +259 @@
     bool processHotKey(const QKeySequence &key);
 
+protected slots:
+
+    /* Handler: Shortcuts stuff: */
+    void sltApplyShortcuts();
+
 protected:
 

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -26 +26 @@
 #include "VBoxGlobal.h"
 #include "VBoxGlobalSettings.h"
+#include "UIActionPool.h"
 
 /* COM includes: */
@@ -119 +120 @@
                }
                if (strKey == GUI_LanguageId)
-                       emit sigGUILanguageChange(strValue);
+                   emit sigGUILanguageChange(strValue);
+               if (strKey == GUI_Input_SelectorShortcuts && gActionPool->type() == UIActionPoolType_Selector)
+                   emit sigSelectorShortcutsChanged();
+               if (strKey == GUI_Input_MachineShortcuts && gActionPool->type() == UIActionPoolType_Runtime)
+                   emit sigMachineShortcutsChanged();
 #ifdef VBOX_GUI_WITH_SYSTRAY
                if (strKey == GUI_MainWindowCount)
@@ -178 +183 @@
     void sigCanShowRegistrationDlg(bool fEnabled);
     void sigGUILanguageChange(QString strLang);
+    void sigSelectorShortcutsChanged();
+    void sigMachineShortcutsChanged();
 #ifdef VBOX_GUI_WITH_SYSTRAY
     void sigMainWindowCountChange(int count);
@@ -258 +265 @@
             Qt::QueuedConnection);
 
+    connect(m_pHandler, SIGNAL(sigSelectorShortcutsChanged()),
+            this, SIGNAL(sigSelectorShortcutsChanged()),
+            Qt::QueuedConnection);
+
+    connect(m_pHandler, SIGNAL(sigMachineShortcutsChanged()),
+            this, SIGNAL(sigMachineShortcutsChanged()),
+            Qt::QueuedConnection);
+
 #ifdef VBOX_GUI_WITH_SYSTRAY
     connect(m_pHandler, SIGNAL(sigMainWindowCountChange(int)),

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -38 +38 @@
     void sigCanShowRegistrationDlg(bool fEnabled);
     void sigGUILanguageChange(QString strLang);
+    void sigSelectorShortcutsChanged();
+    void sigMachineShortcutsChanged();
 #ifdef VBOX_GUI_WITH_SYSTRAY
     void sigMainWindowCountChange(int count);

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

@@ -20 +20 @@
 #include "UIShortcutPool.h"
 #include "UIActionPool.h"
+#include "UIExtraDataEventHandler.h"
 
 void UIShortcut::setDescription(const QString &strDescription)
@@ -116 +117 @@
             UIShortcut &existingShortcut = m_shortcuts[strShortcutKey];
             /* Copy the sequence from the shortcut to the action: */
-            if (pActionPool->type() != UIActionPoolType_Runtime)
-                pAction->setShortcut(existingShortcut.sequence());
+            pAction->setShortcut(existingShortcut.sequence());
             /* Copy the description from the action to the shortcut if necessary: */
             if (existingShortcut.description().isNull())
@@ -129 +129 @@
             /* Copy the action's default to both the shortcut & the action: */
             newShortcut.setSequence(pAction->defaultShortcut(pActionPool->type()));
-            if (pActionPool->type() != UIActionPoolType_Runtime)
-                pAction->setShortcut(newShortcut.sequence());
+            pAction->setShortcut(newShortcut.sequence());
             /* Copy the description from the action to the shortcut: */
             newShortcut.setDescription(pAction->name());
@@ -137 +136 @@
 }
 
+void UIShortcutPool::sltReloadSelectorShortcuts()
+{
+    /* Clear selector shortcuts first: */
+    QList<QString> shortcutKeyList = m_shortcuts.keys();
+    foreach (const QString &strShortcutKey, shortcutKeyList)
+        if (strShortcutKey.startsWith(GUI_Input_SelectorShortcuts))
+            m_shortcuts.remove(strShortcutKey);
+    /* Load selector overrides: */
+    loadOverridesFor(GUI_Input_SelectorShortcuts);
+    /* Notify selector shortcuts reloaded: */
+    emit sigSelectorShortcutsReloaded();
+}
+
+void UIShortcutPool::sltReloadMachineShortcuts()
+{
+    /* Clear machine shortcuts first: */
+    QList<QString> shortcutKeyList = m_shortcuts.keys();
+    foreach (const QString &strShortcutKey, shortcutKeyList)
+        if (strShortcutKey.startsWith(GUI_Input_MachineShortcuts))
+            m_shortcuts.remove(strShortcutKey);
+    /* Load machine overrides: */
+    loadOverridesFor(GUI_Input_MachineShortcuts);
+    /* Notify machine shortcuts reloaded: */
+    emit sigMachineShortcutsReloaded();
+}
+
 UIShortcutPool::UIShortcutPool()
 {
@@ -157 +182 @@
     /* Load overrides: */
     loadOverrides();
+    /* Prepare connections: */
+    prepareConnections();
+}
+
+void UIShortcutPool::prepareConnections()
+{
+    /* Connect to extra-data signals: */
+    connect(gEDataEvents, SIGNAL(sigSelectorShortcutsChanged()), this, SLOT(sltReloadSelectorShortcuts()));
+    connect(gEDataEvents, SIGNAL(sigMachineShortcutsChanged()), this, SLOT(sltReloadMachineShortcuts()));
 }
 
@@ -170 +204 @@
 void UIShortcutPool::loadOverrides()
 {
-    /* Selector shortcut prefix: */
-    QString strSelectorShortcutPrefix(GUI_Input_SelectorShortcuts);
-    /* Selector shortcut key template: */
-    QString strSelectorShortcutKeyTemplate(m_strShortcutKeyTemplate.arg(strSelectorShortcutPrefix));
-    /* Runtime shortcut prefix: */
-    QString strRuntimeShortcutPrefix(GUI_Input_MachineShortcuts);
-    /* Runtime shortcut key template: */
-    QString strRuntimeShortcutKeyTemplate(m_strShortcutKeyTemplate.arg(strRuntimeShortcutPrefix));
-
-    /* Iterate over all the selector records: */
-    parseOverrides(vboxGlobal().virtualBox().GetExtraDataStringList(strSelectorShortcutPrefix), strSelectorShortcutKeyTemplate);
-    /* Iterate over all the runtime records: */
-    parseOverrides(vboxGlobal().virtualBox().GetExtraDataStringList(strRuntimeShortcutPrefix), strRuntimeShortcutKeyTemplate);
+    /* Load selector overrides: */
+    loadOverridesFor(GUI_Input_SelectorShortcuts);
+    /* Load machine overrides: */
+    loadOverridesFor(GUI_Input_MachineShortcuts);
+}
+
+void UIShortcutPool::loadOverridesFor(const QString &strExtraDataID)
+{
+    /* Shortcut prefix: */
+    QString strShortcutPrefix(strExtraDataID);
+    /* Shortcut key template: */
+    QString strShortcutKeyTemplate(m_strShortcutKeyTemplate.arg(strShortcutPrefix));
+    /* Iterate over all the records: */
+    parseOverrides(vboxGlobal().virtualBox().GetExtraDataStringList(strShortcutPrefix), strShortcutKeyTemplate);
 }
 

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

@@ -63 +63 @@
     Q_OBJECT;
 
+signals:
+
+    /* Notifiers: Extra-data stuff: */
+    void sigSelectorShortcutsReloaded();
+    void sigMachineShortcutsReloaded();
+
 public:
 
@@ -77 +83 @@
     void applyShortcuts(UIActionPool *pActionPool);
 
+private slots:
+
+    /* Handlers: Extra-data stuff: */
+    void sltReloadSelectorShortcuts();
+    void sltReloadMachineShortcuts();
+
 private:
 
@@ -83 +95 @@
     ~UIShortcutPool();
 
-    /* Prepare/cleanup helpers: */
+    /* Helpers: Prepare stuff: */
     void prepare();
+    void prepareConnections();
+
+    /* Helper: Cleanup stuff: */
     void cleanup() {}
 
@@ -90 +105 @@
     void loadDefaults();
     void loadOverrides();
+    void loadOverridesFor(const QString &strExtraDataID);
     void parseOverrides(const QStringList &overrides, const QString &strTemplate);
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp

@@ -1047 +1047 @@
 #endif /* Q_WS_MAC */
 
+
+UIActionPoolRuntime::UIActionPoolRuntime()
+    : UIActionPool(UIActionPoolType_Runtime)
+{
+    /* Prepare connections: */
+    connect(gShortcutPool, SIGNAL(sigMachineShortcutsReloaded()), this, SLOT(sltApplyShortcuts()));
+}
 
 QString UIActionPoolRuntime::shortcutsExtraDataID() const

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h

@@ -93 +93 @@
 
     /* Constructor: */
-    UIActionPoolRuntime() : UIActionPool(UIActionPoolType_Runtime) {}
+    UIActionPoolRuntime();
 
     /* Helper: Shortcuts stuff: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp

@@ -20 +20 @@
 /* Local includes: */
 #include "UIActionPoolSelector.h"
+#include "UIShortcutPool.h"
 #include "UIDefs.h"
 
@@ -975 +976 @@
 
 
+UIActionPoolSelector::UIActionPoolSelector()
+    : UIActionPool(UIActionPoolType_Selector)
+{
+    /* Prepare connections: */
+    connect(gShortcutPool, SIGNAL(sigSelectorShortcutsReloaded()), this, SLOT(sltApplyShortcuts()));
+}
+
 QString UIActionPoolSelector::shortcutsExtraDataID() const
 {

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.h

@@ -81 +81 @@
 
     /* Constructor: */
-    UIActionPoolSelector() : UIActionPool(UIActionPoolType_Selector) {}
+    UIActionPoolSelector();
 
     /* Helper: Shortcuts stuff: */