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

Timestamp:

Jun 20, 2013 10:18:39 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Moving machine-close type enum to global UI defs.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDefs.h (modified) (1 diff)
• runtime/UIMachineWindow.cpp (modified) (8 diffs)
• runtime/UIVMCloseDialog.cpp (modified) (4 diffs)
• runtime/UIVMCloseDialog.h (modified) (3 diffs)

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

@@ -258 +258 @@
 Q_DECLARE_METATYPE(IndicatorType);
 
+/* Machine close action: */
+enum MachineCloseAction
+{
+    MachineCloseAction_Cancel,
+    MachineCloseAction_Save,
+    MachineCloseAction_Shutdown,
+    MachineCloseAction_PowerOff,
+    MachineCloseAction_PowerOff_Restoring_Snapshot,
+    MachineCloseAction_Max
+};
+Q_DECLARE_METATYPE(MachineCloseAction);
+
 #endif // __UIDefs_h__
 

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

@@ -261 +261 @@
 
     /* Choose the close action: */
-    UIVMCloseDialog::ResultCode closeAction = UIVMCloseDialog::ResultCode_Cancel;
+    MachineCloseAction closeAction = MachineCloseAction_Cancel;
 
     /* If there IS default close-action defined: */
@@ -272 +272 @@
          * we should ask the user about what to do: */
         if (uisession()->isStuck() &&
-            closeAction != UIVMCloseDialog::ResultCode_PowerOff)
-            closeAction = UIVMCloseDialog::ResultCode_Cancel;
+            closeAction != MachineCloseAction_PowerOff)
+            closeAction = MachineCloseAction_Cancel;
         /* If the default-action is 'power-off',
          * we should check if its possible to discard machine-state: */
-        if (closeAction == UIVMCloseDialog::ResultCode_PowerOff &&
+        if (closeAction == MachineCloseAction_PowerOff &&
             machine().GetSnapshotCount() > 0)
-            closeAction = UIVMCloseDialog::ResultCode_PowerOff_With_Discarding;
+            closeAction = MachineCloseAction_PowerOff_Restoring_Snapshot;
     }
 
     /* If the close-action still undefined: */
-    if (closeAction == UIVMCloseDialog::ResultCode_Cancel)
+    if (closeAction == MachineCloseAction_Cancel)
     {
         /* Prepare close-dialog: */
@@ -297 +297 @@
                 /* Show close-dialog to let the user make the choice: */
                 windowManager().registerNewParent(pCloseDlg, pParentDlg);
-                closeAction = (UIVMCloseDialog::ResultCode)pCloseDlg->exec();
+                closeAction = static_cast<MachineCloseAction>(pCloseDlg->exec());
 
                 /* Make sure the dialog still valid: */
@@ -306 +306 @@
                  * we should resume it if user canceled dialog or chosen shutdown: */
                 if (!fWasPaused && uisession()->isPaused() &&
-                    (closeAction == UIVMCloseDialog::ResultCode_Cancel ||
-                     closeAction == UIVMCloseDialog::ResultCode_Shutdown))
+                    (closeAction == MachineCloseAction_Cancel ||
+                     closeAction == MachineCloseAction_Shutdown))
                 {
                     /* If we unable to resume VM, cancel closing: */
                     if (!uisession()->unpause())
-                        closeAction = UIVMCloseDialog::ResultCode_Cancel;
+                        closeAction = MachineCloseAction_Cancel;
                 }
             }
@@ -318 +318 @@
         {
             /* Else user misconfigured .vbox file, 'power-off' will be the action: */
-            closeAction = UIVMCloseDialog::ResultCode_PowerOff;
+            closeAction = MachineCloseAction_PowerOff;
         }
 
@@ -328 +328 @@
     switch (closeAction)
     {
-        case UIVMCloseDialog::ResultCode_Save:
+        case MachineCloseAction_Save:
         {
             /* Save VM state: */
@@ -334 +334 @@
             break;
         }
-        case UIVMCloseDialog::ResultCode_Shutdown:
+        case MachineCloseAction_Shutdown:
         {
             /* Shutdown VM: */
@@ -340 +340 @@
             break;
         }
-        case UIVMCloseDialog::ResultCode_PowerOff:
-        case UIVMCloseDialog::ResultCode_PowerOff_With_Discarding:
+        case MachineCloseAction_PowerOff:
+        case MachineCloseAction_PowerOff_Restoring_Snapshot:
         {
             /* Power VM off: */
-            machineLogic()->powerOff(closeAction == UIVMCloseDialog::ResultCode_PowerOff_With_Discarding);
+            machineLogic()->powerOff(closeAction == MachineCloseAction_PowerOff_Restoring_Snapshot);
             break;
         }

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

@@ -65 +65 @@
 
 /* static */
-UIVMCloseDialog::ResultCode UIVMCloseDialog::parseResultCode(const QString &strCloseAction)
-{
-    ResultCode resultCode = ResultCode_Cancel;
+MachineCloseAction UIVMCloseDialog::parseResultCode(const QString &strCloseAction)
+{
+    MachineCloseAction closeAction = MachineCloseAction_Cancel;
     if (!strCloseAction.compare("Save", Qt::CaseInsensitive))
-        resultCode = ResultCode_Save;
+        closeAction = MachineCloseAction_Save;
     else if (!strCloseAction.compare("Shutdown", Qt::CaseInsensitive))
-        resultCode = ResultCode_Shutdown;
+        closeAction = MachineCloseAction_Shutdown;
     else if (!strCloseAction.compare("PowerOff", Qt::CaseInsensitive))
-        resultCode = ResultCode_PowerOff;
-    return resultCode;
+        closeAction = MachineCloseAction_PowerOff;
+    return closeAction;
 }
 
@@ -87 +87 @@
     /* Calculate result: */
     if (m_pSaveRadio->isChecked())
-        setResult(ResultCode_Save);
+        setResult(MachineCloseAction_Save);
     else if (m_pShutdownRadio->isChecked())
-        setResult(ResultCode_Shutdown);
+        setResult(MachineCloseAction_Shutdown);
     else if (m_pPowerOffRadio->isChecked())
     {
         if (!m_pDiscardCheckBox->isChecked() || !m_pDiscardCheckBox->isVisible())
-            setResult(ResultCode_PowerOff);
+            setResult(MachineCloseAction_PowerOff);
         else
-            setResult(ResultCode_PowerOff_With_Discarding);
+            setResult(MachineCloseAction_PowerOff_Restoring_Snapshot);
     }
 
@@ -104 +104 @@
     switch (result())
     {
-        case ResultCode_Save:
+        case MachineCloseAction_Save:
         {
             strLastAction = m_strExtraDataOptionSave;
             break;
         }
-        case ResultCode_Shutdown:
+        case MachineCloseAction_Shutdown:
         {
             strLastAction = m_strExtraDataOptionShutdown;
             break;
         }
-        case ResultCode_PowerOff:
+        case MachineCloseAction_PowerOff:
         {
             if (previousChoice[0] == m_strExtraDataOptionShutdown && !m_fIsACPIEnabled)
@@ -122 +122 @@
             break;
         }
-        case ResultCode_PowerOff_With_Discarding:
+        case MachineCloseAction_PowerOff_Restoring_Snapshot:
         {
             strLastAction = m_strExtraDataOptionPowerOff + "," +

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

@@ -21 +21 @@
 
 /* GUI includes: */
+#include "QIWithRetranslateUI.h"
 #include "QIDialog.h"
-#include "QIWithRetranslateUI.h"
+#include "UIDefs.h"
 
 /* COM includes: */
@@ -41 +42 @@
 public:
 
-    /* Dialog result-code enumerator: */
-    enum ResultCode
-    {
-        ResultCode_Cancel = 0,
-        ResultCode_Save,
-        ResultCode_Shutdown,
-        ResultCode_PowerOff,
-        ResultCode_PowerOff_With_Discarding
-    };
-
     /* Constructor: */
     UIVMCloseDialog(QWidget *pParent, const CMachine &machine, const CSession &session);
@@ -58 +49 @@
 
     /* Static API: Parse string containing result-code: */
-    static ResultCode parseResultCode(const QString &strCloseAction);
+    static MachineCloseAction parseResultCode(const QString &strCloseAction);
 
 private slots: