FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2025-02-04 11:17:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Browser of msgs now respects font settings.

Browse Source
This commit is contained in:
Martin Rotter 2016-06-08 08:54:00 +02:00
parent b23520d703
commit 975f52882a
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/skins/base/vergilius.xml
View File

File diff suppressed because one or more lines are too long

2
src/gui/messagebrowser.cpp
View File

@ -63,6 +63,8 @@ void MessageBrowser::loadMessages(const QList<Message> &messages) {
setEnabled(false); setEnabled(false);
setHtml(layout_wrapper, QUrl(INTERNAL_URL_MESSAGE)); setHtml(layout_wrapper, QUrl(INTERNAL_URL_MESSAGE));
setEnabled(previously_enabled); setEnabled(previously_enabled);
IOFactory::writeTextFile("aa.html", layout_wrapper.toUtf8());
} }
void MessageBrowser::loadMessage(const Message &message) { void MessageBrowser::loadMessage(const Message &message) {

2
src/gui/messagepreviewer.cpp
View File

@ -52,6 +52,8 @@ void MessagePreviewer::reloadFontSettings() {
fon.fromString(qApp->settings()->value(GROUP(Messages), fon.fromString(qApp->settings()->value(GROUP(Messages),
SETTING(Messages::PreviewerFontStandard)).toString()); SETTING(Messages::PreviewerFontStandard)).toString());
auto aa = fon.family();
QWebEngineSettings::globalSettings()->setFontFamily(QWebEngineSettings::StandardFont, fon.family()); QWebEngineSettings::globalSettings()->setFontFamily(QWebEngineSettings::StandardFont, fon.family());
QWebEngineSettings::globalSettings()->setFontSize(QWebEngineSettings::DefaultFontSize, fon.pointSize()); QWebEngineSettings::globalSettings()->setFontSize(QWebEngineSettings::DefaultFontSize, fon.pointSize());
} }

4
src/miscellaneous/settings.cpp
View File

@ -62,7 +62,7 @@ DKEY Messages::KeepCursorInCenter = "keep_cursor_center";
DVALUE(bool) Messages::KeepCursorInCenterDef = false; DVALUE(bool) Messages::KeepCursorInCenterDef = false;
DKEY Messages::PreviewerFontStandard = "previewer_font_standard"; DKEY Messages::PreviewerFontStandard = "previewer_font_standard";
NON_CONST_DVALUE(QString) Messages::PreviewerFontStandardDef = QFont().toString(); NON_CONST_DVALUE(QString) Messages::PreviewerFontStandardDef = QFont(QFont().family(), 12).toString();
// GUI. // GUI.
DKEY GUI::ID = "gui"; DKEY GUI::ID = "gui";
@ -257,8 +257,6 @@ DKEY CategoriesExpandStates::ID = "categories_expand_sta
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 = qApp->font().family();
} }
Settings::~Settings() { Settings::~Settings() {