Changeset 90568 in vbox

Timestamp:

Aug 7, 2021 12:10:50 PM (4 years ago)

Author:

vboxsync

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

146174

Message:

FE/Qt: bugref:10067: Notification signature for guest additions downloading which should now go to center instead of network-request center; Moving singleton functionality from UIDownloaderAdditions to UINotificationDownloaderGuestAdditions.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• networking/UIDownloaderAdditions.cpp (modified) (2 diffs)
• networking/UIDownloaderAdditions.h (modified) (2 diffs)
• notificationcenter/UINotificationObjects.cpp (modified) (2 diffs)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (3 diffs)

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

@@ -34 +34 @@
 
 
-/* static */
-UIDownloaderAdditions *UIDownloaderAdditions::s_pInstance = 0;
-
-/* static */
-UIDownloaderAdditions *UIDownloaderAdditions::create()
-{
-    if (!s_pInstance)
-        s_pInstance = new UIDownloaderAdditions;
-    return s_pInstance;
-}
-
 UIDownloaderAdditions::UIDownloaderAdditions()
 {
-    /* Prepare instance: */
-    if (!s_pInstance)
-        s_pInstance = this;
-
     /* Get version number and adjust it for test and trunk builds. The server only has official releases. */
     const QString strVersion = UIVersion(uiCommon().vboxVersionStringNormalized()).effectiveReleasedVersion().toString();
@@ -65 +50 @@
     setTarget(strTarget);
     setPathSHA256SumsFile(strPathSHA256SumsFile);
-}
-
-UIDownloaderAdditions::~UIDownloaderAdditions()
-{
-    /* Cleanup instance: */
-    if (s_pInstance == this)
-        s_pInstance = 0;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/networking/UIDownloaderAdditions.h

@@ -41 +41 @@
 public:
 
-    /** Creates downloader instance. */
-    static UIDownloaderAdditions *create();
-    /** Returns current downloader instance. */
-    static UIDownloaderAdditions *current() { return s_pInstance; }
+    /** Constructs downloader. */
+    UIDownloaderAdditions();
 
 private:
-
-    /** Constructs downloader. */
-    UIDownloaderAdditions();
-    /** Destructs downloader. */
-    ~UIDownloaderAdditions();
 
     /** Returns description of the current network operation. */
@@ -63 +56 @@
     virtual void handleVerifiedObject(UINetworkReply *pReply) /* override */;
 
-    /** Holds the static singleton instance. */
-    static UIDownloaderAdditions *s_pInstance;
-
     /** Holds the cached received data awaiting for verification. */
     QByteArray m_receivedData;

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

@@ -22 +22 @@
 /* GUI includes: */
 #include "UICommon.h"
+#include "UIDownloaderAdditions.h"
 #include "UIDownloaderExtensionPack.h"
 #include "UIDownloaderUserManual.h"
@@ -1546 +1547 @@
 
 /*********************************************************************************************************************************
+*   Class UINotificationDownloaderGuestAdditions implementation.                                                                 *
+*********************************************************************************************************************************/
+
+/* static */
+UINotificationDownloaderGuestAdditions *UINotificationDownloaderGuestAdditions::s_pInstance = 0;
+
+/* static */
+UINotificationDownloaderGuestAdditions *UINotificationDownloaderGuestAdditions::instance(const QString &strFileName)
+{
+    if (!s_pInstance)
+        new UINotificationDownloaderGuestAdditions(strFileName);
+    return s_pInstance;
+}
+
+/* static */
+bool UINotificationDownloaderGuestAdditions::exists()
+{
+    return !!s_pInstance;
+}
+
+UINotificationDownloaderGuestAdditions::UINotificationDownloaderGuestAdditions(const QString &strFileName)
+    : m_strFileName(strFileName)
+{
+    s_pInstance = this;
+}
+
+UINotificationDownloaderGuestAdditions::~UINotificationDownloaderGuestAdditions()
+{
+    s_pInstance = 0;
+}
+
+QString UINotificationDownloaderGuestAdditions::name() const
+{
+    return UINotificationDownloader::tr("Downloading Guest Additions ...");
+}
+
+QString UINotificationDownloaderGuestAdditions::details() const
+{
+    return UINotificationProgress::tr("<b>Name:</b> %1").arg(m_strFileName);
+}
+
+UIDownloader *UINotificationDownloaderGuestAdditions::createDownloader()
+{
+    /* Create and configure the User Manual downloader: */
+    UIDownloaderAdditions *pDownloader = new UIDownloaderAdditions;
+    if (pDownloader)
+    {
+        connect(pDownloader, &UIDownloaderAdditions::sigDownloadFinished,
+                this, &UINotificationDownloaderGuestAdditions::sigGuestAdditionsDownloaded);
+        return pDownloader;
+    }
+    return 0;
+}
+
+
+/*********************************************************************************************************************************
 *   Class UINotificationDownloaderUserManual implementation.                                                                     *
 *********************************************************************************************************************************/

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

@@ -1167 +1167 @@
 };
 
+/** UINotificationDownloader extension for guest additions downloading functionality. */
+class SHARED_LIBRARY_STUFF UINotificationDownloaderGuestAdditions : public UINotificationDownloader
+{
+    Q_OBJECT;
+
+signals:
+
+    /** Notifies listeners about guest additions downloaded.
+      * @param  strLocation  Brings the UM location. */
+    void sigGuestAdditionsDownloaded(const QString &strLocation);
+
+public:
+
+    /** Returns singleton instance, creates if necessary.
+      * @param  strFileName  Brings the file name. */
+    static UINotificationDownloaderGuestAdditions *instance(const QString &strFileName);
+    /** Returns whether singleton instance already created. */
+    static bool exists();
+
+    /** Destructs guest additions downloading notification-progress.
+      * @note  Notification-center can destroy us at any time. */
+    virtual ~UINotificationDownloaderGuestAdditions() /* override final */;
+
+protected:
+
+    /** Constructs guest additions downloading notification-progress.
+      * @param  strFileName  Brings the file name. */
+    UINotificationDownloaderGuestAdditions(const QString &strFileName);
+
+    /** 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 singleton instance. */
+    static UINotificationDownloaderGuestAdditions *s_pInstance;
+
+    /** Holds the name of file being dowloaded. */
+    QString  m_strFileName;
+};
+
 /** UINotificationDownloader extension for user manual downloading functionality. */
 class SHARED_LIBRARY_STUFF UINotificationDownloaderUserManual : public UINotificationDownloader

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -35 +35 @@
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
 # include "UINetworkRequestManager.h"
-# include "UIDownloaderAdditions.h"
+# include "UINotificationCenter.h"
 #endif
 #include "UIHostComboEditor.h"
@@ -2525 +2525 @@
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     /* If downloader is running already: */
-    if (UIDownloaderAdditions::current())
+    if (UINotificationDownloaderGuestAdditions::exists())
     {
         /// @todo show notification-center
@@ -2532 +2532 @@
     else if (msgCenter().cannotFindGuestAdditions())
     {
-        /* Create Additions downloader: */
-        UIDownloaderAdditions *pDl = UIDownloaderAdditions::create();
-        /* After downloading finished => propose to install the Additions: */
-        connect(pDl, &UIDownloaderAdditions::sigDownloadFinished, uisession(), &UISession::sltInstallGuestAdditionsFrom);
-        /* Start downloading: */
-        pDl->start();
+        /* Download guest additions: */
+        UINotificationDownloaderGuestAdditions *pNotification = UINotificationDownloaderGuestAdditions::instance(GUI_GuestAdditionsName);
+        /* After downloading finished => propose to install the guest additions: */
+        connect(pNotification, &UINotificationDownloaderGuestAdditions::sigGuestAdditionsDownloaded,
+                uisession(), &UISession::sltInstallGuestAdditionsFrom);
+        /* Append and start notification: */
+        gpNotificationCenter->append(pNotification);
     }
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */