Changeset 94454 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 4, 2022 12:50:13 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10205. Make use of IHostUpdate to check for a new VBox version.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -93 +93 @@
 void UIUpdateStepVirtualBox::exec()
 {
+#if 0
     /* Return if already checking: */
     if (UINotificationNewVersionCheckerVirtualBox::exists())
@@ -111 +112 @@
     connect(pNotification, &UINotificationNewVersionCheckerVirtualBox::sigProgressFinished,
             this, &UIUpdateStepVirtualBox::sigStepFinished);
+
     /* Append and start notification: */
     gpNotificationCenter->append(pNotification);
+#else
+    UINotificationProgressNewVersionChecker *pNotification =
+        new UINotificationProgressNewVersionChecker();
+    connect(pNotification, &UINotificationProgressNewVersionChecker::sigProgressFinished,
+            this, &UIUpdateStepVirtualBox::sigStepFinished);
+    gpNotificationCenter->append(pNotification);
+#endif
 }
 

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

@@ -4306 +4306 @@
 }
 
+
+/*********************************************************************************************************************************
+*   Class UINotificationProgressNewVersionChecker implementation.                                                                *
+*********************************************************************************************************************************/
+
+UINotificationProgressNewVersionChecker::UINotificationProgressNewVersionChecker()
+{
+    connect(this, &UINotificationProgress::sigProgressFinished,
+            this, &UINotificationProgressNewVersionChecker::sltHandleProgressFinished);
+    CHost comHost = uiCommon().virtualBox().GetHost();
+    if (!comHost.isNull())
+        m_comUpdateChecker = comHost.GetUpdate();
+}
+
+QString UINotificationProgressNewVersionChecker::name() const
+{
+    return UINotificationProgress::tr("Check for New Version ...");
+}
+
+QString UINotificationProgressNewVersionChecker::details() const
+{
+    return QString();
+}
+
+CProgress UINotificationProgressNewVersionChecker::createProgress(COMResult &comResult)
+{
+    if (!m_comUpdateChecker.isOk())
+        return CProgress();
+
+    CProgress comProgress = m_comUpdateChecker.UpdateCheck(KUpdateCheckType_VirtualBox);
+    comResult = m_comUpdateChecker;
+
+    return comProgress;
+}
+
+void UINotificationProgressNewVersionChecker::sltHandleProgressFinished()
+{
+    if (m_comUpdateChecker.isNull() && !m_comUpdateChecker.isOk())
+        return;
+
+    bool fUpdateAvailable = m_comUpdateChecker.GetUpdateResponse();
+    if (!m_comUpdateChecker.isOk())
+        return;
+
+    if (fUpdateAvailable)
+    {
+        QString strVersion = m_comUpdateChecker.GetUpdateVersion();
+        if (!m_comUpdateChecker.isOk())
+            return;
+
+        QString strURL = m_comUpdateChecker.GetUpdateURL();
+        if (!m_comUpdateChecker.isOk())
+            return;
+
+        UINotificationMessage::showUpdateSuccess(strVersion, strURL);
+    }
+    else
+        UINotificationMessage::showUpdateNotFound();
+}
+
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */

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

@@ -42 +42 @@
 #include "CGuest.h"
 #include "CHost.h"
+#include "CHostUpdate.h"
 #include "CHostNetworkInterface.h"
 #include "CMachine.h"
@@ -2683 +2684 @@
     QString  m_strUrl;
 };
+
+/** UINotificationProgress extension for checking a new VirtualBox version. */
+class SHARED_LIBRARY_STUFF UINotificationProgressNewVersionChecker : public UINotificationProgress
+{
+    Q_OBJECT;
+
+public:
+
+    UINotificationProgressNewVersionChecker();
+
+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 slots:
+
+    void sltHandleProgressFinished();
+
+private:
+
+    CHostUpdate m_comUpdateChecker;
+};
+
+
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */