Changeset 91966 in vbox

Timestamp:

Oct 21, 2021 3:44:49 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: UIWizardImportApp: Migrate intermediate progress related to appliance reading to notification-center.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationObjects.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)
• wizards/importappliance/UIWizardImportAppPageSource.cpp (modified) (7 diffs)
• wizards/importappliance/UIWizardImportAppPageSource.h (modified) (1 diff)

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

@@ -2821 +2821 @@
 
 /*********************************************************************************************************************************
+*   Class UINotificationProgressApplianceRead implementation.                                                                    *
+*********************************************************************************************************************************/
+
+UINotificationProgressApplianceRead::UINotificationProgressApplianceRead(const CAppliance &comAppliance,
+                                                                         const QString &strPath)
+    : m_comAppliance(comAppliance)
+    , m_strPath(strPath)
+{
+}
+
+QString UINotificationProgressApplianceRead::name() const
+{
+    return UINotificationProgress::tr("Reading appliance ...");
+}
+
+QString UINotificationProgressApplianceRead::details() const
+{
+    return UINotificationProgress::tr("<b>From:</b> %1").arg(m_strPath);
+}
+
+CProgress UINotificationProgressApplianceRead::createProgress(COMResult &comResult)
+{
+    /* Initialize progress-wrapper: */
+    CProgress comProgress = m_comAppliance.Read(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

@@ -1588 +1588 @@
 };
 
+/** UINotificationProgress extension for appliance read functionality. */
+class SHARED_LIBRARY_STUFF UINotificationProgressApplianceRead : public UINotificationProgress
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs appliance read notification-progress.
+      * @param  comAppliance  Brings the appliance being read.
+      * @param  strPath       Brings the appliance path. */
+    UINotificationProgressApplianceRead(const CAppliance &comAppliance,
+                                        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 read. */
+    CAppliance               m_comAppliance;
+    /** Holds the appliance path. */
+    QString                  m_strPath;
+};
+
 /** UINotificationProgress extension for import appliance functionality. */
 class SHARED_LIBRARY_STUFF UINotificationProgressApplianceImport : public UINotificationProgress

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

@@ -30 +30 @@
 #include "UIIconPool.h"
 #include "UIMessageCenter.h"
+#include "UINotificationCenter.h"
 #include "UIVirtualBoxEventHandler.h"
 #include "UIVirtualBoxManager.h"
@@ -296 +297 @@
 void UIWizardImportAppSource::refreshCloudStuff(CAppliance &comCloudAppliance,
                                                 CVirtualSystemDescriptionForm &comCloudVsdImportForm,
-                                                QWidget *pParent,
+                                                UIWizardImportApp *pWizard,
                                                 const QString &strMachineId,
                                                 const QString &strSource,
@@ -311 +312 @@
 
     /* We need top-level parent as well: */
-    AssertPtrReturnVoid(pParent);
+    AssertPtrReturnVoid(pWizard);
     /* Acquire client: */
-    CCloudClient comClient = cloudClientByName(strSource, strProfileName, pParent);
+    CCloudClient comClient = cloudClientByName(strSource, strProfileName, pWizard);
     AssertReturnVoid(comClient.isNotNull());
 
@@ -321 +322 @@
     if (!comVBox.isOk())
     {
-        msgCenter().cannotCreateAppliance(comVBox, pParent);
+        msgCenter().cannotCreateAppliance(comVBox, pWizard);
         return;
     }
@@ -329 +330 @@
 
     /* Read cloud instance info: */
-    CProgress comReadProgress = comCloudAppliance.Read(QString("OCI://%1/%2").arg(strProfileName, strMachineId));
-    if (!comCloudAppliance.isOk())
-    {
-        msgCenter().cannotImportAppliance(comCloudAppliance, pParent);
+    UINotificationProgressApplianceRead *pNotification = new UINotificationProgressApplianceRead(comCloudAppliance,
+                                                                                                 QString("OCI://%1/%2").arg(strProfileName,
+                                                                                                                            strMachineId));
+    if (!pWizard->handleNotificationProgressNow(pNotification))
         return;
-    }
-
-    /* Show "Read appliance" progress: */
-    msgCenter().showModalProgressDialog(comReadProgress, UIWizardImportApp::tr("Read appliance ..."),
-                                        ":/progress_reading_appliance_90px.png", pParent, 0);
-    if (!comReadProgress.isOk() || comReadProgress.GetResultCode() != 0)
-    {
-        msgCenter().cannotImportAppliance(comReadProgress, comCloudAppliance.GetPath(), pParent);
-        return;
-    }
 
     /* Acquire virtual system description: */
@@ -349 +340 @@
     if (!comCloudAppliance.isOk())
     {
-        msgCenter().cannotAcquireVirtualSystemDescription(comCloudAppliance, pParent);
+        msgCenter().cannotAcquireVirtualSystemDescription(comCloudAppliance, pWizard);
         return;
     }
@@ -359 +350 @@
     /* Read Cloud Client description form: */
     CVirtualSystemDescriptionForm comVsdImportForm;
-    bool fSuccess = importDescriptionForm(comClient, comDescription, comVsdImportForm, pParent);
+    bool fSuccess = importDescriptionForm(comClient, comDescription, comVsdImportForm, pWizard);
     if (!fSuccess)
         return;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageSource.h

@@ -82 +82 @@
     void refreshCloudStuff(CAppliance &comCloudAppliance,
                            CVirtualSystemDescriptionForm &comCloudVsdImportForm,
-                           QWidget *pParent,
+                           UIWizardImportApp *pWizard,
                            const QString &strMachineId,
                            const QString &strSource,