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

Timestamp:

Apr 28, 2022 5:52:03 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt/Ds: bugref:10205: More rework and cleanup for UIUpdateDefs; Optimizing save/load stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• networking/UIUpdateDefs.cpp (modified) (2 diffs)
• networking/UIUpdateDefs.h (modified) (3 diffs)
• networking/UIUpdateManager.cpp (modified) (1 diff)
• settings/editors/UIUpdateSettingsEditor.cpp (modified) (1 diff)

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

@@ -67 +67 @@
 VBoxUpdateData::VBoxUpdateData(const QString &strData)
     : m_strData(strData)
-    , m_enmUpdatePeriod(UpdatePeriodType_1Day)
-    , m_enmUpdateChannel(KUpdateChannel_Stable)
-{
-    /* Parse standard values: */
+    , m_enmUpdatePeriod(UpdatePeriodType_Never)
+    , m_enmUpdateChannel(KUpdateChannel_Invalid)
+{
+    /* Skip 'never' case: */
     if (m_strData == "never")
-        m_enmUpdatePeriod = UpdatePeriodType_Never;
-    /* Parse other values: */
-    else
-    {
+        return;
+
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-        QStringList parser = m_strData.split(", ", Qt::SkipEmptyParts);
+    const QStringList parser = m_strData.split(", ", Qt::SkipEmptyParts);
 #else
-        QStringList parser = m_strData.split(", ", QString::SkipEmptyParts);
+    const QStringList parser = m_strData.split(", ", QString::SkipEmptyParts);
 #endif
 
-        /* Parse 'period' value: */
-        if (parser.size() > 0)
-        {
-            if (s_days.isEmpty())
-                populate();
-            const UpdatePeriodType enmUpdatePeriod = (UpdatePeriodType)s_days.indexOf(VBoxUpdateDay(QString(), parser.at(0)));
-            m_enmUpdatePeriod = enmUpdatePeriod == UpdatePeriodType_Never ? UpdatePeriodType_1Day : enmUpdatePeriod;
-        }
-
-        /* Parse 'date' value: */
-        if (parser.size() > 1)
-        {
-            QDate date = QDate::fromString(parser.at(1), Qt::ISODate);
-            m_date = date.isValid() ? date : QDate::currentDate();
-        }
-
-        /* Parse 'update channel' value: */
-        if (parser.size() > 2)
-        {
-            m_enmUpdateChannel = updateChannelFromInternalString(parser.at(2));
-        }
-
-        /* Parse 'version' value: */
-        if (parser.size() > 3)
-        {
-            m_version = UIVersion(parser.at(3));
-        }
+    /* Parse 'period' value: */
+    if (parser.size() > 0)
+    {
+        if (s_days.isEmpty())
+            populate();
+        m_enmUpdatePeriod = (UpdatePeriodType)s_days.indexOf(VBoxUpdateDay(QString(), parser.at(0)));
+        if (m_enmUpdatePeriod == UpdatePeriodType_Never)
+            m_enmUpdatePeriod = UpdatePeriodType_1Day;
+    }
+
+    /* Parse 'date' value: */
+    if (parser.size() > 1)
+    {
+        QDate date = QDate::fromString(parser.at(1), Qt::ISODate);
+        m_date = date.isValid() ? date : QDate::currentDate();
+    }
+
+    /* Parse 'update channel' value: */
+    if (parser.size() > 2)
+    {
+        m_enmUpdateChannel = updateChannelFromInternalString(parser.at(2));
+    }
+
+    /* Parse 'version' value: */
+    if (parser.size() > 3)
+    {
+        m_version = UIVersion(parser.at(3));
     }
 }
 
 VBoxUpdateData::VBoxUpdateData(UpdatePeriodType enmUpdatePeriod, KUpdateChannel enmUpdateChannel)
-    : m_strData(QString())
+    : m_strData("never")
     , m_enmUpdatePeriod(enmUpdatePeriod)
     , m_enmUpdateChannel(enmUpdateChannel)
 {
-    /* Encode standard values: */
+    /* Skip 'UpdatePeriodType_Never' case: */
     if (m_enmUpdatePeriod == UpdatePeriodType_Never)
-        m_strData = "never";
-    /* Encode other values: */
-    else
-    {
-        /* Encode 'period' value: */
-        if (s_days.isEmpty())
-            populate();
-        QString remindPeriod = s_days.at(m_enmUpdatePeriod).key;
-
-        /* Encode 'date' value: */
-        m_date = QDate::currentDate();
-        QStringList parser(remindPeriod.split(' '));
-        if (parser[1] == "d")
-            m_date = m_date.addDays(parser[0].toInt());
-        else if (parser[1] == "w")
-            m_date = m_date.addDays(parser[0].toInt() * 7);
-        else if (parser[1] == "m")
-            m_date = m_date.addMonths(parser[0].toInt());
-        QString remindDate = m_date.toString(Qt::ISODate);
-
-        /* Encode 'update channel' value: */
-        QString strUpdateChannel = updateChannelName();
-
-        /* Encode 'version' value: */
-        QString versionValue = UIVersion(uiCommon().vboxVersionStringNormalized()).toString();
-
-        /* Composite m_strData: */
-        m_strData = QString("%1, %2, %3, %4").arg(remindPeriod, remindDate, strUpdateChannel, versionValue);
-    }
-}
-
-bool VBoxUpdateData::isNoNeedToCheck() const
-{
-    /* No need to check if Period == Never: */
-    return m_enmUpdatePeriod == UpdatePeriodType_Never;
-}
-
-bool VBoxUpdateData::isNeedToCheck() const
-{
-    /* Return 'false' if there is no need to check: */
-    if (isNoNeedToCheck())
+        return;
+
+    /* Encode 'period' value: */
+    if (s_days.isEmpty())
+        populate();
+    const QString strRemindPeriod = s_days.at(m_enmUpdatePeriod).key;
+
+    /* Encode 'date' value: */
+    m_date = QDate::currentDate();
+    QStringList parser(strRemindPeriod.split(' '));
+    if (parser[1] == "d")
+        m_date = m_date.addDays(parser[0].toInt());
+    else if (parser[1] == "w")
+        m_date = m_date.addDays(parser[0].toInt() * 7);
+    else if (parser[1] == "m")
+        m_date = m_date.addDays(parser[0].toInt() * 30);
+    const QString strRemindDate = m_date.toString(Qt::ISODate);
+
+    /* Encode 'update channel' value: */
+    const QString strUpdateChannel = updateChannelName();
+
+    /* Encode 'version' value: */
+    m_version = UIVersion(uiCommon().vboxVersionStringNormalized());
+    const QString strVersionValue = m_version.toString();
+
+    /* Compose m_strData: */
+    m_strData = QString("%1, %2, %3, %4").arg(strRemindPeriod, strRemindDate, strUpdateChannel, strVersionValue);
+}
+
+bool VBoxUpdateData::isCheckEnabled() const
+{
+    /* Check is enabled if Period != Never: */
+    return m_enmUpdatePeriod != UpdatePeriodType_Never;
+}
+
+bool VBoxUpdateData::isCheckRequired() const
+{
+    /* Return 'false' if there check is disabled: */
+    if (!isCheckEnabled())
         return false;
 
@@ -191 +187 @@
 QString VBoxUpdateData::dateToString() const
 {
-    return isNoNeedToCheck() ? QCoreApplication::translate("UIUpdateManager", "Never")
-                             : QLocale::system().toString(m_date, QLocale::ShortFormat);
+    return   isCheckEnabled()
+           ? QLocale::system().toString(m_date, QLocale::ShortFormat)
+           : QCoreApplication::translate("UIUpdateManager", "Never");
 }
 

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

@@ -64 +64 @@
     }
 
-    QString     val;
-    QString     key;
+    QString  val;
+    QString  key;
 };
 typedef QList<VBoxUpdateDay> VBoxUpdateDayList;
@@ -85 +85 @@
     VBoxUpdateData(UpdatePeriodType enmUpdatePeriod, KUpdateChannel enmUpdateChannel);
 
-    /** Returns whether there is no need to check. */
-    bool isNoNeedToCheck() const;
-    /** Returns whether there is really need to check. */
-    bool isNeedToCheck() const;
+    /** Returns whether check is enabled. */
+    bool isCheckEnabled() const;
+    /** Returns whether check is required. */
+    bool isCheckRequired() const;
 
     /** Returns update data. */
@@ -129 +129 @@
     /** Holds the update data. */
     QString  m_strData;
+
     /** Holds the update period. */
-    UpdatePeriodType      m_enmUpdatePeriod;
+    UpdatePeriodType  m_enmUpdatePeriod;
     /** Holds the update date. */
-    QDate           m_date;
+    QDate             m_date;
     /** Holds the update channel. */
-    KUpdateChannel  m_enmUpdateChannel;
+    KUpdateChannel    m_enmUpdateChannel;
     /** Holds the update version. */
-    UIVersion       m_version;
+    UIVersion         m_version;
 };
 
 
 #endif /* !FEQT_INCLUDED_SRC_networking_UIUpdateDefs_h */
-

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

@@ -347 +347 @@
         true ||
 #endif
-        fForcedCall || currentData.isNeedToCheck())
+        fForcedCall || currentData.isCheckRequired())
     {
         /* Prepare update queue: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUpdateSettingsEditor.cpp

@@ -52 +52 @@
         if (m_pCheckBox)
         {
-            m_pCheckBox->setChecked(!m_guiValue.isNoNeedToCheck());
+            m_pCheckBox->setChecked(m_guiValue.isCheckEnabled());
 
             if (m_pCheckBox->isChecked())