Changeset 51449 in vbox for trunk/src/VBox

Timestamp:

May 28, 2014 1:56:37 PM (11 years ago)

Author:

vboxsync

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

94012

Message:

FE/Qt: 6660: Advanced extra-data management framework: Integrate GUI_Input_SelectorShortcuts, GUI_Input_MachineShortcuts.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• globals/UIShortcutPool.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -198 +198 @@
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
+QStringList UIExtraDataManager::shortcutOverrides(const QString &strPoolExtraDataID) const
+{
+    if (strPoolExtraDataID == GUI_Input_SelectorShortcuts)
+        return extraDataStringList(GUI_Input_SelectorShortcuts);
+    if (strPoolExtraDataID == GUI_Input_MachineShortcuts)
+        return extraDataStringList(GUI_Input_MachineShortcuts);
+    return QStringList();
+}
+
 QString UIExtraDataManager::recentFolderForHardDrives() const
 {

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -88 +88 @@
     void incrementApplicationUpdateCheckCounter();
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+
+    /** Returns shortcut overrides for shortcut-pool with @a strPoolExtraDataID. */
+    QStringList shortcutOverrides(const QString &strPoolExtraDataID) const;
 
     /** Returns recent hard-drive folder. */

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

@@ -256 +256 @@
     const QString strShortcutKeyTemplate(m_sstrShortcutKeyTemplate.arg(strPoolExtraDataID));
     /* Iterate over all the overrides: */
-    const QStringList overrides = vboxGlobal().virtualBox().GetExtraDataStringList(strPoolExtraDataID);
+    const QStringList overrides = gEDataManager->shortcutOverrides(strPoolExtraDataID);
     foreach (const QString &strKeyValuePair, overrides)
     {