Changeset 90620 in vbox

Timestamp:

Aug 11, 2021 7:51:02 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Fixing 2nd page's validation function.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• networking/UIUpdateManager.cpp (modified) (1 diff)
• wizards/clonevm/UIWizardCloneVM.h (modified) (1 diff)
• wizards/clonevm/UIWizardCloneVMPageBasic2.cpp (modified) (1 diff)
• wizards/editors/UIWizardCloneVMEditors.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/networking/UIUpdateManager.cpp

@@ -95 +95 @@
     if (UINotificationNewVersionCheckerVirtualBox::exists())
     {
-        // @todo show notification-center
+        /// @todo show notification-center
         emit sigStepFinished();
         return;

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

@@ -44 +44 @@
     void setCloneModePageVisible(bool fIsFullClone);
     bool isCloneModePageVisible() const;
+    /* CLone VM stuff: */
+    bool cloneVM();
 
 protected:
 
-    /* CLone VM stuff: */
-    bool cloneVM();
     virtual void populatePages() /* final override */;
 

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

@@ -108 +108 @@
 bool UIWizardCloneVMPageBasic2::validatePage()
 {
+    UIWizardCloneVM *pWizard = qobject_cast<UIWizardCloneVM*>(wizard());
+    AssertReturn(pWizard, false);
+
     /* This page could be final: */
-    // if (isFinalPage())
-    // {
-    //     /* Initial result: */
-    //     bool fResult = true;
+    if (!pWizard->isCloneModePageVisible())
+    {
+        /* Initial result: */
+        bool fResult = true;
 
-    //     /* Lock finish button: */
-    //     startProcessing();
+        /* Trying to clone VM: */
+        fResult = pWizard->cloneVM();
 
-    //     /* Trying to clone VM: */
-    //     if (fResult)
-    //         fResult = qobject_cast<UIWizardCloneVM*>(wizard())->cloneVM();
-
-    //     /* Unlock finish button: */
-    //     endProcessing();
-
-    //     /* Return result: */
-    //     return fResult;
-    // }
-    // else
+        /* Return result: */
+        return fResult;
+    }
+    else
         return true;
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardCloneVMEditors.cpp

@@ -50 +50 @@
 
 /*********************************************************************************************************************************
- *   UICloneVMNamePathEditor implementation.                                                                                      *
- *********************************************************************************************************************************/
+*   UICloneVMNamePathEditor implementation.                                                                                      *
+*********************************************************************************************************************************/
 
 UICloneVMNamePathEditor::UICloneVMNamePathEditor(const QString &strOriginalName, const QString &strDefaultPath, QWidget *pParent /* = 0 */)
@@ -131 +131 @@
 
 /*********************************************************************************************************************************
- *   UICloneVMAdditionalOptionsEditor implementation.                                                                             *
- *********************************************************************************************************************************/
+*   UICloneVMAdditionalOptionsEditor implementation.                                                                             *
+*********************************************************************************************************************************/
 
 
@@ -306 +306 @@
 }
 
+
 /*********************************************************************************************************************************
- *   UICloneVMAdditionalOptionsEditor implementation.                                                                             *
- *********************************************************************************************************************************/
+*   UICloneVMAdditionalOptionsEditor implementation.                                                                             *
+*********************************************************************************************************************************/
 
 UICloneVMCloneTypeGroupBox::UICloneVMCloneTypeGroupBox(QWidget *pParent /* = 0 */)
@@ -374 +375 @@
 }
 
+
 /*********************************************************************************************************************************
- *   UICloneVMAdditionalOptionsEditor implementation.                                                                             *
- *********************************************************************************************************************************/
+*   UICloneVMAdditionalOptionsEditor implementation.                                                                             *
+*********************************************************************************************************************************/
 
 UICloneVMCloneModeGroupBox::UICloneVMCloneModeGroupBox(bool fShowChildsOption, QWidget *pParent /* = 0 */)