Changeset 44586 in vbox for trunk

Timestamp:

Feb 7, 2013 1:52:35 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: 6065: Saving overridden shortcuts at shortcut-pool cleanup.

Location:

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

Files:

• UIShortcutPool.cpp (modified) (3 diffs)
• UIShortcutPool.h (modified) (2 diffs)

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

@@ -210 +210 @@
 }
 
+void UIShortcutPool::cleanup()
+{
+    /* Save overrides: */
+    saveOverrides();
+}
+
 void UIShortcutPool::loadDefaults()
 {
@@ -253 +259 @@
             /* Get corresponding value: */
             UIShortcut &shortcut = m_shortcuts[strShortcutKey];
-            /* Check if corresponding shortcut overriden by value: */
+            /* Check if corresponding shortcut overridden by value: */
             if (shortcut.toString().compare(strShortcutSequence, Qt::CaseInsensitive) != 0)
             {
@@ -267 +273 @@
 }
 
+void UIShortcutPool::saveOverrides()
+{
+    /* Load selector overrides: */
+    saveOverridesFor(GUI_Input_SelectorShortcuts);
+    /* Load machine overrides: */
+    saveOverridesFor(GUI_Input_MachineShortcuts);
+}
+
+void UIShortcutPool::saveOverridesFor(const QString &strPoolExtraDataID)
+{
+    /* Compose shortcut prefix: */
+    const QString strShortcutPrefix(m_strShortcutKeyTemplate.arg(strPoolExtraDataID, QString()));
+    /* Populate the list of all the known overrides: */
+    QStringList overrides;
+    const QList<QString> shortcutKeys = m_shortcuts.keys();
+    foreach (const QString &strShortcutKey, shortcutKeys)
+    {
+        /* Check if the key starts from the proper prefix: */
+        if (!strShortcutKey.startsWith(strShortcutPrefix))
+            continue;
+        /* Get corresponding shortcut: */
+        const UIShortcut &shortcut = m_shortcuts[strShortcutKey];
+        /* Check if the sequence for that shortcut differs from default: */
+        if (shortcut.sequence() == shortcut.defaultSequence())
+            continue;
+        /* Add the shortcut sequence into overrides list: */
+        overrides << QString("%1=%2").arg(QString(strShortcutKey).remove(strShortcutPrefix),
+                                          shortcut.sequence().toString());
+    }
+    /* Save overrides into the extra-data: */
+    vboxGlobal().virtualBox().SetExtraDataStringList(strPoolExtraDataID, overrides);
+}
+
 UIShortcut& UIShortcutPool::shortcut(const QString &strShortcutKey)
 {

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

@@ -115 +115 @@
 
     /* Helper: Cleanup stuff: */
-    void cleanup() {}
+    void cleanup();
 
     /* Helpers: Shortcuts stuff: */
@@ -121 +121 @@
     void loadOverrides();
     void loadOverridesFor(const QString &strPoolExtraDataID);
+    void saveOverrides();
+    void saveOverridesFor(const QString &strPoolExtraDataID);
 
     /* Helper: Shortcut stuff: */