Changeset 90606 in vbox

Timestamp:

Aug 10, 2021 4:07:13 PM (4 years ago)

Author:

vboxsync

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

146217

Message:

FE/Qt: bugref:10067: Notification signature for new version check procedure which should now go to center instead of network-request center.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -26 +26 @@
 #include "UIMessageCenter.h"
 #include "UIModalWindowManager.h"
-#include "UINewVersionChecker.h"
 #include "UINotificationCenter.h"
 #include "UIUpdateDefs.h"
@@ -46 +45 @@
       * @param  fForcedCall  Brings whether this customer has forced privelegies. */
     UIUpdateStepVirtualBox(bool fForcedCall);
-    /** Destructs extension step. */
-    virtual ~UIUpdateStepVirtualBox() /* override final */;
 
     /** Executes the step. */
@@ -54 +51 @@
 private:
 
-    /** Holds the new version checker instance. */
-    UINewVersionChecker *m_pNewVersionChecker;
+    /** Holds whether this customer has forced privelegies. */
+    bool  m_fForcedCall;
 };
 
@@ -89 +86 @@
 
 UIUpdateStepVirtualBox::UIUpdateStepVirtualBox(bool fForcedCall)
-    : m_pNewVersionChecker(0)
-{
-    m_pNewVersionChecker = new UINewVersionChecker(fForcedCall);
-    if (m_pNewVersionChecker)
-    {
-        connect(m_pNewVersionChecker, &UINewVersionChecker::sigProgressFailed,
-                this, &UIUpdateStepVirtualBox::sigStepFinished);
-        connect(m_pNewVersionChecker, &UINewVersionChecker::sigProgressCanceled,
-                this, &UIUpdateStepVirtualBox::sigStepFinished);
-        connect(m_pNewVersionChecker, &UINewVersionChecker::sigProgressFinished,
-                this, &UIUpdateStepVirtualBox::sigStepFinished);
-    }
-}
-
-UIUpdateStepVirtualBox::~UIUpdateStepVirtualBox()
-{
-    delete m_pNewVersionChecker;
-    m_pNewVersionChecker = 0;
+    : m_fForcedCall(fForcedCall)
+{
 }
 
 void UIUpdateStepVirtualBox::exec()
 {
-    m_pNewVersionChecker->start();
+    /* Return if already checking: */
+    if (UINotificationNewVersionCheckerVirtualBox::exists())
+    {
+        // @todo show notification-center
+        emit sigStepFinished();
+        return;
+    }
+
+    /* Check for new VirtualBox version: */
+    UINotificationNewVersionCheckerVirtualBox *pNotification =
+        UINotificationNewVersionCheckerVirtualBox::instance(m_fForcedCall);
+    /* Handle any signal as step-finished: */
+    connect(pNotification, &UINotificationNewVersionCheckerVirtualBox::sigProgressFailed,
+            this, &UIUpdateStepVirtualBox::sigStepFinished);
+    connect(pNotification, &UINotificationNewVersionCheckerVirtualBox::sigProgressCanceled,
+            this, &UIUpdateStepVirtualBox::sigStepFinished);
+    connect(pNotification, &UINotificationNewVersionCheckerVirtualBox::sigProgressFinished,
+            this, &UIUpdateStepVirtualBox::sigStepFinished);
+    /* Append and start notification: */
+    gpNotificationCenter->append(pNotification);
 }
 

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

@@ -21 +21 @@
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
 # include "UIDownloader.h"
+# include "UINewVersionChecker.h"
 #endif
 
@@ -194 +195 @@
 }
 
+
+/*********************************************************************************************************************************
+*   Class UINotificationNewVersionChecker implementation.                                                                        *
+*********************************************************************************************************************************/
+
+UINotificationNewVersionChecker::UINotificationNewVersionChecker()
+    : m_pChecker(0)
+{
+}
+
+UINotificationNewVersionChecker::~UINotificationNewVersionChecker()
+{
+    delete m_pChecker;
+    m_pChecker = 0;
+}
+
+QString UINotificationNewVersionChecker::error() const
+{
+    return m_strError;
+}
+
+bool UINotificationNewVersionChecker::isCritical() const
+{
+    return m_pChecker ? m_pChecker->isItForcedCall() : true;
+}
+
+void UINotificationNewVersionChecker::handle()
+{
+    /* Prepare new-version-checker: */
+    m_pChecker = createChecker();
+    if (m_pChecker)
+    {
+        connect(m_pChecker, &UINewVersionChecker::sigProgressFailed,
+                this, &UINotificationNewVersionChecker::sltHandleProgressFailed);
+        connect(m_pChecker, &UINewVersionChecker::sigProgressCanceled,
+                this, &UINotificationNewVersionChecker::sltHandleProgressCanceled);
+        connect(m_pChecker, &UINewVersionChecker::sigProgressFinished,
+                this, &UINotificationNewVersionChecker::sltHandleProgressFinished);
+
+        /* And start it finally: */
+        m_pChecker->start();
+    }
+}
+
+void UINotificationNewVersionChecker::close()
+{
+    /* Cancel new-version-checker: */
+    if (m_pChecker)
+        m_pChecker->cancel();
+    /* Call to base-class: */
+    UINotificationObject::close();
+}
+
+void UINotificationNewVersionChecker::sltHandleProgressFailed(const QString &strError)
+{
+    delete m_pChecker;
+    m_pChecker = 0;
+    m_strError = strError;
+    emit sigProgressFailed();
+}
+
+void UINotificationNewVersionChecker::sltHandleProgressCanceled()
+{
+    delete m_pChecker;
+    m_pChecker = 0;
+    emit sigProgressCanceled();
+}
+
+void UINotificationNewVersionChecker::sltHandleProgressFinished()
+{
+    delete m_pChecker;
+    m_pChecker = 0;
+    emit sigProgressFinished();
+}
+
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */

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

@@ -36 +36 @@
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
 class UIDownloader;
+class UINewVersionChecker;
 #endif
 
@@ -194 +195 @@
     QString  m_strError;
 };
+
+/** UINotificationObject extension for notification-new-version-checker. */
+class SHARED_LIBRARY_STUFF UINotificationNewVersionChecker : public UINotificationObject
+{
+    Q_OBJECT;
+
+signals:
+
+    /** Notifies listeners about progress failed. */
+    void sigProgressFailed();
+    /** Notifies listeners about progress canceled. */
+    void sigProgressCanceled();
+    /** Notifies listeners about progress finished. */
+    void sigProgressFinished();
+
+public:
+
+    /** Constructs notification-new-version-checker. */
+    UINotificationNewVersionChecker();
+    /** Destructs notification-new-version-checker. */
+    virtual ~UINotificationNewVersionChecker() /* override final */;
+
+    /** Creates and returns started checker-wrapper. */
+    virtual UINewVersionChecker *createChecker() = 0;
+
+    /** Returns error-message if any. */
+    QString error() const;
+
+    /** Returns whether object is critical. */
+    virtual bool isCritical() const;
+    /** Handles notification-object being added. */
+    virtual void handle() /* override final */;
+
+public slots:
+
+    /** Stops the checker and notifies model about closing. */
+    virtual void close() /* override final */;
+
+private slots:
+
+    /** Handles signal about progress failed.
+      * @param  strError  Brings error message if any. */
+    void sltHandleProgressFailed(const QString &strError);
+    /** Handles signal about progress failed. */
+    void sltHandleProgressCanceled();
+    /** Handles signal about progress failed. */
+    void sltHandleProgressFinished();
+
+private:
+
+    /** Holds the instance of checker being wrapped by this notification-new-version-checker. */
+    UINewVersionChecker *m_pChecker;
+
+    /** Holds the error message is any. */
+    QString  m_strError;
+};
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 

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

@@ -372 +372 @@
 }
 
+
+/*********************************************************************************************************************************
+*   Class UINotificationNewVersionCheckerItem implementation.                                                                    *
+*********************************************************************************************************************************/
+
+UINotificationNewVersionCheckerItem::UINotificationNewVersionCheckerItem(QWidget *pParent, UINotificationNewVersionChecker *pChecker /* = 0 */)
+    : UINotificationObjectItem(pParent, pChecker)
+    , m_pProgressBar(0)
+{
+    /* Main layout was prepared in base-class: */
+    if (m_pLayoutMain)
+    {
+        /* Name label was prepared in base-class: */
+        if (m_pLabelName)
+            m_pLabelName->setText(checker()->name());
+        /* Details label was prepared in base-class: */
+        if (m_pLabelDetails)
+        {
+            int iHint = m_pLabelName->minimumSizeHint().width()
+                      + m_pLayoutUpper->spacing()
+                      + m_pButtonClose->minimumSizeHint().width();
+            m_pLabelDetails->setMinimumTextWidth(iHint);
+            updateDetails();
+        }
+
+        /* Prepare check-box: */
+        m_pProgressBar = new QProgressBar(this);
+        if (m_pProgressBar)
+        {
+            m_pProgressBar->setMaximum(0);
+            m_pLayoutMain->addWidget(m_pProgressBar);
+        }
+    }
+
+    /* Prepare checker connections: */
+    connect(checker(), &UINotificationNewVersionChecker::sigProgressFailed,
+            this, &UINotificationNewVersionCheckerItem::sltHandleProgressNotFinished);
+    connect(checker(), &UINotificationNewVersionChecker::sigProgressCanceled,
+            this, &UINotificationNewVersionCheckerItem::sltHandleProgressNotFinished);
+    connect(checker(), &UINotificationNewVersionChecker::sigProgressFinished,
+            this, &UINotificationNewVersionCheckerItem::sltHandleProgressFinished);
+}
+
+void UINotificationNewVersionCheckerItem::sltHandleProgressNotFinished()
+{
+    /* Finalize progress-bar state: */
+    if (m_pProgressBar)
+        m_pProgressBar->hide();
+    /* Update details with error text if any: */
+    if (m_pLabelDetails)
+        updateDetails();
+}
+
+void UINotificationNewVersionCheckerItem::sltHandleProgressFinished()
+{
+    /* Finalize progress-bar state: */
+    if (m_pProgressBar)
+    {
+        m_pProgressBar->setMaximum(1);
+        m_pProgressBar->setValue(1);
+    }
+    /* Update details with error text if any: */
+    if (m_pLabelDetails)
+        updateDetails();
+}
+
+UINotificationNewVersionChecker *UINotificationNewVersionCheckerItem::checker() const
+{
+    return qobject_cast<UINotificationNewVersionChecker*>(m_pObject);
+}
+
+void UINotificationNewVersionCheckerItem::updateDetails()
+{
+    AssertPtrReturnVoid(m_pLabelDetails);
+    const QString strDetails = checker()->details();
+    const QString strError = checker()->error();
+    const QString strFullDetails = strError.isNull()
+                                 ? strDetails
+                                 : QString("%1<br>%2").arg(strDetails, strError);
+    m_pLabelDetails->setText(strFullDetails);
+    if (!strError.isEmpty())
+    {
+        m_fToggled = true;
+        m_pLabelDetails->setVisible(m_fToggled);
+    }
+}
+
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
@@ -387 +474 @@
     else if (pObject->inherits("UINotificationDownloader"))
         return new UINotificationDownloaderItem(pParent, static_cast<UINotificationDownloader*>(pObject));
+    else if (pObject->inherits("UINotificationNewVersionChecker"))
+        return new UINotificationNewVersionCheckerItem(pParent, static_cast<UINotificationNewVersionChecker*>(pObject));
 #endif
     /* Handle defaults: */

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

@@ -36 +36 @@
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
 class UINotificationDownloader;
+class UINotificationNewVersionChecker;
 #endif
 
@@ -143 +144 @@
     QProgressBar *m_pProgressBar;
 };
+
+/** UINotificationObjectItem extension for notification-new-version-checker. */
+class UINotificationNewVersionCheckerItem : public UINotificationObjectItem
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs notification-new-version-checker item, passing @a pParent to the base-class.
+      * @param  pChecker  Brings the notification-new-version-checker this item created for. */
+    UINotificationNewVersionCheckerItem(QWidget *pParent, UINotificationNewVersionChecker *pChecker = 0);
+
+private slots:
+
+    /** Handles signal about progress NOT finished. */
+    void sltHandleProgressNotFinished();
+    /** Handles signal about progress finished. */
+    void sltHandleProgressFinished();
+
+private:
+
+    /** Holds the notification-new-version-checker this item created for. */
+    UINotificationNewVersionChecker *checker() const;
+
+    /** Updates details. */
+    void updateDetails();
+
+    /** Holds the progress-bar instance. */
+    QProgressBar *m_pProgressBar;
+};
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 

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

@@ -27 +27 @@
 # include "UIDownloaderGuestAdditions.h"
 # include "UIDownloaderUserManual.h"
+# include "UINewVersionChecker.h"
 #endif
 
@@ -1662 +1663 @@
 }
 
+
+/*********************************************************************************************************************************
+*   Class UINotificationNewVersionCheckerVirtualBox implementation.                                                              *
+*********************************************************************************************************************************/
+
+/* static */
+UINotificationNewVersionCheckerVirtualBox *UINotificationNewVersionCheckerVirtualBox::s_pInstance = 0;
+
+/* static */
+UINotificationNewVersionCheckerVirtualBox *UINotificationNewVersionCheckerVirtualBox::instance(bool fForcedCall)
+{
+    if (!s_pInstance)
+        new UINotificationNewVersionCheckerVirtualBox(fForcedCall);
+    return s_pInstance;
+}
+
+/* static */
+bool UINotificationNewVersionCheckerVirtualBox::exists()
+{
+    return !!s_pInstance;
+}
+
+UINotificationNewVersionCheckerVirtualBox::UINotificationNewVersionCheckerVirtualBox(bool fForcedCall)
+    : m_fForcedCall(fForcedCall)
+{
+    s_pInstance = this;
+}
+
+UINotificationNewVersionCheckerVirtualBox::~UINotificationNewVersionCheckerVirtualBox()
+{
+    s_pInstance = 0;
+}
+
+QString UINotificationNewVersionCheckerVirtualBox::name() const
+{
+    return UINotificationDownloader::tr("Check for New Version ...");
+}
+
+QString UINotificationNewVersionCheckerVirtualBox::details() const
+{
+    return UINotificationProgress::tr("<b>Link:</b> %1").arg(m_strUrl);
+}
+
+UINewVersionChecker *UINotificationNewVersionCheckerVirtualBox::createChecker()
+{
+    /* Create and configure the new VirtualBox version checker: */
+    UINewVersionChecker *pChecker = new UINewVersionChecker(m_fForcedCall);
+    if (pChecker)
+    {
+        m_strUrl = pChecker->url().toString();
+        return pChecker;
+    }
+    return 0;
+}
+
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */

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

@@ -1257 +1257 @@
     QString  m_strFileName;
 };
+
+/** UINotificationNewVersionChecker extension for VirtualBox new version check functionality. */
+class SHARED_LIBRARY_STUFF UINotificationNewVersionCheckerVirtualBox : public UINotificationNewVersionChecker
+{
+    Q_OBJECT;
+
+public:
+
+    /** Returns singleton instance, creates if necessary.
+      * @param  fForcedCall  Brings whether this customer has forced privelegies. */
+    static UINotificationNewVersionCheckerVirtualBox *instance(bool fForcedCall);
+    /** Returns whether singleton instance already created. */
+    static bool exists();
+
+    /** Destructs VirtualBox notification-new-version-checker.
+      * @note  Notification-center can destroy us at any time. */
+    virtual ~UINotificationNewVersionCheckerVirtualBox() /* override final */;
+
+protected:
+
+    /** Constructs VirtualBox notification-new-version-checker.
+      * @param  fForcedCall  Brings whether this customer has forced privelegies. */
+    UINotificationNewVersionCheckerVirtualBox(bool fForcedCall);
+
+    /** Returns object name. */
+    virtual QString name() const /* override final */;
+    /** Returns object details. */
+    virtual QString details() const /* override final */;
+    /** Creates and returns started new-version-checker. */
+    virtual UINewVersionChecker *createChecker() /* override final */;
+
+private:
+
+    /** Holds the singleton instance. */
+    static UINotificationNewVersionCheckerVirtualBox *s_pInstance;
+
+    /** Holds whether this customer has forced privelegies. */
+    bool  m_fForcedCall;
+
+    /** Holds the url. */
+    QString  m_strUrl;
+};
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */