pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More work on fonts - loading/saving.

Browse source
This commit is contained in:
Martin Rotter 2015-07-12 19:38:14 +02:00
parent 8dfaf913e1
commit 24b0b34a50
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gui/dialogs/formsettings.cpp
View file

@ -254,6 +254,9 @@ void FormSettings::loadFeedsMessages() {
if (index_format >= 0) { if (index_format >= 0) {
m_ui->m_cmbMessagesDateTimeFormat->setCurrentIndex(index_format); m_ui->m_cmbMessagesDateTimeFormat->setCurrentIndex(index_format);
} }
m_ui->m_cmbMessageFontStandard->setCurrentIndex(m_ui->m_cmbMessageFontStandard->findText(settings->value(GROUP(Messages),
SETTING(Messages::PreviewerFontStandard)).toString()));
} }
void FormSettings::initializeMessageDateFormats() { void FormSettings::initializeMessageDateFormats() {
@ -283,6 +286,10 @@ void FormSettings::saveFeedsMessages() {
m_ui->m_cmbMessagesDateTimeFormat->itemData(m_ui->m_cmbMessagesDateTimeFormat->currentIndex()).toString()); m_ui->m_cmbMessagesDateTimeFormat->itemData(m_ui->m_cmbMessagesDateTimeFormat->currentIndex()).toString());
settings->setValue(GROUP(Messages), Messages::RemoveDuplicates, m_ui->m_checkRemoveDuplicateMessages->isChecked()); settings->setValue(GROUP(Messages), Messages::RemoveDuplicates, m_ui->m_checkRemoveDuplicateMessages->isChecked());
// Save fonts.
settings->setValue(GROUP(Messages), Messages::PreviewerFontStandard, m_ui->m_cmbMessageFontStandard->currentFont().family());
qApp->mainForm()->tabWidget()->feedMessageViewer()->loadMessageViewerFonts();
qApp->mainForm()->tabWidget()->feedMessageViewer()->feedsView()->updateAutoUpdateStatus(); qApp->mainForm()->tabWidget()->feedMessageViewer()->feedsView()->updateAutoUpdateStatus();
qApp->mainForm()->tabWidget()->feedMessageViewer()->feedsView()->sourceModel()->reloadWholeLayout(); qApp->mainForm()->tabWidget()->feedMessageViewer()->feedsView()->sourceModel()->reloadWholeLayout();
qApp->mainForm()->tabWidget()->feedMessageViewer()->messagesView()->sourceModel()->updateDateFormat(); qApp->mainForm()->tabWidget()->feedMessageViewer()->messagesView()->sourceModel()->updateDateFormat();

10
src/gui/dialogs/formsettings.ui
View file

@ -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>782</width> <width>100</width>
<height>451</height> <height>30</height>
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
@ -497,8 +497,8 @@ MySQL backend will automatically use database with name &quot;rssguard&quot;. Do
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>776</width> <width>167</width>
<height>425</height> <height>219</height>
</rect> </rect>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
@ -1459,7 +1459,7 @@ MySQL backend will automatically use database with name &quot;rssguard&quot;. Do
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QFontComboBox" name="fontComboBox"> <widget class="QFontComboBox" name="m_cmbMessageFontStandard">
<property name="editable"> <property name="editable">
<bool>false</bool> <bool>false</bool>
</property> </property>

4
src/gui/feedmessageviewer.cpp
View file

@ -70,6 +70,7 @@ FeedMessageViewer::FeedMessageViewer(QWidget *parent)
m_dbCleaner(NULL) { m_dbCleaner(NULL) {
initialize(); initialize();
initializeViews(); initializeViews();
loadMessageViewerFonts();
createConnections(); createConnections();
// Now, update all feeds if user has set it. // Now, update all feeds if user has set it.
@ -144,7 +145,8 @@ void FeedMessageViewer::loadMessageViewerFonts() {
Settings *settings = qApp->settings(); Settings *settings = qApp->settings();
QWebSettings *view_settings = m_messagesBrowser->view()->settings(); QWebSettings *view_settings = m_messagesBrowser->view()->settings();
// TODO: Setup fonts. view_settings->setFontFamily(QWebSettings::StandardFont, settings->value(GROUP(Messages),
SETTING(Messages::PreviewerFontStandard)).toString());
} }
void FeedMessageViewer::quit() { void FeedMessageViewer::quit() {