Changeset 90625 in vbox

Timestamp:

Aug 11, 2021 12:40:10 PM (4 years ago)

Author:

vboxsync

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

146236

Message:

FE/Qt: bugref:10067: Restore status for UINotificationNewVersionCheckerItem on recreation.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter

Files:

• UINotificationObject.cpp (modified) (3 diffs)
• UINotificationObject.h (modified) (3 diffs)
• UINotificationObjectItem.cpp (modified) (1 diff)

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

@@ -202 +202 @@
 UINotificationNewVersionChecker::UINotificationNewVersionChecker()
     : m_pChecker(0)
+    , m_fDone(false)
 {
 }
@@ -209 +210 @@
     delete m_pChecker;
     m_pChecker = 0;
+}
+
+bool UINotificationNewVersionChecker::isDone() const
+{
+    return m_fDone;
 }
 
@@ -267 +273 @@
     delete m_pChecker;
     m_pChecker = 0;
+    m_fDone = true;
     emit sigProgressFinished();
 }

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

@@ -220 +220 @@
     virtual UINewVersionChecker *createChecker() = 0;
 
+    /** Returns whether current progress is done. */
+    bool isDone() const;
     /** Returns error-message if any. */
     QString error() const;
@@ -238 +240 @@
       * @param  strError  Brings error message if any. */
     void sltHandleProgressFailed(const QString &strError);
-    /** Handles signal about progress failed. */
+    /** Handles signal about progress canceled. */
     void sltHandleProgressCanceled();
-    /** Handles signal about progress failed. */
+    /** Handles signal about progress finished. */
     void sltHandleProgressFinished();
 
@@ -248 +250 @@
     UINewVersionChecker *m_pChecker;
 
+    /** Holds whether current progress is done. */
+    bool     m_fDone;
     /** Holds the error message is any. */
     QString  m_strError;

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

@@ -401 +401 @@
         if (m_pProgressBar)
         {
-            m_pProgressBar->setMaximum(0);
+            if (!checker()->isDone())
+                m_pProgressBar->setMaximum(0);
+            else
+            {
+                m_pProgressBar->setMaximum(1);
+                m_pProgressBar->setValue(1);
+            }
             m_pLayoutMain->addWidget(m_pProgressBar);
         }