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

Work on #114.

Browse Source
This commit is contained in:
Martin Rotter 2015-07-12 13:58:22 +02:00
parent b8d1952e47
commit 8dfaf913e1
6 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/binaries

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

31
src/gui/dialogs/formsettings.ui
View File

@ -88,7 +88,7 @@
<item row="0" column="1">
<widget class="QStackedWidget" name="m_stackedSettings">
<property name="currentIndex">
<number>7</number>
<number>6</number>
</property>
<widget class="QWidget" name="m_pageGeneral">
<layout class="QFormLayout" name="formLayout_5">
@ -419,8 +419,8 @@ MySQL backend will automatically use database with name &quot;rssguard&quot;. Do
<rect>
<x>0</x>
<y>0</y>
<width>100</width>
<height>30</height>
<width>782</width>
<height>451</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
@ -1291,7 +1291,7 @@ MySQL backend will automatically use database with name &quot;rssguard&quot;. Do
<item>
<widget class="QTabWidget" name="m_tabFeedsMessages">
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="m_tabFeeds">
<attribute name="title">
@ -1445,6 +1445,29 @@ MySQL backend will automatically use database with name &quot;rssguard&quot;. Do
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<string>Internal message browser fonts</string>
</property>
<layout class="QFormLayout" name="formLayout_24">
<item row="0" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>Standard font</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QFontComboBox" name="fontComboBox">
<property name="editable">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>

7
src/gui/feedmessageviewer.cpp
View File

@ -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();

2
src/gui/feedmessageviewer.h
View File

@ -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();

3
src/miscellaneous/settings.cpp
View File

@ -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";

3
src/miscellaneous/settings.h
View File

@ -72,6 +72,9 @@ namespace Messages {
KEY RemoveDuplicates;
VALUE(bool) RemoveDuplicatesDef;
KEY PreviewerFontStandard;
VALUE(QString) PreviewerFontStandardDef;
}
// GUI.