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

Timestamp:

Aug 7, 2021 9:04:01 AM (4 years ago)

Author:

vboxsync

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

146167

Message:

FE/Qt: bugref:10067: Notification signature for user manual downloading which should now go to center instead of network-request center; Moving singleton functionality from UIDownloaderUserManual to UINotificationDownloaderUserManual.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (2 diffs)
• networking/UIDownloaderUserManual.cpp (modified) (3 diffs)
• networking/UIDownloaderUserManual.h (modified) (2 diffs)
• notificationcenter/UINotificationObjects.cpp (modified) (2 diffs)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -45 +45 @@
 #endif
 #ifdef VBOX_OSE
-# include "UIDownloaderUserManual.h"
+# include "UINotificationCenter.h"
 #endif
 #ifdef VBOX_WS_MAC
@@ -3420 +3420 @@
     else if (cannotFindUserManual(strUserManualFileName1))
     {
-        /* Create User Manual downloader: */
-        UIDownloaderUserManual *pDl = UIDownloaderUserManual::create();
+        /* Download user manual: */
+        UINotificationDownloaderUserManual *pNotification = UINotificationDownloaderUserManual::instance(UICommon::helpFile());
         /* After downloading finished => show User Manual: */
-        connect(pDl, &UIDownloaderUserManual::sigDownloadFinished, this, &UIMessageCenter::sltShowUserManual);
-        /* Start downloading: */
-        pDl->start();
+        connect(pNotification, &UINotificationDownloaderUserManual::sigUserManualDownloaded,
+                this, &UIMessageCenter::sltShowUserManual);
+        /* Append and start notification: */
+        notificationCenter().append(pNotification);
     }
 #endif /* #ifdef VBOX_OSE */

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

@@ -31 +31 @@
 
 
-/* static */
-UIDownloaderUserManual* UIDownloaderUserManual::s_pInstance = 0;
-
-/* static */
-UIDownloaderUserManual* UIDownloaderUserManual::create()
-{
-    if (!s_pInstance)
-        s_pInstance = new UIDownloaderUserManual;
-    return s_pInstance;
-}
-
 UIDownloaderUserManual::UIDownloaderUserManual()
 {
-    /* 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();
@@ -64 +49 @@
     QString strUserManualDestination = QDir(uiCommon().homeFolder()).absoluteFilePath(strUserManualShortFileName);
     setTarget(strUserManualDestination);
-}
-
-UIDownloaderUserManual::~UIDownloaderUserManual()
-{
-    /* Cleanup instance: */
-    if (s_pInstance == this)
-        s_pInstance = 0;
 }
 
@@ -130 +108 @@
     }
 }
-

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

@@ -38 +38 @@
 public:
 
-    /** Creates downloader instance. */
-    static UIDownloaderUserManual *create();
-    /** Returns current downloader instance. */
-    static UIDownloaderUserManual *current() { return s_pInstance; }
+    /** Constructs downloader. */
+    UIDownloaderUserManual();
 
 private:
-
-    /** Constructs downloader. */
-    UIDownloaderUserManual();
-    /** Destructs downloader. */
-    ~UIDownloaderUserManual();
 
     /** Returns description of the current network operation. */
@@ -57 +50 @@
     /** Handles downloaded object for passed @a pReply. */
     virtual void handleDownloadedObject(UINetworkReply *pReply) /* override */;
-
-    /** Holds the static singleton instance. */
-    static UIDownloaderUserManual *s_pInstance;
 };
 
 #endif /* !FEQT_INCLUDED_SRC_networking_UIDownloaderUserManual_h */
-

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

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

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

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