Changeset 90344 in vbox for trunk/src

Timestamp:

Jul 26, 2021 6:26:53 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

145908

Message:

FE/Qt: bugref:10067: Notification signature for final Export Appliance wizard progress which should now go to center instead of modal dialog; This code covers local exporting only for now, cloud exporting to go later.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationObjects.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (2 diffs)
• wizards/exportappliance/UIWizardExportApp.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -289 +289 @@
 
 /*********************************************************************************************************************************
+*   Class UINotificationProgressApplianceExport implementation.                                                                  *
+*********************************************************************************************************************************/
+
+UINotificationProgressApplianceExport::UINotificationProgressApplianceExport(const CAppliance &comAppliance,
+                                                                             const QString &strFormat,
+                                                                             const QVector<KExportOptions> &options,
+                                                                             const QString &strPath)
+    : m_comAppliance(comAppliance)
+    , m_strFormat(strFormat)
+    , m_options(options)
+    , m_strPath(strPath)
+{
+}
+
+QString UINotificationProgressApplianceExport::name() const
+{
+    return UINotificationProgress::tr("Exporting appliance ...");
+}
+
+QString UINotificationProgressApplianceExport::details() const
+{
+    return UINotificationProgress::tr("<b>To:</b> %1").arg(m_strPath);
+}
+
+CProgress UINotificationProgressApplianceExport::createProgress(COMResult &comResult)
+{
+    /* Initialize progress-wrapper: */
+    CProgress comProgress = m_comAppliance.Write(m_strFormat, m_options, m_strPath);
+    /* Store COM result: */
+    comResult = m_comAppliance;
+    /* Return progress-wrapper: */
+    return comProgress;
+}
+
+
+/*********************************************************************************************************************************
 *   Class UINotificationProgressApplianceImport implementation.                                                                  *
 *********************************************************************************************************************************/

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -318 +318 @@
 };
 
+/** UINotificationProgress extension for export appliance functionality. */
+class SHARED_LIBRARY_STUFF UINotificationProgressApplianceExport : public UINotificationProgress
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs export appliance notification-progress.
+      * @param  comAppliance  Brings the appliance being exported.
+      * @param  strFormat     Brings the appliance format.
+      * @param  options       Brings the export options to be taken into account.
+      * @param  strPath       Brings the appliance path. */
+    UINotificationProgressApplianceExport(const CAppliance &comAppliance,
+                                          const QString &strFormat,
+                                          const QVector<KExportOptions> &options,
+                                          const QString &strPath);
+
+protected:
+
+    /** Returns object name. */
+    virtual QString name() const /* override final */;
+    /** Returns object details. */
+    virtual QString details() const /* override final */;
+    /** Creates and returns started progress-wrapper. */
+    virtual CProgress createProgress(COMResult &comResult) /* override final */;
+
+private:
+
+    /** Holds the appliance being exported. */
+    CAppliance               m_comAppliance;
+    /** Holds the appliance format. */
+    QString                  m_strFormat;
+    /** Holds the export options to be taken into account. */
+    QVector<KExportOptions>  m_options;
+    /** Holds the appliance path. */
+    QString                  m_strPath;
+};
+
 /** UINotificationProgress extension for import appliance functionality. */
 class SHARED_LIBRARY_STUFF UINotificationProgressApplianceImport : public UINotificationProgress
@@ -342 +380 @@
 private:
 
-    /** Holds the medium being moved. */
+    /** Holds the appliance being imported. */
     CAppliance               m_comAppliance;
-    /** Holds the initial location. */
+    /** Holds the import options to be taken into account. */
     QVector<KImportOptions>  m_options;
 };

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp

@@ -25 +25 @@
 #include "UIMessageCenter.h"
 #include "UIModalWindowManager.h"
+#include "UINotificationCenter.h"
 #include "UIWizardExportApp.h"
 #include "UIWizardExportAppDefs.h"
@@ -349 +350 @@
             if (iWizardResult == QDialog::Rejected)
                 break;
-        }
-
-        /* Prepare Export VM progress: */
-        CProgress comProgress = comAppliance.Write(field("format").toString(), options, uri());
-        if (!comAppliance.isOk())
-        {
-            msgCenter().cannotExportAppliance(comAppliance, this);
-            break;
-        }
-
-        /* Show Export VM progress: */
-        msgCenter().showModalProgressDialog(comProgress, QApplication::translate("UIWizardExportApp", "Exporting Appliance ..."),
-                                            ":/progress_export_90px.png", this);
-        if (comProgress.GetCanceled())
-            break;
-        if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-        {
-            msgCenter().cannotExportAppliance(comProgress, comAppliance.GetPath(), this);
-            break;
-        }
-
-        /* Is this VM being exported to cloud? */
-        if (field("isFormatCloudOne").toBool())
-        {
+
+            /* Prepare Export VM progress: */
+            CProgress comProgress = comAppliance.Write(field("format").toString(), options, uri());
+            if (!comAppliance.isOk())
+            {
+                msgCenter().cannotExportAppliance(comAppliance, this);
+                break;
+            }
+
+            /* Show Export VM progress: */
+            msgCenter().showModalProgressDialog(comProgress, QApplication::translate("UIWizardExportApp", "Exporting Appliance ..."),
+                                                ":/progress_export_90px.png", this);
+            if (comProgress.GetCanceled())
+                break;
+            if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
+            {
+                msgCenter().cannotExportAppliance(comProgress, comAppliance.GetPath(), this);
+                break;
+            }
+
             /* We can have wizard and it's result
              * should be distinguishable: */
-            int iWizardResult = -1;
+            iWizardResult = -1;
 
             switch (field("cloudExportMode").value<CloudExportMode>())
@@ -410 +407 @@
                 break;
         }
+        /* Is this VM being exported locally? */
+        else
+        {
+            /* Export appliance: */
+            UINotificationProgressApplianceExport *pNotification = new UINotificationProgressApplianceExport(comAppliance,
+                                                                                                             field("format").toString(),
+                                                                                                             options,
+                                                                                                             uri());
+            notificationCenter().append(pNotification);
+        }
 
         /* Success finally: */