Changeset 49468 in vbox

Timestamp:

Nov 13, 2013 2:04:55 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Close actions handling rework (step 4): Make sure DefaultCloseAction takes into account RestrictedCloseActions; Also some change in Close VM dialog initialization.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineWindow.cpp (modified) (3 diffs)
• UIVMCloseDialog.cpp (modified) (2 diffs)
• UIVMCloseDialog.h (modified) (3 diffs)

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

@@ -268 +268 @@
     MachineCloseAction closeAction = MachineCloseAction_Invalid;
 
-    /* If there IS default close-action defined: */
-    QString strDefaultAction = m.GetExtraData(GUI_DefaultCloseAction);
-    if (!strDefaultAction.isEmpty())
-    {
-        /* Parse the close-action which was defined: */
-        closeAction = gpConverter->fromInternalString<MachineCloseAction>(strDefaultAction);
-        /* If VM is stuck, and the default close-action is not 'power-off',
-         * we should ask the user about what to do: */
-        if (uisession()->isStuck() &&
-            closeAction != MachineCloseAction_PowerOff)
-            closeAction = MachineCloseAction_Invalid;
-        /* If the default-action is 'power-off',
-         * we should check if its possible to discard machine-state: */
-        if (closeAction == MachineCloseAction_PowerOff &&
-            m.GetSnapshotCount() > 0)
-            closeAction = MachineCloseAction_PowerOff_RestoringSnapshot;
+    /* If default close-action defined and not restricted: */
+    MachineCloseAction defaultCloseAction = uisession()->defaultCloseAction();
+    MachineCloseAction restrictedCloseActions = uisession()->restrictedCloseActions();
+    if ((defaultCloseAction != MachineCloseAction_Invalid) &&
+        !(restrictedCloseActions & defaultCloseAction))
+    {
+        switch (defaultCloseAction)
+        {
+            /* If VM is stuck, and the default close-action is 'save-state' or 'shutdown',
+             * we should ask the user about what to do: */
+            case MachineCloseAction_SaveState:
+            case MachineCloseAction_Shutdown:
+                closeAction = uisession()->isStuck() ? MachineCloseAction_Invalid : defaultCloseAction;
+                break;
+            /* Otherwise we just use what we have: */
+            default:
+                closeAction = defaultCloseAction;
+                break;
+        }
     }
 
@@ -292 +295 @@
         QWidget *pParentDlg = windowManager().realParentWindow(this);
         QPointer<UIVMCloseDialog> pCloseDlg = new UIVMCloseDialog(pParentDlg, m,
-                                                                  session().GetConsole().GetGuestEnteredACPIMode());
+                                                                  session().GetConsole().GetGuestEnteredACPIMode(),
+                                                                  restrictedCloseActions);
 
         /* Make sure close-dialog is valid: */
@@ -323 +327 @@
         else
         {
-            /* Else user misconfigured .vbox file, 'power-off' will be the action: */
-            closeAction = MachineCloseAction_PowerOff;
+            /* Else user misconfigured .vbox file, we will reject closing UI: */
+            closeAction = MachineCloseAction_Invalid;
         }
 

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

@@ -46 +46 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-UIVMCloseDialog::UIVMCloseDialog(QWidget *pParent, CMachine &machine, bool fIsACPIEnabled)
+UIVMCloseDialog::UIVMCloseDialog(QWidget *pParent, CMachine &machine,
+                                 bool fIsACPIEnabled, MachineCloseAction restictedCloseActions)
     : QIWithRetranslateUI<QIDialog>(pParent)
     , m_machine(machine)
+    , m_restictedCloseActions(restictedCloseActions)
     , m_fIsACPIEnabled(fIsACPIEnabled)
     , m_fValid(false)
@@ -284 +286 @@
 
     /* Check which close-actions are resticted: */
-    MachineCloseAction restictedCloseActions = vboxGlobal().restrictedMachineCloseActions(m_machine);
-    bool fIsStateSavingAllowed = !(restictedCloseActions & MachineCloseAction_SaveState);
-    bool fIsACPIShutdownAllowed = !(restictedCloseActions & MachineCloseAction_Shutdown);
-    bool fIsPowerOffAllowed = !(restictedCloseActions & MachineCloseAction_PowerOff);
-    bool fIsPowerOffAndRestoreAllowed = fIsPowerOffAllowed && !(restictedCloseActions & MachineCloseAction_PowerOff_RestoringSnapshot);
+    bool fIsStateSavingAllowed = !(m_restictedCloseActions & MachineCloseAction_SaveState);
+    bool fIsACPIShutdownAllowed = !(m_restictedCloseActions & MachineCloseAction_Shutdown);
+    bool fIsPowerOffAllowed = !(m_restictedCloseActions & MachineCloseAction_PowerOff);
+    bool fIsPowerOffAndRestoreAllowed = fIsPowerOffAllowed && !(m_restictedCloseActions & MachineCloseAction_PowerOff_RestoringSnapshot);
 
     /* Make 'Save state' button visible/hidden depending on restriction: */

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

@@ -26 +26 @@
 
 /* Forward declarations: */
+enum MachineCloseAction;
 class CMachine;
 class QLabel;
@@ -39 +40 @@
 
     /* Constructor: */
-    UIVMCloseDialog(QWidget *pParent, CMachine &machine, bool fIsACPIEnabled);
+    UIVMCloseDialog(QWidget *pParent, CMachine &machine,
+                    bool fIsACPIEnabled, MachineCloseAction restictedCloseActions);
 
     /* API: Validation stuff: */
@@ -95 +97 @@
     /* Variables: */
     CMachine &m_machine;
+    const MachineCloseAction m_restictedCloseActions;
     bool m_fIsACPIEnabled;
     bool m_fValid;