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

Timestamp:

Aug 13, 2021 9:58:57 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Initialize clone mode correctly.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm

Files:

• UIWizardCloneVM.cpp (modified) (2 diffs)
• UIWizardCloneVMPageBasic3.cpp (modified) (4 diffs)
• UIWizardCloneVMPageBasic3.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.cpp

@@ -39 +39 @@
     , m_iCloneModePageIndex(-1)
     , m_strCloneName(!machine.isNull() ? machine.GetName() : QString())
+    , m_enmCloneMode(KCloneMode_MachineState)
 {
 #ifndef VBOX_WS_MAC
@@ -59 +60 @@
 {
     if (m_iCloneModePageIndex == -1)
-        return true;
+        return false;
     return isPageVisible(m_iCloneModePageIndex);
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic3.cpp

@@ -18 +18 @@
 /* Global includes: */
 #include <QVBoxLayout>
-#include <QRadioButton>
+
 
 /* Local includes: */
@@ -26 +26 @@
 #include "QIRichTextLabel.h"
 
-
-// UIWizardCloneVMPage3::UIWizardCloneVMPage3(bool fShowChildsOption)
-//     : m_fShowChildsOption(fShowChildsOption)
-// {
-// }
-
-// KCloneMode UIWizardCloneVMPage3::cloneMode() const
-// {
-//     if (m_pMachineAndChildsRadio->isChecked())
-//         return KCloneMode_MachineAndChildStates;
-//     else if (m_pAllRadio->isChecked())
-//         return KCloneMode_AllStates;
-//     return KCloneMode_MachineState;
-// }
-
-// void UIWizardCloneVMPage3::setCloneMode(KCloneMode cloneMode)
-// {
-//     switch (cloneMode)
-//     {
-//         case KCloneMode_MachineState: m_pMachineRadio->setChecked(true); break;
-//         case KCloneMode_MachineAndChildStates: m_pMachineAndChildsRadio->setChecked(true); break;
-//         case KCloneMode_AllStates: m_pAllRadio->setChecked(true); break;
-//         case KCloneMode_Max: break; /* Shut up, MSC! */
-//     }
-// }
 
 UIWizardCloneVMPageBasic3::UIWizardCloneVMPageBasic3(bool fShowChildsOption)
@@ -113 +88 @@
                           .arg(strOpt1)
                           .arg(strOpt3));
-
-    // m_pMachineRadio->setText(UIWizardCloneVM::tr("Current &machine state"));
-    // m_pMachineAndChildsRadio->setText(UIWizardCloneVM::tr("Current &snapshot tree branch"));
-    // m_pAllRadio->setText(UIWizardCloneVM::tr("&Everything"));
 }
 
 void UIWizardCloneVMPageBasic3::initializePage()
 {
-
     if (m_pCloneModeGroupBox && !m_userModifiedParameters.contains("CloneMode"))
         cloneVMWizardPropertySet(CloneMode, m_pCloneModeGroupBox->cloneMode());
@@ -130 +100 @@
 bool UIWizardCloneVMPageBasic3::validatePage()
 {
-    /* Initial result: */
     bool fResult = true;
 
-    // /* Lock finish button: */
-    // startProcessing();
+    UIWizardCloneVM *pWizard = qobject_cast<UIWizardCloneVM*>(wizard());
+    AssertReturn(pWizard, false);
+    /* Try to clone VM: */
+    fResult = pWizard->cloneVM();
 
-    /* Try to clone VM: */
-    // if (fResult)
-    //     fResult = qobject_cast<UIWizardCloneVM*>(wizard())->cloneVM();
-
-    // /* Unlock finish button: */
-    // endProcessing();
-
-    /* Return result: */
     return fResult;
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic3.h

@@ -32 +32 @@
 
 /* Forward declaration: */
-class QRadioButton;
 class QIRichTextLabel;
 class UICloneVMCloneModeGroupBox;