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

close article list notification if only one article is there and is opened

Browse Source
This commit is contained in:
Martin Rotter 2023-10-25 09:20:15 +02:00
parent 151a883210
commit 55c2da5ae4
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
localization/rssguard_en.ts
View File

@ -7132,42 +7132,42 @@ Post-processing script: %3</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/librssguard/services/standard/standardfeed.cpp" line="178"/> <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="181"/>
<source>Script</source> <source>Script</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/librssguard/services/standard/standardfeed.cpp" line="181"/> <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="184"/>
<source>Local file</source> <source>Local file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/librssguard/services/standard/standardfeed.cpp" line="184"/> <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="187"/>
<source>Unknown</source> <source>Unknown</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/librssguard/services/standard/standardfeed.cpp" line="217"/> <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="220"/>
<source>Cannot save data for feed: %1</source> <source>Cannot save data for feed: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/librssguard/services/standard/standardfeed.cpp" line="375"/> <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="378"/>
<source>Cannot move feed, detailed information was logged via debug log.</source> <source>Cannot move feed, detailed information was logged via debug log.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/librssguard/services/standard/standardfeed.cpp" line="216"/> <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="219"/>
<source>Cannot save feed data</source> <source>Cannot save feed data</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/librssguard/services/standard/standardfeed.cpp" line="336"/> <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="339"/>
<source>feed format not recognized</source> <source>feed format not recognized</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/librssguard/services/standard/standardfeed.cpp" line="374"/> <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="377"/>
<source>Cannot move feed</source> <source>Cannot move feed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

10
src/librssguard/gui/notifications/articlelistnotification.cpp
View File

@ -88,6 +88,11 @@ void ArticleListNotification::loadResults(const QHash<Feed*, QList<Message>>& ne
void ArticleListNotification::openArticleInArticleList() { void ArticleListNotification::openArticleInArticleList() {
emit openingArticleInArticleListRequested(m_ui.m_cmbFeeds->currentData().value<Feed*>(), selectedMessage()); emit openingArticleInArticleListRequested(m_ui.m_cmbFeeds->currentData().value<Feed*>(), selectedMessage());
if (m_newMessages.size() == 1 && m_newMessages.value(m_newMessages.keys().at(0)).size() == 1) {
// We only have 1 message in 1 feed.
emit closeRequested(this);
}
} }
void ArticleListNotification::onMessageSelected(const QModelIndex& current, const QModelIndex& previous) { void ArticleListNotification::onMessageSelected(const QModelIndex& current, const QModelIndex& previous) {
@ -118,6 +123,11 @@ void ArticleListNotification::openArticleInWebBrowser() {
emit reloadMessageListRequested(false); emit reloadMessageListRequested(false);
qApp->web()->openUrlInExternalBrowser(msg.m_url); qApp->web()->openUrlInExternalBrowser(msg.m_url);
if (m_newMessages.size() == 1 && m_newMessages.value(m_newMessages.keys().at(0)).size() == 1) {
// We only have 1 message in 1 feed.
emit closeRequested(this);
}
} }
void ArticleListNotification::markAllRead() { void ArticleListNotification::markAllRead() {

5
src/librssguard/services/standard/standardfeed.cpp
View File

@ -84,7 +84,10 @@ bool StandardFeed::editViaGui() {
{}, {},
qApp->mainFormWidget())); qApp->mainFormWidget()));
form_pointer->addEditFeed(this); if (form_pointer->addEditFeed(this) != nullptr) {
setLastEtag({});
}
return false; return false;
} }