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

Timestamp:

Feb 10, 2023 12:27:24 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:5117: Runtime UI: Bring back Restore current snapshot checkbox of Close VM dialog; Just don't restore whether it was selected before.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• runtime/UIMachineWindow.cpp (modified) (1 diff)
• runtime/UIVMCloseDialog.cpp (modified) (14 diffs)
• runtime/UIVMCloseDialog.h (modified) (3 diffs)

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

@@ -2403 +2403 @@
     switch (machineCloseAction)
     {
-        case MachineCloseAction_Detach:    strResult = "Detach"; break;
-        case MachineCloseAction_SaveState: strResult = "SaveState"; break;
-        case MachineCloseAction_Shutdown:  strResult = "Shutdown"; break;
-        case MachineCloseAction_PowerOff:  strResult = "PowerOff"; break;
+        case MachineCloseAction_Detach:                     strResult = "Detach"; break;
+        case MachineCloseAction_SaveState:                  strResult = "SaveState"; break;
+        case MachineCloseAction_Shutdown:                   strResult = "Shutdown"; break;
+        case MachineCloseAction_PowerOff:                   strResult = "PowerOff"; break;
+        case MachineCloseAction_PowerOff_RestoringSnapshot: strResult = "PowerOffRestoringSnapshot"; break;
         default:
         {
@@ -2427 +2428 @@
     if (strMachineCloseAction.compare("PowerOff", Qt::CaseInsensitive) == 0)
         return MachineCloseAction_PowerOff;
+    if (strMachineCloseAction.compare("PowerOffRestoringSnapshot", Qt::CaseInsensitive) == 0)
+        return MachineCloseAction_PowerOff_RestoringSnapshot;
     return MachineCloseAction_Invalid;
 }

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -1075 +1075 @@
 enum MachineCloseAction
 {
-    MachineCloseAction_Invalid   = 0,
-    MachineCloseAction_Detach    = RT_BIT(0),
-    MachineCloseAction_SaveState = RT_BIT(1),
-    MachineCloseAction_Shutdown  = RT_BIT(2),
-    MachineCloseAction_PowerOff  = RT_BIT(3),
-    MachineCloseAction_All       = 0xFF
+    MachineCloseAction_Invalid                    = 0,
+    MachineCloseAction_Detach                     = RT_BIT(0),
+    MachineCloseAction_SaveState                  = RT_BIT(1),
+    MachineCloseAction_Shutdown                   = RT_BIT(2),
+    MachineCloseAction_PowerOff                   = RT_BIT(3),
+    MachineCloseAction_PowerOff_RestoringSnapshot = RT_BIT(4),
+    MachineCloseAction_All                        = 0xFF
 };
 Q_DECLARE_METATYPE(MachineCloseAction);

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

@@ -529 +529 @@
         }
         case MachineCloseAction_PowerOff:
+        case MachineCloseAction_PowerOff_RestoringSnapshot:
         {
             /* Power VM off: */
             LogRel(("GUI: Request for close-action to power VM off.\n"));
-            const bool fDiscardStateOnPowerOff = gEDataManager->discardStateOnPowerOff(uiCommon().managedVMUuid());
+            const bool fDiscardStateOnPowerOff  = gEDataManager->discardStateOnPowerOff(uiCommon().managedVMUuid())
+                                               || closeAction == MachineCloseAction_PowerOff_RestoringSnapshot;
             uimachine()->powerOff(machine().GetSnapshotCount() > 0 && fDiscardStateOnPowerOff);
             break;

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

@@ -27 +27 @@
 
 /* Qt includes: */
+#include <QButtonGroup>
 #include <QCheckBox>
 #include <QGridLayout>
@@ -69 +70 @@
     , m_pLabelIconShutdown(0), m_pRadioButtonShutdown(0)
     , m_pLabelIconPowerOff(0), m_pRadioButtonPowerOff(0)
+    , m_pCheckBoxDiscard(0)
     , m_enmLastCloseAction(MachineCloseAction_Invalid)
 {
@@ -182 +184 @@
                                             "Selecting this action is recommended only if the virtual machine does not respond "
                                             "to the <b>Send the shutdown signal</b> action.</p>"));
+
+    /* Translate check-box: */
+    m_pCheckBoxDiscard->setText(tr("&Restore current snapshot '%1'").arg(m_strDiscardCheckBoxText));
+    m_pCheckBoxDiscard->setWhatsThis(tr("<p>When checked, the machine will be returned to the state stored in the current "
+                                        "snapshot after it is turned off. This is useful if you are sure that you want to "
+                                        "discard the results of your last sessions and start again at that snapshot.</p>"));
+}
+
+void UIVMCloseDialog::sltUpdateWidgetAvailability()
+{
+    /* Discard option should be enabled only on power-off action: */
+    m_pCheckBoxDiscard->setEnabled(m_pRadioButtonPowerOff->isChecked());
 }
 
@@ -194 +208 @@
         setResult(MachineCloseAction_Shutdown);
     else if (m_pRadioButtonPowerOff->isChecked())
-        setResult(MachineCloseAction_PowerOff);
+    {
+        if (!m_pCheckBoxDiscard->isChecked() || !m_pCheckBoxDiscard->isVisible())
+            setResult(MachineCloseAction_PowerOff);
+        else
+            setResult(MachineCloseAction_PowerOff_RestoringSnapshot);
+    }
 
     /* Memorize the last user's choice for the given VM: */
@@ -256 +275 @@
 }
 
+void UIVMCloseDialog::setCheckBoxVisibleDiscard(bool fVisible)
+{
+    m_pCheckBoxDiscard->setVisible(fVisible);
+}
+
 void UIVMCloseDialog::prepare()
 {
@@ -392 +416 @@
 #endif
 
+        /* Create button-group: */
+        QButtonGroup *pButtonGroup = new QButtonGroup(this);
+        if (pButtonGroup)
+        {
+            connect(pButtonGroup, static_cast<void (QButtonGroup::*)(QAbstractButton *)>(&QButtonGroup::buttonClicked),
+                    this, &UIVMCloseDialog::sltUpdateWidgetAvailability);
+        }
+
         /* Create 'detach' icon label: */
         m_pLabelIconDetach = new QLabel;
@@ -407 +439 @@
             /* Configure button: */
             m_pRadioButtonDetach->installEventFilter(this);
-            /* Add into layout: */
+            /* Add into group/layout: */
+            pButtonGroup->addButton(m_pRadioButtonDetach);
             m_pChoiceLayout->addWidget(m_pRadioButtonDetach, 0, 1);
         }
@@ -426 +459 @@
             /* Configure button: */
             m_pRadioButtonSave->installEventFilter(this);
-            /* Add into layout: */
+            /* Add into group/layout: */
+            pButtonGroup->addButton(m_pRadioButtonSave);
             m_pChoiceLayout->addWidget(m_pRadioButtonSave, 1, 1);
         }
@@ -445 +479 @@
             /* Configure button: */
             m_pRadioButtonShutdown->installEventFilter(this);
-            /* Add into layout: */
+            /* Add into group/layout: */
+            pButtonGroup->addButton(m_pRadioButtonShutdown);
             m_pChoiceLayout->addWidget(m_pRadioButtonShutdown, 2, 1);
         }
@@ -464 +499 @@
             /* Configure button: */
             m_pRadioButtonPowerOff->installEventFilter(this);
+            /* Add into group/layout: */
+            pButtonGroup->addButton(m_pRadioButtonPowerOff);
+            m_pChoiceLayout->addWidget(m_pRadioButtonPowerOff, 3, 1);
+        }
+
+        /* Create 'discard' check-box: */
+        m_pCheckBoxDiscard = new QCheckBox;
+        if (m_pCheckBoxDiscard)
+        {
             /* Add into layout: */
-            m_pChoiceLayout->addWidget(m_pRadioButtonPowerOff, 3, 1);
+            m_pChoiceLayout->addWidget(m_pCheckBoxDiscard, 4, 1);
         }
 
@@ -506 +550 @@
     bool fIsACPIShutdownAllowed = !(m_restictedCloseActions & MachineCloseAction_Shutdown);
     bool fIsPowerOffAllowed = !(m_restictedCloseActions & MachineCloseAction_PowerOff);
+    bool fIsPowerOffAndRestoreAllowed = fIsPowerOffAllowed && !(m_restictedCloseActions & MachineCloseAction_PowerOff_RestoringSnapshot);
 
     /* Make 'Detach' button visible/hidden depending on restriction: */
@@ -524 +569 @@
     /* Make 'Power off' button visible/hidden depending on restriction: */
     setButtonVisiblePowerOff(fIsPowerOffAllowed);
+    /* Make the Restore Snapshot checkbox visible/hidden depending on snapshot count & restrictions: */
+    setCheckBoxVisibleDiscard(fIsPowerOffAndRestoreAllowed && m_comMachine.GetSnapshotCount() > 0);
+    /* Assign Restore Snapshot checkbox text: */
+    if (!m_comMachine.GetCurrentSnapshot().isNull())
+        m_strDiscardCheckBoxText = m_comMachine.GetCurrentSnapshot().GetName();
 
     /* Check which radio-button should be initially chosen: */
@@ -542 +592 @@
     }
     else if (m_enmLastCloseAction == MachineCloseAction_PowerOff && fIsPowerOffAllowed)
+    {
+        pRadioButtonToChoose = m_pRadioButtonPowerOff;
+    }
+    else if (m_enmLastCloseAction == MachineCloseAction_PowerOff_RestoringSnapshot && fIsPowerOffAndRestoreAllowed)
     {
         pRadioButtonToChoose = m_pRadioButtonPowerOff;
@@ -564 +618 @@
         pRadioButtonToChoose->setChecked(true);
         pRadioButtonToChoose->setFocus();
+        sltUpdateWidgetAvailability();
         m_fValid = true;
     }

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

@@ -85 +85 @@
 private slots:
 
+    /** Updates widgets availability. */
+    void sltUpdateWidgetAvailability();
+
     /** Accepts the dialog. */
     void accept();
@@ -109 +112 @@
     /** Defines whether 'PowerOff' button is visible. */
     void setButtonVisiblePowerOff(bool fVisible);
+
+    /** Defines whether 'Discard' check-box is visible. */
+    void setCheckBoxVisibleDiscard(bool fVisible);
 
     /** Prepares all. */
@@ -177 +183 @@
     QRadioButton *m_pRadioButtonPowerOff;
 
+    /** Holds the 'Discard' check-box instance.  */
+    QCheckBox *m_pCheckBoxDiscard;
+    /** Holds the 'Discard' check-box text. */
+    QString    m_strDiscardCheckBoxText;
+
     /** Holds the last close action. */
     MachineCloseAction  m_enmLastCloseAction;