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

Fixed #141.

Browse Source
This commit is contained in:
Martin Rotter 2017-10-23 09:41:39 +02:00
parent 1b7c4f68b3
commit f6ed84b4c3
6 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/text/CHANGELOG
View File

@ -1,6 +1,9 @@
3.5.5
—————
Added:
▪ New bindable menu action Messages -> Enable message preview, which can disable opening message preview in internal web viewer. (#141)
Fixed:
▪ Displaying correct update files. (#155)

7
src/gui/dialogs/formmain.cpp
View File

@ -145,6 +145,7 @@ QList<QAction*> FormMain::allActions() const {
actions << m_ui->m_actionTabsPrevious;
actions << m_ui->m_actionOpenSelectedSourceArticlesExternally;
actions << m_ui->m_actionOpenSelectedMessagesInternally;
actions << m_ui->m_actionMessagePreviewEnabled;
actions << m_ui->m_actionMarkAllItemsRead;
actions << m_ui->m_actionMarkSelectedItemsAsRead;
actions << m_ui->m_actionMarkSelectedItemsAsUnread;
@ -539,6 +540,8 @@ void FormMain::loadSize() {
qApp->processEvents();
}
m_ui->m_actionMessagePreviewEnabled->setChecked(settings->value(GROUP(Messages), SETTING(Messages::EnableMessagePreview)).toBool());
// If user exited the application while in fullsreen mode,
// then re-enable it now.
if (settings->value(GROUP(GUI), SETTING(GUI::MainWindowStartsFullscreen)).toBool()) {
@ -629,6 +632,10 @@ void FormMain::createConnections() {
connect(m_ui->m_actionDonate, &QAction::triggered, this, &FormMain::donate);
connect(m_ui->m_actionDisplayWiki, &QAction::triggered, this, &FormMain::showWiki);
connect(m_ui->m_actionMessagePreviewEnabled, &QAction::toggled, [](bool enabled) {
qApp->settings()->setValue(GROUP(Messages), Messages::EnableMessagePreview, enabled);
});
// Tab widget connections.
connect(m_ui->m_actionTabsNext, &QAction::triggered, m_ui->m_tabWidget, &TabWidget::gotoNextTab);
connect(m_ui->m_actionTabsPrevious, &QAction::triggered, m_ui->m_tabWidget, &TabWidget::gotoPreviousTab);

9
src/gui/dialogs/formmain.ui
View File

@ -134,6 +134,7 @@
<addaction name="m_actionOpenSelectedSourceArticlesExternally"/>
<addaction name="m_actionOpenSelectedMessagesInternally"/>
<addaction name="m_actionSendMessageViaEmail"/>
<addaction name="m_actionMessagePreviewEnabled"/>
<addaction name="separator"/>
<addaction name="m_actionSelectNextMessage"/>
<addaction name="m_actionSelectPreviousMessage"/>
@ -735,6 +736,14 @@
<string>Go to &amp;previous tab</string>
</property>
</action>
<action name="m_actionMessagePreviewEnabled">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>&amp;Enable message preview</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>

9
src/gui/feedmessageviewer.cpp
View File

@ -172,7 +172,12 @@ void FeedMessageViewer::toggleShowOnlyUnreadFeeds() {
}
void FeedMessageViewer::displayMessage(const Message& message, RootItem* root) {
m_messagesBrowser->loadMessage(message, root);
if (qApp->settings()->value(GROUP(Messages), SETTING(Messages::EnableMessagePreview)).toBool()) {
m_messagesBrowser->loadMessage(message, root);
}
else {
m_messagesBrowser->hide();
}
}
void FeedMessageViewer::createConnections() {
@ -182,12 +187,10 @@ void FeedMessageViewer::createConnections() {
#if defined(USE_WEBENGINE)
connect(m_messagesView, &MessagesView::currentMessageRemoved, m_messagesBrowser, &WebBrowser::clear);
connect(m_messagesView, &MessagesView::currentMessageChanged, m_messagesBrowser, &WebBrowser::loadMessage);
connect(m_messagesBrowser, &WebBrowser::markMessageRead, m_messagesView->sourceModel(), &MessagesModel::setMessageReadById);
connect(m_messagesBrowser, &WebBrowser::markMessageImportant, m_messagesView->sourceModel(), &MessagesModel::setMessageImportantById);
#else
connect(m_messagesView, &MessagesView::currentMessageRemoved, m_messagesBrowser, &MessagePreviewer::clear);
connect(m_messagesView, &MessagesView::currentMessageChanged, m_messagesBrowser, &MessagePreviewer::loadMessage);
connect(m_messagesBrowser, &MessagePreviewer::markMessageRead, m_messagesView->sourceModel(), &MessagesModel::setMessageReadById);
connect(m_messagesBrowser, &MessagePreviewer::markMessageImportant, m_messagesView->sourceModel(),
&MessagesModel::setMessageImportantById);

4
src/miscellaneous/settings.cpp
View File

@ -61,6 +61,10 @@ DKEY Messages::MessageHeadImageHeight = "message_head_image_height";
DVALUE(int) Messages::MessageHeadImageHeightDef = 36;
DKEY Messages::EnableMessagePreview = "enable_message_preview";
DVALUE(bool) Messages::EnableMessagePreviewDef = true;
DKEY Messages::UseCustomDate = "use_custom_date";
DVALUE(bool) Messages::UseCustomDateDef = false;

4
src/miscellaneous/settings.h
View File

@ -83,6 +83,10 @@ namespace Messages {
VALUE(int) MessageHeadImageHeightDef;
KEY EnableMessagePreview;
VALUE(bool) EnableMessagePreviewDef;
KEY UseCustomDate;
VALUE(bool) UseCustomDateDef;