From ceb6ce218bfe2928a6c269ab3547632b1880dd66 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 6 Nov 2014 17:28:05 +0100 Subject: [PATCH] Missed code for 2.0.0.4. --- src/core/feedsmodelcategory.cpp | 4 +--- src/core/feedsmodelfeed.cpp | 10 +++++----- src/core/feedsmodelrecyclebin.cpp | 2 +- src/gui/formsettings.cpp | 4 ++-- src/miscellaneous/settings.cpp | 2 +- src/miscellaneous/settings.h | 12 +++++++++++- 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/core/feedsmodelcategory.cpp b/src/core/feedsmodelcategory.cpp index 66df32ddd..73a23efd6 100755 --- a/src/core/feedsmodelcategory.cpp +++ b/src/core/feedsmodelcategory.cpp @@ -86,9 +86,7 @@ QVariant FeedsModelCategory::data(int column, int role) const { return m_title; } else if (column == FDS_MODEL_COUNTS_INDEX) { - return qApp->settings()->value(APP_CFG_FEEDS, - "count_format", - "(%unread)").toString() + return qApp->settings()->value(APP_CFG_FEEDS, COUNT_FORMAT, DEFAULT_VALUE(COUNT_FORMAT)).toString() .replace("%unread", QString::number(countOfUnreadMessages())) .replace("%all", QString::number(countOfAllMessages())); } diff --git a/src/core/feedsmodelfeed.cpp b/src/core/feedsmodelfeed.cpp index e64678dbb..001a2b380 100755 --- a/src/core/feedsmodelfeed.cpp +++ b/src/core/feedsmodelfeed.cpp @@ -174,7 +174,9 @@ QPair FeedsModelFeed::guessFeed(co QByteArray feed_contents; NetworkResult network_result = NetworkFactory::downloadFeedFile(url, - qApp->settings()->value(APP_CFG_FEEDS, "feed_update_timeout", DOWNLOAD_TIMEOUT).toInt(), + qApp->settings()->value(APP_CFG_FEEDS, + UPDATE_TIMEOUT, + DEFAULT_VALUE(UPDATE_TIMEOUT)).toInt(), feed_contents, !username.isEmpty(), username, @@ -286,9 +288,7 @@ QVariant FeedsModelFeed::data(int column, int role) const { return m_title; } else if (column == FDS_MODEL_COUNTS_INDEX) { - return qApp->settings()->value(APP_CFG_FEEDS, - "count_format", - "(%unread)").toString() + return qApp->settings()->value(APP_CFG_FEEDS, COUNT_FORMAT, DEFAULT_VALUE(COUNT_FORMAT)).toString() .replace("%unread", QString::number(countOfUnreadMessages())) .replace("%all", QString::number(countOfAllMessages())); } @@ -390,7 +390,7 @@ QVariant FeedsModelFeed::data(int column, int role) const { void FeedsModelFeed::update() { QByteArray feed_contents; - int download_timeout = qApp->settings()->value(APP_CFG_FEEDS, "feed_update_timeout", DOWNLOAD_TIMEOUT).toInt(); + int download_timeout = qApp->settings()->value(APP_CFG_FEEDS, UPDATE_TIMEOUT, DEFAULT_VALUE(UPDATE_TIMEOUT)).toInt(); m_networkError = NetworkFactory::downloadFeedFile(url(), download_timeout, feed_contents, passwordProtected(), username(), password()).first; if (m_networkError != QNetworkReply::NoError) { diff --git a/src/core/feedsmodelrecyclebin.cpp b/src/core/feedsmodelrecyclebin.cpp index cecbeca0a..5fabc9d7f 100644 --- a/src/core/feedsmodelrecyclebin.cpp +++ b/src/core/feedsmodelrecyclebin.cpp @@ -62,7 +62,7 @@ QVariant FeedsModelRecycleBin::data(int column, int role) const { return m_title; } else if (column == FDS_MODEL_COUNTS_INDEX) { - return qApp->settings()->value(APP_CFG_FEEDS, "count_format", "(%unread)").toString() + return qApp->settings()->value(APP_CFG_FEEDS, COUNT_FORMAT, DEFAULT_VALUE(COUNT_FORMAT)).toString() .replace("%unread", QString::number(countOfUnreadMessages())) .replace("%all", QString::number(countOfAllMessages())); } diff --git a/src/gui/formsettings.cpp b/src/gui/formsettings.cpp index 9f454ea10..cb5c6d8c0 100755 --- a/src/gui/formsettings.cpp +++ b/src/gui/formsettings.cpp @@ -182,7 +182,7 @@ void FormSettings::loadFeedsMessages() { m_ui->m_checkRemoveReadMessagesOnExit->setChecked(settings->value(APP_CFG_MESSAGES, "clear_read_on_exit", false).toBool()); m_ui->m_checkAutoUpdate->setChecked(settings->value(APP_CFG_FEEDS, "auto_update_enabled", false).toBool()); m_ui->m_spinAutoUpdateInterval->setValue(settings->value(APP_CFG_FEEDS, "auto_update_interval", DEFAULT_AUTO_UPDATE_INTERVAL).toInt()); - m_ui->m_spinFeedUpdateTimeout->setValue(settings->value(APP_CFG_FEEDS, "feed_update_timeout", DOWNLOAD_TIMEOUT).toInt()); + m_ui->m_spinFeedUpdateTimeout->setValue(settings->value(APP_CFG_FEEDS, UPDATE_TIMEOUT, DEFAULT_VALUE(UPDATE_TIMEOUT)).toInt()); m_ui->m_checkUpdateAllFeedsOnStartup->setChecked(settings->value(APP_CFG_FEEDS, "feeds_update_on_startup", false).toBool()); m_ui->m_cmbCountsFeedList->addItems(QStringList() << "(%unread)" << "[%unread]" << "%unread/%all" << "%unread-%all" << "[%unread|%all]"); m_ui->m_cmbCountsFeedList->setEditText(settings->value(APP_CFG_FEEDS, "count_format", "(%unread)").toString()); @@ -216,7 +216,7 @@ void FormSettings::saveFeedsMessages() { settings->setValue(APP_CFG_MESSAGES, "clear_read_on_exit", m_ui->m_checkRemoveReadMessagesOnExit->isChecked()); settings->setValue(APP_CFG_FEEDS, "auto_update_enabled", m_ui->m_checkAutoUpdate->isChecked()); settings->setValue(APP_CFG_FEEDS, "auto_update_interval", m_ui->m_spinAutoUpdateInterval->value()); - settings->setValue(APP_CFG_FEEDS, "feed_update_timeout", m_ui->m_spinFeedUpdateTimeout->value()); + settings->setValue(APP_CFG_FEEDS, UPDATE_TIMEOUT, m_ui->m_spinFeedUpdateTimeout->value()); settings->setValue(APP_CFG_FEEDS, "feeds_update_on_startup", m_ui->m_checkUpdateAllFeedsOnStartup->isChecked()); settings->setValue(APP_CFG_FEEDS, "count_format", m_ui->m_cmbCountsFeedList->currentText()); settings->setValue(APP_CFG_MESSAGES, "use_custom_date", m_ui->m_checkMessagesDateTimeFormat->isChecked()); diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp index 1ebbb0a82..87a6914cd 100755 --- a/src/miscellaneous/settings.cpp +++ b/src/miscellaneous/settings.cpp @@ -31,7 +31,7 @@ Settings::Settings(const QString &file_name, Format format, : QSettings(file_name, format, parent), m_initializationStatus(status) { } -Settings::~Settings() { +Settings::~Settings() { checkSettings(); qDebug("Deleting Settings instance."); } diff --git a/src/miscellaneous/settings.h b/src/miscellaneous/settings.h index 12fef4141..42eff0c23 100755 --- a/src/miscellaneous/settings.h +++ b/src/miscellaneous/settings.h @@ -20,8 +20,19 @@ #include +#include "definitions/definitions.h" + #include +#define DEFAULT_VALUE(x) x##_DEF + +// Feeds. +#define UPDATE_TIMEOUT "feed_update_timeout" +#define UPDATE_TIMEOUT_DEF DOWNLOAD_TIMEOUT + +#define COUNT_FORMAT "count_format" +#define COUNT_FORMAT_DEF "(%unread)" + class Settings : public QSettings { Q_OBJECT @@ -54,7 +65,6 @@ class Settings : public QSettings { QSettings::Status checkSettings(); bool initiateRestoration(const QString &settings_backup_file_path); - static void finishRestoration(const QString &desired_settings_file_path); // Creates settings file in correct location.