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

Timestamp:

Aug 7, 2021 6:41:32 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Notification signature for ext pack downloading which should now go to center instead of network-request center.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• networking/UIUpdateManager.cpp (modified) (2 diffs)
• notificationcenter/UINotificationObjects.cpp (modified) (2 diffs)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/networking/UIUpdateManager.cpp

@@ -34 +34 @@
 #include "UINetworkCustomer.h"
 #include "UINetworkRequest.h"
+#include "UINotificationCenter.h"
 #include "UIUpdateDefs.h"
 #include "UIUpdateManager.h"
@@ -489 +490 @@
     }
 
-    /* Create and configure the Extension Pack downloader: */
-    UIDownloaderExtensionPack *pDl = UIDownloaderExtensionPack::create();
+    /* Download extension pack: */
+    UINotificationDownloaderExtensionPack *pNotification = new UINotificationDownloaderExtensionPack(GUI_ExtPackName);
     /* After downloading finished => propose to install the Extension Pack: */
-    connect(pDl, &UIDownloaderExtensionPack::sigDownloadFinished,
+    connect(pNotification, &UINotificationDownloaderExtensionPack::sigExtensionPackDownloaded,
             this, &UIUpdateStepVirtualBoxExtensionPack::sltHandleDownloadedExtensionPack);
     /* Also, destroyed downloader is a signal to finish the step: */
-    connect(pDl, &UIDownloaderExtensionPack::destroyed,
+    connect(pNotification, &UINotificationDownloaderExtensionPack::sigDownloaderDestroyed,
             this, &UIUpdateStepVirtualBoxExtensionPack::sigStepComplete);
-    /* Start downloading: */
-    pDl->start();
+    /* Append and start notification: */
+    notificationCenter().append(pNotification);
 }
 

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

@@ -22 +22 @@
 /* GUI includes: */
 #include "UICommon.h"
+#include "UIDownloaderExtensionPack.h"
 #include "UINotificationObjects.h"
 
@@ -1485 +1486 @@
         emit sigHostOnlyNetworkInterfaceRemoved(m_strInterfaceName);
 }
+
+
+/*********************************************************************************************************************************
+*   Class UINotificationDownloaderExtensionPack implementation.                                                                  *
+*********************************************************************************************************************************/
+
+UINotificationDownloaderExtensionPack::UINotificationDownloaderExtensionPack(const QString &strPackName)
+    : m_strPackName(strPackName)
+{
+}
+
+QString UINotificationDownloaderExtensionPack::name() const
+{
+    return UINotificationDownloader::tr("Downloading Extension Pack ...");
+}
+
+QString UINotificationDownloaderExtensionPack::details() const
+{
+    return UINotificationProgress::tr("<b>Name:</b> %1").arg(m_strPackName);
+}
+
+UIDownloader *UINotificationDownloaderExtensionPack::createDownloader()
+{
+    /* Create and configure the Extension Pack downloader: */
+    UIDownloaderExtensionPack *pDownloader = UIDownloaderExtensionPack::create();
+    if (pDownloader)
+    {
+        connect(pDownloader, &UIDownloaderExtensionPack::sigDownloadFinished,
+                this, &UINotificationDownloaderExtensionPack::sigExtensionPackDownloaded);
+        return pDownloader;
+    }
+    return 0;
+}

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

@@ -1118 +1118 @@
 };
 
+/** UINotificationDownloader extension for Extension Pack downloading functionality. */
+class SHARED_LIBRARY_STUFF UINotificationDownloaderExtensionPack : public UINotificationDownloader
+{
+    Q_OBJECT;
+
+signals:
+
+    /** Notifies listeners about extension pack downloaded.
+      * @param  strSource  Brings the EP source.
+      * @param  strTarget  Brings the EP target.
+      * @param  strDigest  Brings the EP digest. */
+    void sigExtensionPackDownloaded(const QString &strSource,
+                                    const QString &strTarget,
+                                    const QString &strDigest);
+
+public:
+
+    /** Constructs host-only network interface remove notification-progress. */
+    UINotificationDownloaderExtensionPack(const QString &strPackName);
+
+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 UIDownloader *createDownloader() /* override final */;
+
+private:
+
+    /** Holds the pack being dowloaded. */
+    QString  m_strPackName;
+};
+
 #endif /* !FEQT_INCLUDED_SRC_notificationcenter_UINotificationObjects_h */