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

Timestamp:

Mar 28, 2023 2:22:37 PM (22 months ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp (modified) (4 diffs)

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

@@ -1039 +1039 @@
                 m_wizards[enmType] = new UIWizardNewCloudVM(this, m_pWidget->fullGroupName());
                 break;
+            case WizardType_AddCloudVM:
+                m_wizards[enmType] = new UIWizardAddCloudVM(this, m_pWidget->fullGroupName());
+                break;
             default:
                 break;
@@ -1075 +1078 @@
 void UIVirtualBoxManager::sltOpenAddMachineDialog()
 {
-    /* Lock the actions preventing cascade calls: */
-    UIQObjectPropertySetter guardBlock(QList<QObject*>() << actionPool()->action(UIActionIndexMN_M_Welcome_S_Add)
-                                                         << actionPool()->action(UIActionIndexMN_M_Machine_S_Add)
-                                                         << actionPool()->action(UIActionIndexMN_M_Group_S_Add),
-                                       "opened", true);
-    connect(&guardBlock, &UIQObjectPropertySetter::sigAboutToBeDestroyed,
-            this, &UIVirtualBoxManager::sltHandleUpdateActionAppearanceRequest);
-    updateActionsAppearance();
-
     /* Get first selected item: */
     UIVirtualMachineItem *pItem = currentItem();
@@ -1090 +1084 @@
     if (   !pItem
         || pItem->itemType() == UIVirtualMachineItemType_Local)
-    {
-        /* Open add machine dialog: */
         openAddMachineDialog();
-    }
     /* For cloud machine: */
     else
-    {
-        /* Use the "safe way" to open stack of Mac OS X Sheets: */
-        QWidget *pWizardParent = windowManager().realParentWindow(this);
-        UISafePointerWizardAddCloudVM pWizard = new UIWizardAddCloudVM(pWizardParent, m_pWidget->fullGroupName());
-        windowManager().registerNewParent(pWizard, pWizardParent);
-
-        /* Execute wizard: */
-        pWizard->exec();
-        delete pWizard;
-    }
+        sltOpenWizard(WizardType_AddCloudVM);
 }
 
@@ -2581 +2563 @@
 void UIVirtualBoxManager::openAddMachineDialog(const QString &strFileName /* = QString() */)
 {
+    /* Lock the actions preventing cascade calls: */
+    UIQObjectPropertySetter guardBlock(QList<QObject*>() << actionPool()->action(UIActionIndexMN_M_Welcome_S_Add)
+                                                         << actionPool()->action(UIActionIndexMN_M_Machine_S_Add)
+                                                         << actionPool()->action(UIActionIndexMN_M_Group_S_Add),
+                                       "opened", true);
+    connect(&guardBlock, &UIQObjectPropertySetter::sigAboutToBeDestroyed,
+            this, &UIVirtualBoxManager::sltHandleUpdateActionAppearanceRequest);
+    updateActionsAppearance();
+
     /* Initialize variables: */
 #ifdef VBOX_WS_MAC