Changeset 99207 in vbox for trunk/src/VBox

Timestamp:

Mar 29, 2023 12:07:11 PM (22 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6669: VirtualBox Manager: Move New VM wizard onto non-modal rails.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UIVirtualBoxManager.cpp (modified) (5 diffs)
• manager/UIVirtualBoxManager.h (modified) (2 diffs)
• manager/tools/UIToolsModel.cpp (modified) (1 diff)
• widgets/UIToolBox.cpp (modified) (1 diff)
• wizards/editors/UIHostnameDomainNameEditor.cpp (modified) (1 diff)
• wizards/editors/UIUserNamePasswordEditor.cpp (modified) (1 diff)
• wizards/editors/UIWizardDiskEditors.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVM.cpp (modified) (4 diffs)
• wizards/newvm/UIWizardNewVM.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -987 +987 @@
         switch (enmType)
         {
+            case WizardType_NewVM:
+                m_wizards[enmType] = new UIWizardNewVM(this, actionPool(), m_pWidget->fullGroupName(), m_strISOFilePath);
+                break;
             case WizardType_ExportAppliance:
                 m_wizards[enmType] = new UIWizardExportApp(this, m_names, m_fExportToOCI);
@@ -1016 +1019 @@
 void UIVirtualBoxManager::sltCloseWizard(WizardType enmType)
 {
+    /* Postprocess wizard if still exists: */
+    if (m_wizards.contains(enmType))
+    {
+        switch (enmType)
+        {
+            case WizardType_NewVM:
+            {
+                UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(m_wizards.value(enmType));
+                if (pWizard->isUnattendedEnabled())
+                    startUnattendedInstall(pWizard->installer(),
+                                           pWizard->startHeadless(),
+                                           pWizard->createdMachineId().toString());
+                break;
+            }
+            default:
+                break;
+        }
+    }
+
+    /* Cleanup instance: */
     delete m_wizards.take(enmType);
 }
@@ -2586 +2609 @@
 void UIVirtualBoxManager::openNewMachineWizard(const QString &strISOFilePath /* = QString() */)
 {
-    /* Lock the actions preventing cascade calls: */
-    UIQObjectPropertySetter guardBlock(QList<QObject*>() << actionPool()->action(UIActionIndexMN_M_Welcome_S_New)
-                                                         << actionPool()->action(UIActionIndexMN_M_Machine_S_New)
-                                                         << actionPool()->action(UIActionIndexMN_M_Group_S_New),
-                                       "opened", true);
-    connect(&guardBlock, &UIQObjectPropertySetter::sigAboutToBeDestroyed,
-            this, &UIVirtualBoxManager::sltHandleUpdateActionAppearanceRequest);
-    updateActionsAppearance();
-
-    CUnattended comUnattendedInstaller = uiCommon().virtualBox().CreateUnattendedInstaller();
-    AssertMsg(!comUnattendedInstaller.isNull(), ("Could not create unattended installer!\n"));
-
-    /* Use the "safe way" to open stack of Mac OS X Sheets: */
-    QWidget *pWizardParent = windowManager().realParentWindow(this);
-    UISafePointerWizardNewVM pWizard = new UIWizardNewVM(pWizardParent, actionPool(),
-                                                         m_pWidget->fullGroupName(),
-                                                         comUnattendedInstaller, strISOFilePath);
-    windowManager().registerNewParent(pWizard, pWizardParent);
-
-    /* Execute wizard: */
-    pWizard->exec();
-
-    bool fStartHeadless = pWizard->startHeadless();
-    bool fUnattendedEnabled = pWizard->isUnattendedEnabled();
-    QString strMachineId = pWizard->createdMachineId().toString();
-    delete pWizard;
-    /* Handle unattended install stuff: */
-    if (fUnattendedEnabled)
-        startUnattendedInstall(comUnattendedInstaller, fStartHeadless, strMachineId);
+    /* Configure wizard variables: */
+    m_strISOFilePath = strISOFilePath;
+
+    /* Open New VM Wizard: */
+    sltOpenWizard(WizardType_NewVM);
 }
 
@@ -2683 +2682 @@
 }
 
-void UIVirtualBoxManager::startUnattendedInstall(CUnattended &comUnattendedInstaller,
+void UIVirtualBoxManager::startUnattendedInstall(const CUnattended &comUnattendedRef,
                                                  bool fStartHeadless, const QString &strMachineId)
 {
@@ -2691 +2690 @@
         return;
 
-    comUnattendedInstaller.Prepare();
-    AssertReturnVoid(checkUnattendedInstallError(comUnattendedInstaller));
-    comUnattendedInstaller.ConstructMedia();
-    AssertReturnVoid(checkUnattendedInstallError(comUnattendedInstaller));
-    comUnattendedInstaller.ReconfigureVM();
-    AssertReturnVoid(checkUnattendedInstallError(comUnattendedInstaller));
+    CUnattended comUnattended = comUnattendedRef;
+    comUnattended.Prepare();
+    AssertReturnVoid(checkUnattendedInstallError(comUnattended));
+    comUnattended.ConstructMedia();
+    AssertReturnVoid(checkUnattendedInstallError(comUnattended));
+    comUnattended.ReconfigureVM();
+    AssertReturnVoid(checkUnattendedInstallError(comUnattended));
 
     launchMachine(comMachine, fStartHeadless ? UILaunchMode_Headless : UILaunchMode_Default);

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h

@@ -411 +411 @@
 
         /** Creates an unattended installer and uses it to install guest os to newly created vm. */
-        void startUnattendedInstall(CUnattended &comUnattendedInstaller, bool fStartHeadless, const QString &strMachineId);
+        void startUnattendedInstall(const CUnattended &comUnattended, bool fStartHeadless, const QString &strMachineId);
 
         /** Launches or shows virtual machines represented by passed @a items in corresponding @a enmLaunchMode (for launch). */
@@ -522 +522 @@
     int  m_iGeometrySaveTimerId;
 
+    /** Holds the ISO file path used by new VM wizard. */
+    QString  m_strISOFilePath;
+
     /** Holds whether OCI importing should be started by default. */
     bool     m_fImportFromOCI;

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp

@@ -50 +50 @@
 #include "UIVirtualBoxManagerWidget.h"
 #include "UIVirtualBoxEventHandler.h"
-#include "UIWizardNewVM.h"
 
 /* COM includes: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBox.cpp

@@ -39 +39 @@
 #include "UIIconPool.h"
 #include "UIToolBox.h"
-#include "UIWizardNewVM.h"
 
 

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

@@ -41 +41 @@
 #include "UIIconPool.h"
 #include "UIHostnameDomainNameEditor.h"
-#include "UIWizardNewVM.h"
-
 
 

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

@@ -39 +39 @@
 #include "UIIconPool.h"
 #include "UIUserNamePasswordEditor.h"
-#include "UIWizardNewVM.h"
+
+/* Other VBox includes: */
+#include "iprt/assert.h"
 
 

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

@@ -47 +47 @@
 #include "UIUserNamePasswordEditor.h"
 #include "UIWizardDiskEditors.h"
-#include "UIWizardNewVM.h"
 #include "UIWizardNewVMDiskPage.h"
 

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

@@ -52 +52 @@
 #include "CUSBController.h"
 #include "CUSBDeviceFilters.h"
-#include "CUnattended.h"
 
 /* Namespaces: */
@@ -61 +60 @@
                              UIActionPool *pActionPool,
                              const QString &strMachineGroup,
-                             CUnattended &comUnattended,
                              const QString &strISOFilePath /* = QString() */)
     : UINativeWizard(pParent, WizardType_NewVM, WizardMode_Auto, "create-vm-wizard" /* help keyword */)
@@ -82 +80 @@
     , m_fEmptyDiskRecommended(false)
     , m_pActionPool(pActionPool)
-    , m_comUnattended(comUnattended)
     , m_fStartHeadless(false)
     , m_strInitialISOFilePath(strISOFilePath)
@@ -97 +94 @@
 
     connect(this, &UIWizardNewVM::rejected, this, &UIWizardNewVM::sltHandleWizardCancel);
+
+    /* Create installer: */
+    m_comUnattended = uiCommon().virtualBox().CreateUnattendedInstaller();
+    AssertMsg(!m_comUnattended.isNull(), ("Could not create unattended installer!\n"));
 }
 

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

@@ -41 +41 @@
 #include "CMediumFormat.h"
 #include "CGuestOSType.h"
+#include "CUnattended.h"
 
 /* Forward declarations: */
@@ -63 +64 @@
                   UIActionPool *pActionPool,
                   const QString &strMachineGroup,
-                  CUnattended &comUnattended,
                   const QString &strISOFilePath = QString());
 
@@ -79 +79 @@
     const QString &machineGroup() const;
     QUuid createdMachineId() const;
+
+    CUnattended installer() const { return m_comUnattended; }
 
     /** @name Setter/getters for vm parameters
@@ -237 +239 @@
        QVector<KMediumVariant> m_mediumVariants;
        UIActionPool *m_pActionPool;
-       CUnattended &m_comUnattended;
+       CUnattended m_comUnattended;
        bool m_fStartHeadless;
        QString m_strInitialISOFilePath;