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

fix bad GUI in feed edit dialog when some article limit is set

Browse Source
This commit is contained in:
Martin Rotter 2024-01-19 13:33:28 +01:00
parent 9439d775e2
commit d8180eb68f
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/librssguard/gui/reusable/articleamountcontrol.cpp
View File

@ -83,18 +83,24 @@ void ArticleAmountControl::setForAppWideFeatures(bool app_wide, bool batch_edit)
} }
} }
void ArticleAmountControl::load(const Feed::ArticleIgnoreLimit& setup) { void ArticleAmountControl::load(const Feed::ArticleIgnoreLimit& setup, bool always_avoid) {
// Ignoring articles. // Ignoring articles.
if (setup.m_dtToAvoid.isValid() && setup.m_dtToAvoid.toMSecsSinceEpoch() > 0) { if (setup.m_dtToAvoid.isValid() && setup.m_dtToAvoid.toMSecsSinceEpoch() > 0) {
m_ui.m_rbAvoidAbsolute->setChecked(true); m_ui.m_rbAvoidAbsolute->setChecked(true);
m_ui.m_dtDateTimeToAvoid->setDateTime(setup.m_dtToAvoid); m_ui.m_dtDateTimeToAvoid->setDateTime(setup.m_dtToAvoid);
} }
else { else if (setup.m_hoursToAvoid > 0) {
m_ui.m_rbAvoidRelative->setChecked(true); m_ui.m_rbAvoidRelative->setChecked(true);
m_ui.m_spinHoursAvoid->setValue(setup.m_hoursToAvoid); m_ui.m_spinHoursAvoid->setValue(setup.m_hoursToAvoid);
} }
m_ui.m_gbAvoidOldArticles->setChecked(setup.m_avoidOldArticles); if (always_avoid) {
m_ui.m_gbAvoidOldArticles->setChecked(m_ui.m_rbAvoidAbsolute->isChecked() || m_ui.m_rbAvoidRelative->isChecked());
}
else {
m_ui.m_gbAvoidOldArticles->setChecked(setup.m_avoidOldArticles);
}
m_ui.m_cbAddAnyDateArticles->setChecked(setup.m_addAnyArticlesToDb); m_ui.m_cbAddAnyDateArticles->setChecked(setup.m_addAnyArticlesToDb);
// Limitting articles. // Limitting articles.

2
src/librssguard/gui/reusable/articleamountcontrol.h
View File

@ -19,7 +19,7 @@ class ArticleAmountControl : public QWidget {
void setForAppWideFeatures(bool app_wide, bool batch_edit); void setForAppWideFeatures(bool app_wide, bool batch_edit);
void load(const Feed::ArticleIgnoreLimit& setup); void load(const Feed::ArticleIgnoreLimit& setup, bool always_avoid = false);
Feed::ArticleIgnoreLimit save() const; Feed::ArticleIgnoreLimit save() const;
void saveFeed(Feed* fd, bool batch_edit) const; void saveFeed(Feed* fd, bool batch_edit) const;

2
src/librssguard/services/abstract/gui/formfeeddetails.cpp
View File

@ -164,7 +164,7 @@ void FormFeedDetails::loadFeedData() {
art_limit.m_moveToBinDontPurge = false; art_limit.m_moveToBinDontPurge = false;
*/ */
m_ui.m_wdgArticleLimiting->load(art_limit); m_ui.m_wdgArticleLimiting->load(art_limit, true);
} }
void FormFeedDetails::acceptIfPossible() { void FormFeedDetails::acceptIfPossible() {