Changeset 39473 in vbox for trunk

Timestamp:

Nov 30, 2011 12:43:36 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: 5985: Update Manager should check for the new version again the same day after installing other than current VBox version.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxUtils.h (modified) (2 diffs)
• net/UIUpdateDefs.cpp (modified) (6 diffs)
• net/UIUpdateDefs.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxUtils.h

@@ -202 +202 @@
 public:
 
+    VBoxVersion() : m_x(-1), m_y(-1), m_z(-1) {}
+
     VBoxVersion(const QString &strVersion)
-        : m_x(0), m_y(0), m_z(0)
+        : m_x(-1), m_y(-1), m_z(-1)
     {
         QStringList versionStack = strVersion.split('.');
@@ -214 +216 @@
     }
 
+    VBoxVersion& operator=(const VBoxVersion &other) { m_x = other.x(); m_y = other.y(); m_z = other.z(); return *this; }
+
+    bool isValid() const { return m_x != -1 && m_y != -1 && m_z != -1; }
+
     bool equal(const VBoxVersion &other) const { return (m_x == other.m_x) && (m_y == other.m_y) && (m_z == other.m_z); }
     bool operator==(const VBoxVersion &other) const { return equal(other); }

trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp

@@ -24 +24 @@
 /* Local includes: */
 #include "UIUpdateDefs.h"
+#include "VBoxGlobal.h"
 
 /* static: */
@@ -81 +82 @@
 bool VBoxUpdateData::isNoNeedToCheck() const
 {
+    /* Return 'false' if Period == Never: */
     return m_periodIndex == PeriodNever;
 }
@@ -86 +88 @@
 bool VBoxUpdateData::isNeedToCheck() const
 {
-    return !isNoNeedToCheck() && QDate::currentDate() >= m_date;
+    /* Return 'false' if Period == Never: */
+    if (isNoNeedToCheck())
+        return false;
+
+    /* Return 'true' if date of next check is today or missed: */
+    if (QDate::currentDate() >= m_date)
+        return true;
+
+    /* Return 'true' if saved version value is NOT valid or NOT equal to current: */
+    if (!version().isValid() || version() != VBoxVersion(vboxGlobal().vboxVersionStringNormalized()))
+        return true;
+
+    /* Return 'false' in all other cases: */
+    return false;
 }
 
@@ -123 +138 @@
 }
 
+VBoxVersion VBoxUpdateData::version() const
+{
+    return m_version;
+}
+
 void VBoxUpdateData::decode()
 {
@@ -155 +175 @@
             m_branchIndex = branch == "withbetas" ? BranchWithBetas :
                             branch == "allrelease" ? BranchAllRelease : BranchStable;
+        }
+
+        /* Parse 'version' value: */
+        if (parser.size() > 3)
+        {
+            m_version = VBoxVersion(parser[3]);
         }
     }
@@ -187 +213 @@
                               m_branchIndex == BranchAllRelease ? "allrelease" : "stable";
 
+        /* Encode 'version' value: */
+        QString versionValue = VBoxVersion(vboxGlobal().vboxVersionStringNormalized()).toString();
+
         /* Composite m_strData: */
-        m_strData = QString("%1, %2, %3").arg(remindPeriod, remindDate, branchValue);
+        m_strData = QString("%1, %2, %3, %4").arg(remindPeriod, remindDate, branchValue, versionValue);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.h

@@ -22 +22 @@
 /* Global includes: */
 #include <QDate>
+
+/* Local includes: */
+#include "VBoxUtils.h"
 
 /* This structure is used to store retranslated reminder values. */
@@ -82 +85 @@
     BranchType branchIndex() const;
     QString branchName() const;
+    VBoxVersion version() const;
 
 private:
@@ -95 +99 @@
     QDate m_date;
     BranchType m_branchIndex;
+    VBoxVersion m_version;
 };