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

Timestamp:

Mar 28, 2023 3:55:12 PM (22 months ago)

Author:

vboxsync

Message:

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

Location:

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

Files:

• UIVirtualBoxManager.cpp (modified) (3 diffs)
• UIVirtualBoxManager.h (modified) (1 diff)

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

@@ -471 +471 @@
     , m_iGeometrySaveTimerId(-1)
     , m_fImportFromOCI(false)
+    , m_fExportToOCI(false)
 {
     s_pInstance = this;
@@ -927 +928 @@
 void UIVirtualBoxManager::sltOpenExportApplianceWizard()
 {
-    /* Get selected items: */
-    QList<UIVirtualMachineItem*> items = currentItems();
-
-    /* Populate the list of VM names: */
-    QStringList names;
-    for (int i = 0; i < items.size(); ++i)
-        names << items.at(i)->name();
-
-    /* Lock the actions preventing cascade calls: */
-    UIQObjectPropertySetter guardBlock(QList<QObject*>() << actionPool()->action(UIActionIndexMN_M_File_S_ExportAppliance)
-                                                         << actionPool()->action(UIActionIndexMN_M_Machine_S_ExportToOCI),
-                                       "opened", true);
-    connect(&guardBlock, &UIQObjectPropertySetter::sigAboutToBeDestroyed,
-            this, &UIVirtualBoxManager::sltHandleUpdateActionAppearanceRequest);
-    updateActionsAppearance();
-
     /* Check what was the action invoked us: */
     UIAction *pAction = qobject_cast<UIAction*>(sender());
 
-    /* Use the "safe way" to open stack of Mac OS X Sheets: */
-    QWidget *pWizardParent = windowManager().realParentWindow(this);
-    UINativeWizardPointer pWizard = new UIWizardExportApp(pWizardParent,
-                                                          names,
-                                                          pAction &&
-                                                          pAction == actionPool()->action(UIActionIndexMN_M_Machine_S_ExportToOCI));
-    windowManager().registerNewParent(pWizard, pWizardParent);
-    pWizard->exec();
-    delete pWizard;
+    /* Export to OCI action invokes wizard directly in OCI mode: */
+    m_fExportToOCI =    pAction
+                     && pAction == actionPool()->action(UIActionIndexMN_M_Machine_S_ExportToOCI);
+    /* Populate the list of VM names: */
+    m_names.clear();
+    foreach (UIVirtualMachineItem *pItem, currentItems())
+        m_names << pItem->name();
+
+    /* Open Export Appliance Wizard: */
+    sltOpenWizard(WizardType_ExportAppliance);
 }
 
@@ -1001 +987 @@
         switch (enmType)
         {
+            case WizardType_ExportAppliance:
+                m_wizards[enmType] = new UIWizardExportApp(this, m_names, m_fExportToOCI);
+                break;
             case WizardType_ImportAppliance:
                 m_wizards[enmType] = new UIWizardImportApp(this, m_fImportFromOCI, m_strFileName);

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

@@ -520 +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;
+
+    /** Holds whether OCI exporting should be started by default. */
+    bool         m_fExportToOCI;
+    /** Holds the list of VMs used by export wizard. */
+    QStringList  m_names;
 };