From d61c1c13bfe39c4eadc03a40b09fe6c1c8fba797 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 15 Jul 2016 12:30:55 +0300 Subject: [PATCH] Check one day and try remind again. --HG-- branch : feature --- src/libs/fervor/fvupdater.cpp | 11 ++++++++++- src/libs/vmisc/vcommonsettings.cpp | 14 ++++++++++++++ src/libs/vmisc/vcommonsettings.h | 4 ++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/libs/fervor/fvupdater.cpp b/src/libs/fervor/fvupdater.cpp index 00a10f146..9e7f3adfd 100644 --- a/src/libs/fervor/fvupdater.cpp +++ b/src/libs/fervor/fvupdater.cpp @@ -157,6 +157,8 @@ void FvUpdater::RemindMeLater() { qDebug() << "Remind me later"; + qApp->Settings()->SetDateOfLastRemind(QDate::currentDate()); + hideUpdaterWindow(); } @@ -229,7 +231,14 @@ bool FvUpdater::CheckForUpdates(bool silentAsMuchAsItCouldGet) //--------------------------------------------------------------------------------------------------------------------- bool FvUpdater::CheckForUpdatesSilent() { - return CheckForUpdates(true); + if (qApp->Settings()->GetDateOfLastRemind().daysTo(QDate::currentDate()) >= 1) + { + return CheckForUpdates(true); + } + else + { + return true; + } } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vmisc/vcommonsettings.cpp b/src/libs/vmisc/vcommonsettings.cpp index 5c8686b78..a21ded0e7 100644 --- a/src/libs/vmisc/vcommonsettings.cpp +++ b/src/libs/vmisc/vcommonsettings.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #include "../ifc/ifcdef.h" @@ -66,6 +67,7 @@ const QString VCommonSettings::SettingGeneralWindowState = QString const QString VCommonSettings::SettingGeneralToolbarsState = QStringLiteral("toolbarsState"); const QString VCommonSettings::SettingPreferenceDialogSize = QStringLiteral("preferenceDialogSize"); const QString VCommonSettings::SettingLatestSkippedVersion = QStringLiteral("lastestSkippedVersion"); +const QString VCommonSettings::SettingDateOfLastRemind = QStringLiteral("dateOfLastRemind"); static const QString commonIniFilename = QStringLiteral("common"); @@ -442,3 +444,15 @@ void VCommonSettings::SetLatestSkippedVersion(int value) { setValue(SettingLatestSkippedVersion, value); } + +//--------------------------------------------------------------------------------------------------------------------- +QDate VCommonSettings::GetDateOfLastRemind() const +{ + return value(SettingDateOfLastRemind, QDate(1900, 1, 1)).toDate(); +} + +//--------------------------------------------------------------------------------------------------------------------- +void VCommonSettings::SetDateOfLastRemind(const QDate &date) +{ + setValue(SettingDateOfLastRemind, date); +} diff --git a/src/libs/vmisc/vcommonsettings.h b/src/libs/vmisc/vcommonsettings.h index 42d954348..0755b11a1 100644 --- a/src/libs/vmisc/vcommonsettings.h +++ b/src/libs/vmisc/vcommonsettings.h @@ -105,6 +105,9 @@ public: int GetLatestSkippedVersion() const; void SetLatestSkippedVersion(int value); + QDate GetDateOfLastRemind() const; + void SetDateOfLastRemind(const QDate &date); + private: Q_DISABLE_COPY(VCommonSettings) @@ -132,6 +135,7 @@ private: static const QString SettingGeneralToolbarsState; static const QString SettingPreferenceDialogSize; static const QString SettingLatestSkippedVersion; + static const QString SettingDateOfLastRemind; }; #endif // VCOMMONSETTINGS_H