Work on #114.
This commit is contained in:
parent
b8d1952e47
commit
8dfaf913e1
@ -1 +1 @@
|
|||||||
Subproject commit 2305d003830b54d1705a3bc49d3493ec96c59b2d
|
Subproject commit 572da127bb14842bba6f84e6315a5ecefb44ed07
|
@ -88,7 +88,7 @@
|
|||||||
<item row="0" column="1">
|
<item row="0" column="1">
|
||||||
<widget class="QStackedWidget" name="m_stackedSettings">
|
<widget class="QStackedWidget" name="m_stackedSettings">
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>7</number>
|
<number>6</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="m_pageGeneral">
|
<widget class="QWidget" name="m_pageGeneral">
|
||||||
<layout class="QFormLayout" name="formLayout_5">
|
<layout class="QFormLayout" name="formLayout_5">
|
||||||
@ -419,8 +419,8 @@ MySQL backend will automatically use database with name "rssguard". Do
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>100</width>
|
<width>782</width>
|
||||||
<height>30</height>
|
<height>451</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||||
@ -1291,7 +1291,7 @@ MySQL backend will automatically use database with name "rssguard". Do
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QTabWidget" name="m_tabFeedsMessages">
|
<widget class="QTabWidget" name="m_tabFeedsMessages">
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>0</number>
|
<number>1</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="m_tabFeeds">
|
<widget class="QWidget" name="m_tabFeeds">
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
@ -1445,6 +1445,29 @@ MySQL backend will automatically use database with name "rssguard". Do
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</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>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</widget>
|
</widget>
|
||||||
|
@ -140,6 +140,13 @@ void FeedMessageViewer::loadSize() {
|
|||||||
default_msg_section_size).toInt());
|
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() {
|
void FeedMessageViewer::quit() {
|
||||||
// Quit the feeds view (stops auto-update timer etc.).
|
// Quit the feeds view (stops auto-update timer etc.).
|
||||||
m_feedsView->quit();
|
m_feedsView->quit();
|
||||||
|
@ -73,6 +73,8 @@ class FeedMessageViewer : public TabContent {
|
|||||||
void saveSize();
|
void saveSize();
|
||||||
void loadSize();
|
void loadSize();
|
||||||
|
|
||||||
|
void loadMessageViewerFonts();
|
||||||
|
|
||||||
// Destroys worker/feed downloader thread and
|
// Destroys worker/feed downloader thread and
|
||||||
// stops any child widgets/workers.
|
// stops any child widgets/workers.
|
||||||
void quit();
|
void quit();
|
||||||
|
@ -63,6 +63,9 @@ 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";
|
||||||
|
DVALUE(QString) Messages::PreviewerFontStandardDef = QWebSettings::globalSettings()->fontFamily(QWebSettings::StandardFont);
|
||||||
|
|
||||||
// GUI.
|
// GUI.
|
||||||
DKEY GUI::ID = "gui";
|
DKEY GUI::ID = "gui";
|
||||||
|
|
||||||
|
@ -72,6 +72,9 @@ namespace Messages {
|
|||||||
|
|
||||||
KEY RemoveDuplicates;
|
KEY RemoveDuplicates;
|
||||||
VALUE(bool) RemoveDuplicatesDef;
|
VALUE(bool) RemoveDuplicatesDef;
|
||||||
|
|
||||||
|
KEY PreviewerFontStandard;
|
||||||
|
VALUE(QString) PreviewerFontStandardDef;
|
||||||
}
|
}
|
||||||
|
|
||||||
// GUI.
|
// GUI.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user