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

Timestamp:

Mar 27, 2015 1:45:22 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7766: Use SaveState instead of Save for shortcut extra-data key.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIShortcutPool.cpp (modified) (1 diff)
• runtime/UIActionPoolRuntime.cpp (modified) (3 diffs)

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

@@ -274 +274 @@
 
         /* Get shortcut ID/sequence: */
-        const QString strShortcutExtraDataID = strKeyValuePair.left(iDelimiterPosition);
+        QString strShortcutExtraDataID = strKeyValuePair.left(iDelimiterPosition);
         const QString strShortcutSequence = strKeyValuePair.right(strKeyValuePair.length() - iDelimiterPosition - 1);
+
+        // Hack for handling "Save" as "SaveState":
+        if (strShortcutExtraDataID == "Save")
+            strShortcutExtraDataID = "SaveState";
 
         /* Compose corresponding shortcut key: */

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

@@ -243 +243 @@
 };
 
-class UIActionSimplePerformSave : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimplePerformSave(UIActionPool *pParent)
+class UIActionSimplePerformSaveState : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimplePerformSaveState(UIActionPool *pParent)
         : UIActionSimple(pParent, ":/vm_save_state_16px.png", ":/vm_save_state_disabled_16px.png") {}
 
@@ -263 +263 @@
     QString shortcutExtraDataID() const
     {
-        return QString("Save");
+        return QString("SaveState");
     }
 
@@ -2061 +2061 @@
     m_pool[UIActionIndexRT_M_Machine_T_Pause] = new UIActionTogglePause(this);
     m_pool[UIActionIndexRT_M_Machine_S_Reset] = new UIActionSimplePerformReset(this);
-    m_pool[UIActionIndexRT_M_Machine_S_Save] = new UIActionSimplePerformSave(this);
+    m_pool[UIActionIndexRT_M_Machine_S_Save] = new UIActionSimplePerformSaveState(this);
     m_pool[UIActionIndexRT_M_Machine_S_Shutdown] = new UIActionSimplePerformShutdown(this);
     m_pool[UIActionIndexRT_M_Machine_S_PowerOff] = new UIActionSimplePerformPowerOff(this);