Changeset 16520 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 4, 2009 5:54:21 PM (16 years ago)

Author:

vboxsync

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

42444

Message:

FE/Qt4: 3225: Disable ACPI actions if ACPI is not supported atm: remake for comment #25.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -1349 +1349 @@
 
             /* make the Discard checkbox invisible if there are no snapshots */
-            bool isDiscardVisible = cmachine.GetSnapshotCount() > 0;
-            dlg.mCbDiscardCurState->setVisible (isDiscardVisible);
+            dlg.mCbDiscardCurState->setVisible (cmachine.GetSnapshotCount() > 0);
 
             if (machine_state != KMachineState_Stuck)
@@ -1357 +1356 @@
                 QStringList lastAction =
                     cmachine.GetExtraData (VBoxDefs::GUI_LastCloseAction).split (',');
-                bool wasDiscardCurState = lastAction.count() > 1 &&
-                                          lastAction [1] == kDiscardCurState;
                 AssertWrapperOk (cmachine);
                 if (lastAction [0] == kSave)
@@ -1365 +1362 @@
                     dlg.mRbSave->setFocus();
                 }
-                else if ((wasDiscardCurState && isDiscardVisible) || !isACPIEnabled)
+                else if (lastAction [0] == kPowerOff || !isACPIEnabled)
                 {
                     dlg.mRbShutdown->setEnabled (isACPIEnabled);
@@ -1376 +1373 @@
                     dlg.mRbShutdown->setFocus();
                 }
-                dlg.mCbDiscardCurState->setChecked (wasDiscardCurState);
+                dlg.mCbDiscardCurState->setChecked (lastAction.count() > 1 &&
+                                                    lastAction [1] == kDiscardCurState);
             }
             else
@@ -1487 +1485 @@
                 if (success || wasShutdown)
                 {
+                    /* read the last user's choice for the given VM */
+                    QStringList prevAction =
+                        cmachine.GetExtraData (VBoxDefs::GUI_LastCloseAction).split (',');
                     /* memorize the last user's choice for the given VM */
                     QString lastAction = kPowerOff;
                     if (dlg.mRbSave->isChecked())
                         lastAction = kSave;
-                    else if (dlg.mRbShutdown->isChecked())
+                    else if (dlg.mRbShutdown->isChecked() ||
+                             (dlg.mRbPowerOff->isChecked() &&
+                              prevAction [0] == kShutdown &&
+                              !isACPIEnabled))
                         lastAction = kShutdown;
                     else if (dlg.mRbPowerOff->isChecked())