FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grrrrr

Browse Source
This commit is contained in:
Martin Rotter 2014-11-08 21:49:38 +01:00
parent 4a75f13e68
commit 05f2e28984
3 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/feedstoolbar.cpp
View File

@ -53,10 +53,8 @@ void FeedsToolBar::saveChangeableActions(const QStringList &actions) {
}
void FeedsToolBar::loadChangeableActions() {
QStringList action_names = qApp->settings()->value(GROUP(GUI),
"feeds_toolbar",
"m_actionUpdateAllFeeds,m_actionMarkAllFeedsRead").toString().split(',',
QString::SkipEmptyParts);
QStringList action_names = qApp->settings()->value(GROUP(GUI), SETTING(GUI::FeedsToolbarActions)).toString().split(',',
QString::SkipEmptyParts);
loadChangeableActions(action_names);
}

6
src/gui/feedsview.cpp
View File

@ -77,9 +77,9 @@ void FeedsView::quit() {
void FeedsView::updateAutoUpdateStatus() {
// Restore global intervals.
// NOTE: Specific per-feed interval are left intact.
m_globalAutoUpdateInitialInterval = qApp->settings()->value(GROUP(Feeds), "auto_update_interval", DEFAULT_AUTO_UPDATE_INTERVAL).toInt();
m_globalAutoUpdateInitialInterval = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::AutoUpdateInterval)).toInt();
m_globalAutoUpdateRemainingInterval = m_globalAutoUpdateInitialInterval;
m_globalAutoUpdateEnabled = qApp->settings()->value(GROUP(Feeds), "auto_update_enabled", false).toBool();
m_globalAutoUpdateEnabled = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::AutoUpdateEnabled)).toBool();
// Start global auto-update timer if it is not running yet.
// NOTE: The timer must run even if global auto-update
@ -170,7 +170,7 @@ void FeedsView::updateAllFeeds() {
}
void FeedsView::updateAllFeedsOnStartup() {
if (qApp->settings()->value(GROUP(Feeds), "feeds_update_on_startup", false).toBool()) {
if (qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::FeedsUpdateOnStartup)).toBool()) {
qDebug("Requesting update for all feeds on application startup.");
QTimer::singleShot(STARTUP_UPDATE_DELAY, this, SLOT(updateAllFeeds()));
}

48
src/miscellaneous/settings.h
View File

@ -31,18 +31,27 @@
// Feeds.
namespace Feeds {
KEY ID = "feeds";
KEY ID = "feeds";
KEY UpdateTimeout = "feed_update_timeout";
VALUE(int) UpdateTimeoutDef = DOWNLOAD_TIMEOUT;
KEY UpdateTimeout = "feed_update_timeout";
VALUE(int) UpdateTimeoutDef = DOWNLOAD_TIMEOUT;
KEY CountFormat = "count_format";
VALUE(char*) CountFormatDef = "(%unread)";
KEY CountFormat = "count_format";
VALUE(char*) CountFormatDef = "(%unread)";
KEY AutoUpdateInterval = "auto_update_interval";
VALUE(int) AutoUpdateIntervalDef = DEFAULT_AUTO_UPDATE_INTERVAL;
KEY AutoUpdateEnabled = "auto_update_enabled";
VALUE(bool) AutoUpdateEnabledDef = false;
KEY FeedsUpdateOnStartup = "feeds_update_on_startup";
VALUE(bool) FeedsUpdateOnStartupDef = false;
}
// Messages.
namespace Messages {
KEY ID = "messages";
KEY ID = "messages";
KEY UseCustomDate = "use_custom_date";
VALUE(bool) UseCustomDateDef = false;
@ -56,46 +65,49 @@ namespace Messages {
// GUI.
namespace GUI {
KEY ID = "gui";
KEY ID = "gui";
KEY SplitterFeeds = "splitter_feeds";
VALUE(char*) SplitterFeedsDef = "";
KEY SplitterFeeds = "splitter_feeds";
VALUE(char*) SplitterFeedsDef = "";
KEY SplitterMessages = "splitter_messages";
VALUE(char*) SplitterMessagesDef = "";
KEY SplitterMessages = "splitter_messages";
VALUE(char*) SplitterMessagesDef = "";
KEY ToolbarStyle = "toolbar_style";
KEY ToolbarStyle = "toolbar_style";
VALUE(Qt::ToolButtonStyle) ToolbarStyleDef = Qt::ToolButtonIconOnly;
KEY FeedsToolbarActions = "feeds_toolbar";
VALUE(char*) FeedsToolbarActionsDef = "m_actionUpdateAllFeeds,m_actionMarkAllFeedsRead";
}
// General.
namespace General {
KEY ID = "main";
KEY ID = "main";
}
// Proxy.
namespace Proxy {
KEY ID = "proxy";
KEY ID = "proxy";
}
// Database.
namespace Database {
KEY ID = "database";
KEY ID = "database";
}
// Keyboard.
namespace Keyboard {
KEY ID = "keyboard";
KEY ID = "keyboard";
}
// Web browser.
namespace Browser {
KEY ID = "browser";
KEY ID = "browser";
}
// Categories.
namespace Categories {
KEY ID = "categories_expand_states";
KEY ID = "categories_expand_states";
}