diff --git a/resources/binaries b/resources/binaries index 2305d0038..572da127b 160000 --- a/resources/binaries +++ b/resources/binaries @@ -1 +1 @@ -Subproject commit 2305d003830b54d1705a3bc49d3493ec96c59b2d +Subproject commit 572da127bb14842bba6f84e6315a5ecefb44ed07 diff --git a/src/gui/dialogs/formsettings.ui b/src/gui/dialogs/formsettings.ui index 669b6bbe0..46b09f48b 100755 --- a/src/gui/dialogs/formsettings.ui +++ b/src/gui/dialogs/formsettings.ui @@ -88,7 +88,7 @@ - 7 + 6 @@ -419,8 +419,8 @@ MySQL backend will automatically use database with name "rssguard". Do 0 0 - 100 - 30 + 782 + 451 @@ -1291,7 +1291,7 @@ MySQL backend will automatically use database with name "rssguard". Do - 0 + 1 @@ -1445,6 +1445,29 @@ MySQL backend will automatically use database with name "rssguard". Do + + + + Internal message browser fonts + + + + + + Standard font + + + + + + + false + + + + + + diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp index a68e35b24..4355a1a21 100755 --- a/src/gui/feedmessageviewer.cpp +++ b/src/gui/feedmessageviewer.cpp @@ -140,6 +140,13 @@ void FeedMessageViewer::loadSize() { default_msg_section_size).toInt()); } +void FeedMessageViewer::loadMessageViewerFonts() { + Settings *settings = qApp->settings(); + QWebSettings *view_settings = m_messagesBrowser->view()->settings(); + + // TODO: Setup fonts. +} + void FeedMessageViewer::quit() { // Quit the feeds view (stops auto-update timer etc.). m_feedsView->quit(); diff --git a/src/gui/feedmessageviewer.h b/src/gui/feedmessageviewer.h index 939c7cebb..67369f24d 100644 --- a/src/gui/feedmessageviewer.h +++ b/src/gui/feedmessageviewer.h @@ -73,6 +73,8 @@ class FeedMessageViewer : public TabContent { void saveSize(); void loadSize(); + void loadMessageViewerFonts(); + // Destroys worker/feed downloader thread and // stops any child widgets/workers. void quit(); diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp index b9ae4c484..f253b954a 100755 --- a/src/miscellaneous/settings.cpp +++ b/src/miscellaneous/settings.cpp @@ -63,6 +63,9 @@ DVALUE(bool) Messages::KeepCursorInCenterDef = false; 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); + // GUI. DKEY GUI::ID = "gui"; diff --git a/src/miscellaneous/settings.h b/src/miscellaneous/settings.h index 021f0ab13..b9fa1a983 100755 --- a/src/miscellaneous/settings.h +++ b/src/miscellaneous/settings.h @@ -72,6 +72,9 @@ namespace Messages { KEY RemoveDuplicates; VALUE(bool) RemoveDuplicatesDef; + + KEY PreviewerFontStandard; + VALUE(QString) PreviewerFontStandardDef; } // GUI.