Changeset 90334 in vbox for trunk/src

Timestamp:

Jul 26, 2021 1:07:24 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Notification signature for final Import Appliance wizard progress which should now go to center instead of modal dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationObjects.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (2 diffs)
• widgets/UIApplianceImportEditorWidget.cpp (modified) (3 diffs)
• wizards/importappliance/UIWizardImportApp.cpp (modified) (2 diffs)

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

@@ -286 +286 @@
         emit sigCloudMachineCreated(m_strShortProviderName, m_strProfileName, m_comMachine);
 }
+
+
+/*********************************************************************************************************************************
+*   Class UINotificationProgressApplianceImport implementation.                                                                  *
+*********************************************************************************************************************************/
+
+UINotificationProgressApplianceImport::UINotificationProgressApplianceImport(const CAppliance &comAppliance,
+                                                                             const QVector<KImportOptions> &options)
+    : m_comAppliance(comAppliance)
+    , m_options(options)
+{
+}
+
+QString UINotificationProgressApplianceImport::name() const
+{
+    return UINotificationProgress::tr("Importing appliance ...");
+}
+
+QString UINotificationProgressApplianceImport::details() const
+{
+    return UINotificationProgress::tr("<b>From:</b> %1").arg(m_comAppliance.GetPath());
+}
+
+CProgress UINotificationProgressApplianceImport::createProgress(COMResult &comResult)
+{
+    /* Initialize progress-wrapper: */
+    CProgress comProgress = m_comAppliance.ImportMachines(m_options);
+    /* Store COM result: */
+    comResult = m_comAppliance;
+    /* Return progress-wrapper: */
+    return comProgress;
+}

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

@@ -27 +27 @@
 /* COM includes: */
 #include "COMEnums.h"
+#include "CAppliance.h"
 #include "CCloudClient.h"
 #include "CCloudMachine.h"
@@ -317 +318 @@
 };
 
+/** UINotificationProgress extension for import appliance functionality. */
+class SHARED_LIBRARY_STUFF UINotificationProgressApplianceImport : public UINotificationProgress
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs import appliance notification-progress.
+      * @param  comAppliance  Brings the appliance being imported.
+      * @param  options       Brings the import options to be taken into account. */
+    UINotificationProgressApplianceImport(const CAppliance &comAppliance,
+                                          const QVector<KImportOptions> &options);
+
+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 medium being moved. */
+    CAppliance               m_comAppliance;
+    /** Holds the initial location. */
+    QVector<KImportOptions>  m_options;
+};
+
 #endif /* !FEQT_INCLUDED_SRC_notificationcenter_UINotificationObjects_h */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp

@@ -26 +26 @@
 #include "QITreeView.h"
 #include "UIApplianceImportEditorWidget.h"
+#include "UICommon.h"
 #include "UIFilePathSelector.h"
 #include "UIMessageCenter.h"
+#include "UINotificationCenter.h"
 #include "UIWizardImportApp.h"
-#include "UICommon.h"
 
 /* COM includes: */
@@ -248 +249 @@
     if (m_pAppliance)
     {
-        /* Start the import asynchronously */
-        CProgress progress;
+        /* Configure appliance importing: */
         QVector<KImportOptions> options;
         if (m_pMACComboBox)
@@ -266 +266 @@
             }
         }
-
         if (m_pImportHDsAsVDI->isChecked())
             options.append(KImportOptions_ImportToVDI);
-        progress = m_pAppliance->ImportMachines(options);
-        bool fResult = m_pAppliance->isOk();
-        if (fResult)
-        {
-            /* Show some progress, so the user know whats going on */
-            msgCenter().showModalProgressDialog(progress, tr("Importing Appliance ..."), ":/progress_import_90px.png", this);
-            if (progress.GetCanceled())
-                return false;
-            if (!progress.isOk() || progress.GetResultCode() != 0)
-            {
-                msgCenter().cannotImportAppliance(progress, m_pAppliance->GetPath(), this);
-                return false;
-            }
-            else
-                return true;
-        }
-        if (!fResult)
-            msgCenter().cannotImportAppliance(*m_pAppliance, this);
+
+        /* Import appliance: */
+        UINotificationProgressApplianceImport *pNotification = new UINotificationProgressApplianceImport(*m_pAppliance,
+                                                                                                         options);
+        notificationCenter().append(pNotification);
+
+        /* Positive: */
+        return true;
     }
     return false;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportApp.cpp

@@ -31 +31 @@
 #include "UICommon.h"
 #include "UIMessageCenter.h"
+#include "UINotificationCenter.h"
 #include "UIWizardImportApp.h"
 #include "UIWizardImportAppPageBasic1.h"
@@ -209 +210 @@
         QVector<KImportOptions> options;
 
-        /* Initiate import porocedure: */
-        CProgress comProgress = comAppliance.ImportMachines(options);
-
-        /* Show error message if necessary: */
-        if (!comAppliance.isOk())
-            msgCenter().cannotImportAppliance(comAppliance, this);
-        else
-        {
-            /* Show "Import appliance" progress: */
-            msgCenter().showModalProgressDialog(comProgress, tr("Importing Appliance ..."), ":/progress_import_90px.png", this, 0);
-            if (!comProgress.GetCanceled())
-            {
-                /* Show error message if necessary: */
-                if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                    msgCenter().cannotImportAppliance(comProgress, comAppliance.GetPath(), this);
-                else
-                    return true;
-            }
-        }
-
-        /* Failure by default: */
-        return false;
+        /* Import appliance: */
+        UINotificationProgressApplianceImport *pNotification = new UINotificationProgressApplianceImport(comAppliance,
+                                                                                                         options);
+        notificationCenter().append(pNotification);
+
+        /* Positive: */
+        return true;
     }
     else