Changeset 77592 in vbox

Timestamp:

Mar 7, 2019 8:46:46 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6769. cleaning the created folder correctly as the wizard is cancelled.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm

Files:

• UIWizardNewVM.cpp (modified) (2 diffs)
• UIWizardNewVM.h (modified) (2 diffs)
• UIWizardNewVMPageBasic1.cpp (modified) (2 diffs)
• UIWizardNewVMPageBasic1.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -56 +56 @@
     /* Register classes: */
     qRegisterMetaType<CGuestOSType>();
+
+    connect(this, &UIWizardNewVM::rejected, this, &UIWizardNewVM::sltHandleWizardCancel);
 }
 
@@ -326 +328 @@
 }
 
+void UIWizardNewVM::sltHandleWizardCancel()
+{
+    switch (mode())
+    {
+        case WizardMode_Basic:
+        {
+            UIWizardNewVMPageBasic1 *pPage1 = qobject_cast<UIWizardNewVMPageBasic1*> (page(Page1));
+            if (pPage1)
+                pPage1->cleanupMachineFolder(true);
+            break;
+        }
+        case WizardMode_Expert:
+        {
+            UIWizardNewVMPageExpert *pPage = qobject_cast<UIWizardNewVMPageExpert*> (page(PageExpert));
+            if (pPage)
+                pPage->cleanupMachineFolder(true);
+            break;
+        }
+        default:
+            break;
+    }
+}
+
 void UIWizardNewVM::retranslateUi()
 {

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h

@@ -68 +68 @@
     friend class UIWizardNewVMPageExpert;
 
+private slots:
+
+    void sltHandleWizardCancel();
+
 private:
 
@@ -90 +94 @@
 
 #endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVM_h */
-

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp

@@ -245 +245 @@
     composeMachineFilePath();
 
-
     /* Check if the folder already exists and check if it has been created by this wizard */
     if (QDir(m_strMachineFolder).exists())
@@ -271 +270 @@
 }
 
-bool UIWizardNewVMPage1::cleanupMachineFolder()
+bool UIWizardNewVMPage1::cleanupMachineFolder(bool fWizardCancel /* = false */)
 {
     /* Make sure folder was previosly created: */
-    if (!m_strCreatedFolder.isEmpty() && m_strCreatedFolder != m_strMachineFolder)
+    if (m_strCreatedFolder.isEmpty())
+        return true;
+    /* Clean this folder if the machine folder has been changed by the user or we are cancelling the wizard: */
+    if (m_strCreatedFolder != m_strMachineFolder || fWizardCancel)
     {
         /* Try to cleanup folder (and it's predecessors): */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h

@@ -43 +43 @@
     bool createMachineFolder();
     /** Removes a previously created folder (if exists) before creating a new one.
-     *  used during page cleanup and new folder creation. */
-    bool cleanupMachineFolder();
+     *  used during page cleanup and new folder creation. Called upon page Next/Back and
+     *  wizard cancel */
+    bool cleanupMachineFolder(bool fWizardCancel = false);
 
     QString machineFilePath() const;
@@ -77 +78 @@
     bool m_fSupportsHWVirtEx;
     bool m_fSupportsLongMode;
+    friend class UIWizardNewVM;
 };