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

Some fixes, fixed #114.

Browse Source
This commit is contained in:
Martin Rotter 2015-07-13 06:39:08 +02:00
parent 24b0b34a50
commit 2b09c72e35
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/binaries

@ -1 +1 @@
Subproject commit 572da127bb14842bba6f84e6315a5ecefb44ed07 Subproject commit 2305d003830b54d1705a3bc49d3493ec96c59b2d

6
src/miscellaneous/settings.cpp
View File

@ -63,8 +63,8 @@ DVALUE(bool) Messages::KeepCursorInCenterDef = false;
DKEY Messages::RemoveDuplicates = "remove_duplicates"; DKEY Messages::RemoveDuplicates = "remove_duplicates";
DVALUE(bool) Messages::RemoveDuplicatesDef = false; DVALUE(bool) Messages::RemoveDuplicatesDef = false;
DKEY Messages::PreviewerFontStandard = "previewer_font_standard"; DKEY Messages::PreviewerFontStandard = "previewer_font_standard";
DVALUE(QString) Messages::PreviewerFontStandardDef = QWebSettings::globalSettings()->fontFamily(QWebSettings::StandardFont); NON_CONST_DVALUE(QString) Messages::PreviewerFontStandardDef = QString();
// GUI. // GUI.
DKEY GUI::ID = "gui"; DKEY GUI::ID = "gui";
@ -282,6 +282,8 @@ DKEY Categories::ID = "categories_expand_states";
Settings::Settings(const QString &file_name, Format format, const SettingsProperties::SettingsType &status, QObject *parent) Settings::Settings(const QString &file_name, Format format, const SettingsProperties::SettingsType &status, QObject *parent)
: QSettings(file_name, format, parent), m_initializationStatus(status) { : QSettings(file_name, format, parent), m_initializationStatus(status) {
// Perform last-minute initializations.
Messages::PreviewerFontStandardDef = QWebSettings::globalSettings()->fontFamily(QWebSettings::StandardFont);
} }
Settings::~Settings() { Settings::~Settings() {

4
src/miscellaneous/settings.h
View File

@ -30,7 +30,9 @@
#define KEY extern const char* #define KEY extern const char*
#define DKEY const char* #define DKEY const char*
#define VALUE(x) extern const x #define VALUE(x) extern const x
#define NON_CONST_VALUE(x) extern x
#define DVALUE(x) const x #define DVALUE(x) const x
#define NON_CONST_DVALUE(x) x
#define SETTING(x) x, x##Def #define SETTING(x) x, x##Def
#define GROUP(x) x::ID #define GROUP(x) x::ID
@ -74,7 +76,7 @@ namespace Messages {
VALUE(bool) RemoveDuplicatesDef; VALUE(bool) RemoveDuplicatesDef;
KEY PreviewerFontStandard; KEY PreviewerFontStandard;
VALUE(QString) PreviewerFontStandardDef; NON_CONST_VALUE(QString) PreviewerFontStandardDef;
} }
// GUI. // GUI.