Changeset 99200 in vbox for trunk/src/VBox

Timestamp:

Mar 28, 2023 3:33:06 PM (22 months ago)

Author:

vboxsync

Message:

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

Location:

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

Files:

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

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

@@ -470 +470 @@
     , m_pWidget(0)
     , m_iGeometrySaveTimerId(-1)
+    , m_fImportFromOCI(false)
 {
     s_pInstance = this;
@@ -710 +711 @@
             {
                 /* Allow only one file at the time: */
-                sltOpenImportApplianceWizard(strFile);
+                openImportApplianceWizard(strFile);
                 break;
             }
@@ -924 +925 @@
 }
 
-void UIVirtualBoxManager::sltOpenImportApplianceWizard(const QString &strFileName /* = QString() */)
-{
-    /* Initialize variables: */
-#ifdef VBOX_WS_MAC
-    QString strTmpFile = ::darwinResolveAlias(strFileName);
-#else
-    QString strTmpFile = strFileName;
-#endif
-
-    /* If there is no file-name passed,
-     * check if cloud stuff focused currently: */
-    bool fOCIByDefault = false;
-    if (   strTmpFile.isEmpty()
-        && (   m_pWidget->isSingleCloudProviderGroupSelected()
-            || m_pWidget->isSingleCloudProfileGroupSelected()
-            || m_pWidget->isCloudMachineItemSelected()))
-    {
-        /* We can generate cloud hints as well: */
-        fOCIByDefault = true;
-        strTmpFile = m_pWidget->fullGroupName();
-    }
-
-    /* Lock the action preventing cascade calls: */
-    UIQObjectPropertySetter guardBlock(actionPool()->action(UIActionIndexMN_M_File_S_ImportAppliance), "opened", true);
-    connect(&guardBlock, &UIQObjectPropertySetter::sigAboutToBeDestroyed,
-            this, &UIVirtualBoxManager::sltHandleUpdateActionAppearanceRequest);
-    updateActionsAppearance();
-
-    /* Use the "safe way" to open stack of Mac OS X Sheets: */
-    QWidget *pWizardParent = windowManager().realParentWindow(this);
-    UINativeWizardPointer pWizard = new UIWizardImportApp(pWizardParent, fOCIByDefault, strTmpFile);
-    windowManager().registerNewParent(pWizard, pWizardParent);
-    pWizard->exec();
-    delete pWizard;
-}
-
 void UIVirtualBoxManager::sltOpenExportApplianceWizard()
 {
@@ -1036 +1001 @@
         switch (enmType)
         {
+            case WizardType_ImportAppliance:
+                m_wizards[enmType] = new UIWizardImportApp(this, m_fImportFromOCI, m_strFileName);
+                break;
             case WizardType_NewCloudVM:
                 m_wizards[enmType] = new UIWizardNewCloudVM(this, m_pWidget->fullGroupName());
@@ -2660 +2628 @@
 }
 
+void UIVirtualBoxManager::openImportApplianceWizard(const QString &strFileName /* = QString() */)
+{
+    /* Configure wizard variables: */
+    m_fImportFromOCI = false;
+#ifdef VBOX_WS_MAC
+    m_strFileName = ::darwinResolveAlias(strFileName);
+#else
+    m_strFileName = strFileName;
+#endif
+
+    /* If there is no file-name passed,
+     * check if cloud stuff focused currently: */
+    if (   m_strFileName.isEmpty()
+        && (   m_pWidget->isSingleCloudProviderGroupSelected()
+            || m_pWidget->isSingleCloudProfileGroupSelected()
+            || m_pWidget->isCloudMachineItemSelected()))
+    {
+        m_fImportFromOCI = true;
+        /* We can generate cloud hints as well: */
+        m_strFileName = m_pWidget->fullGroupName();
+    }
+
+    /* Open Import Appliance Wizard: */
+    sltOpenWizard(WizardType_ImportAppliance);
+}
+
 /* static */
 void UIVirtualBoxManager::launchMachine(CMachine &comMachine,

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

@@ -186 +186 @@
         void sltCloseManagerWindowDefault() { sltCloseManagerWindow(); }
 
-        /** Handles call to open Import Appliance wizard.
-          * @param strFileName can bring the name of file to import appliance from. */
-        void sltOpenImportApplianceWizard(const QString &strFileName = QString());
         /** Handles call to open Import Appliance wizard the default way. */
-        void sltOpenImportApplianceWizardDefault() { sltOpenImportApplianceWizard(); }
+        void sltOpenImportApplianceWizardDefault() { openImportApplianceWizard(); }
         /** Handles call to open Export Appliance wizard. */
         void sltOpenExportApplianceWizard();
@@ -403 +400 @@
         /** Opens new machine dialog specifying initial name with @a strFileName. */
         void openNewMachineWizard(const QString &strISOFilePath = QString());
+
+        /** Opens Import Appliance wizard.
+          * @param strFileName can bring the name of file to import appliance from. */
+        void openImportApplianceWizard(const QString &strFileName = QString());
+
         /** Launches certain @a comMachine in specified @a enmLaunchMode. */
         static void launchMachine(CMachine &comMachine, UILaunchMode enmLaunchMode = UILaunchMode_Default);
@@ -518 +520 @@
 
     /** Holds the geometry save timer ID. */
-    int  m_iGeometrySaveTimerId;
+    int      m_iGeometrySaveTimerId;
+    /** Holds whether OCI importing should be started by default. */
+    bool     m_fImportFromOCI;
+    /** Holds the file-name used by import wizard. */
+    QString  m_strFileName;
 };