Some fixes, fixed #114.
This commit is contained in:
parent
24b0b34a50
commit
2b09c72e35
@ -1 +1 @@
|
||||
Subproject commit 572da127bb14842bba6f84e6315a5ecefb44ed07
|
||||
Subproject commit 2305d003830b54d1705a3bc49d3493ec96c59b2d
|
@ -64,7 +64,7 @@ DKEY Messages::RemoveDuplicates = "remove_duplicates";
|
||||
DVALUE(bool) Messages::RemoveDuplicatesDef = false;
|
||||
|
||||
DKEY Messages::PreviewerFontStandard = "previewer_font_standard";
|
||||
DVALUE(QString) Messages::PreviewerFontStandardDef = QWebSettings::globalSettings()->fontFamily(QWebSettings::StandardFont);
|
||||
NON_CONST_DVALUE(QString) Messages::PreviewerFontStandardDef = QString();
|
||||
|
||||
// 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)
|
||||
: QSettings(file_name, format, parent), m_initializationStatus(status) {
|
||||
// Perform last-minute initializations.
|
||||
Messages::PreviewerFontStandardDef = QWebSettings::globalSettings()->fontFamily(QWebSettings::StandardFont);
|
||||
}
|
||||
|
||||
Settings::~Settings() {
|
||||
|
@ -30,7 +30,9 @@
|
||||
#define KEY extern const char*
|
||||
#define DKEY const char*
|
||||
#define VALUE(x) extern const x
|
||||
#define NON_CONST_VALUE(x) extern x
|
||||
#define DVALUE(x) const x
|
||||
#define NON_CONST_DVALUE(x) x
|
||||
#define SETTING(x) x, x##Def
|
||||
#define GROUP(x) x::ID
|
||||
|
||||
@ -74,7 +76,7 @@ namespace Messages {
|
||||
VALUE(bool) RemoveDuplicatesDef;
|
||||
|
||||
KEY PreviewerFontStandard;
|
||||
VALUE(QString) PreviewerFontStandardDef;
|
||||
NON_CONST_VALUE(QString) PreviewerFontStandardDef;
|
||||
}
|
||||
|
||||
// GUI.
|
||||
|
Loading…
x
Reference in New Issue
Block a user