Changeset 99195 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 28, 2023 11:57:02 AM (22 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6669: VirtualBox Manager: Move New Cloud VM wizard onto non-modal rails; There is still work to do, but after all remaining wizards became non-modal as well.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• UIVirtualBoxManager.cpp (modified) (2 diffs)
• UIVirtualBoxManager.h (modified) (3 diffs)

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

@@ -1029 +1029 @@
 }
 
+void UIVirtualBoxManager::sltOpenWizard(WizardType enmType)
+{
+    /* Create instance if not yet created: */
+    if (!m_wizards.contains(enmType))
+    {
+        switch (enmType)
+        {
+            case WizardType_NewCloudVM:
+                m_wizards[enmType] = new UIWizardNewCloudVM(this, m_pWidget->fullGroupName());
+                break;
+            default:
+                break;
+        }
+
+        connect(m_wizards.value(enmType), &UINativeWizard::sigClose,
+                this, &UIVirtualBoxManager::sltCloseWizard);
+    }
+
+    /* Expose instance: */
+    m_wizards.value(enmType)->show();
+    m_wizards.value(enmType)->setWindowState(m_wizards.value(enmType)->windowState() & ~Qt::WindowMinimized);
+    m_wizards.value(enmType)->activateWindow();
+    m_wizards.value(enmType)->raise();
+}
+
+void UIVirtualBoxManager::sltCloseWizard(WizardType enmType)
+{
+    delete m_wizards.take(enmType);
+}
+
 void UIVirtualBoxManager::sltOpenNewMachineWizard()
 {
-    openNewMachineWizard();
+    /* Get first selected item: */
+    UIVirtualMachineItem *pItem = currentItem();
+
+    /* For global item or local machine: */
+    if (   !pItem
+        || pItem->itemType() == UIVirtualMachineItemType_Local)
+        openNewMachineWizard();
+    /* For cloud machine: */
+    else
+        sltOpenWizard(WizardType_NewCloudVM);
 }
 
@@ -2608 +2647 @@
     updateActionsAppearance();
 
-    /* Get first selected item: */
-    UIVirtualMachineItem *pItem = currentItem();
-
-    /* For global item or local machine: */
-    if (   !pItem
-        || pItem->itemType() == UIVirtualMachineItemType_Local)
-    {
-        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);
-    }
-    /* For cloud machine: */
-    else
-    {
-        /* Use the "safe way" to open stack of Mac OS X Sheets: */
-        QWidget *pWizardParent = windowManager().realParentWindow(this);
-        UISafePointerWizardNewCloudVM pWizard = new UIWizardNewCloudVM(pWizardParent, m_pWidget->fullGroupName());
-        windowManager().registerNewParent(pWizard, pWizardParent);
-
-        /* Execute wizard: */
-        pWizard->exec();
-        delete pWizard;
-    }
+    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);
 }
 

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

@@ -49 +49 @@
 class UIAction;
 class UIActionPool;
+class UINativeWizard;
 struct UIUnattendedInstallData;
 class UIVirtualBoxManagerWidget;
@@ -209 +210 @@
     /** @name Machine menu stuff.
       * @{ */
+        /** Handles call to open wizard of specified @a enmType. */
+        void sltOpenWizard(WizardType enmType);
+        /** Handles call to close wizard of specified @a enmType. */
+        void sltCloseWizard(WizardType enmType);
+
         /** Handles call to open new machine wizard. */
         void sltOpenNewMachineWizard();
@@ -502 +508 @@
     UISafePointerCloudMachineSettingsDialog                m_pCloudSettings;
 
+    /** Holds the map of various wizards. */
+    QMap<WizardType, UINativeWizard*>  m_wizards;
+
     /** Holds the instance of UIVMLogViewerDialog. */
     QIManagerDialog *m_pLogViewerDialog;