Changeset 46898 in vbox

Timestamp:

Jul 2, 2013 10:59:16 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Extra-data handling for GUI/DefaultCloseAction, GUI/LastCloseAction and GUI/RestrictedCloseActions: Renaming *Save* value to *SaveState* for backward compatibility.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• globals/UIDefs.h (modified) (1 diff)
• runtime/UIMachineWindow.cpp (modified) (1 diff)
• runtime/UIVMCloseDialog.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -565 +565 @@
     switch (machineCloseAction)
     {
-        case MachineCloseAction_Save:                       strResult = "Save"; break;
+        case MachineCloseAction_SaveState:                  strResult = "SaveState"; break;
         case MachineCloseAction_Shutdown:                   strResult = "Shutdown"; break;
         case MachineCloseAction_PowerOff:                   strResult = "PowerOff"; break;
@@ -584 +584 @@
      * to search through the keys using 'case-insensitive' rule: */
     QStringList keys;                    QList<MachineCloseAction> values;
-    keys << "Save";                      values << MachineCloseAction_Save;
+    keys << "SaveState";                 values << MachineCloseAction_SaveState;
     keys << "Shutdown";                  values << MachineCloseAction_Shutdown;
     keys << "PowerOff";                  values << MachineCloseAction_PowerOff;

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

@@ -318 +318 @@
 {
     MachineCloseAction_Invalid,
-    MachineCloseAction_Save,
+    MachineCloseAction_SaveState,
     MachineCloseAction_Shutdown,
     MachineCloseAction_PowerOff,

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

@@ -328 +328 @@
     switch (closeAction)
     {
-        case MachineCloseAction_Save:
+        case MachineCloseAction_SaveState:
         {
             /* Save VM state: */

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

@@ -72 +72 @@
     /* Calculate result: */
     if (m_pSaveRadio->isChecked())
-        setResult(MachineCloseAction_Save);
+        setResult(MachineCloseAction_SaveState);
     else if (m_pShutdownRadio->isChecked())
         setResult(MachineCloseAction_Shutdown);
@@ -282 +282 @@
     /* Check which close-actions are resticted: */
     QList<MachineCloseAction> restictedCloseActions = vboxGlobal().restrictedMachineCloseActions(m_machine);
-    bool fIsStateSavingAllowed = !restictedCloseActions.contains(MachineCloseAction_Save);
+    bool fIsStateSavingAllowed = !restictedCloseActions.contains(MachineCloseAction_SaveState);
     bool fIsACPIShutdownAllowed = !restictedCloseActions.contains(MachineCloseAction_Shutdown);
     bool fIsPowerOffAllowed = !restictedCloseActions.contains(MachineCloseAction_PowerOff);
@@ -308 +308 @@
     /* If choosing 'last choice' is possible: */
     m_lastCloseAction = gpConverter->fromInternalString<MachineCloseAction>(m_machine.GetExtraData(GUI_LastCloseAction));
-    if (m_lastCloseAction == MachineCloseAction_Save && fIsStateSavingAllowed)
+    if (m_lastCloseAction == MachineCloseAction_SaveState && fIsStateSavingAllowed)
     {
         pRadioButtonToChoose = m_pSaveRadio;