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

Add new setting for disabled feeds: Strikethrough (#1651)

Browse source 
Co-authored-by: martinrotter <martinrotter@users.noreply.github.com>
This commit is contained in:
رشيد 2025-02-28 11:53:25 +00:00 • committed by GitHub
parent 67c55c8ef8
commit 5427272db8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/librssguard/core/feedsmodel.cpp
View file

@ -554,14 +554,12 @@ QVariant FeedsModel::data(const QModelIndex& index, int role) const {
case Qt::ItemDataRole::FontRole: {
RootItem* it = itemForIndex(index);
bool is_bold = it->countOfUnreadMessages() > 0;
bool is_striked = it->kind() == RootItem::Kind::Feed ? it->toFeed()->isSwitchedOff() : false;
bool is_striked = it->kind() == RootItem::Kind::Feed &&
qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::StrikethroughDisabledFeeds)).toBool() &&
qobject_cast<Feed*>(it)->isSwitchedOff();
if (is_bold) {
return is_striked ? m_boldStrikedFont : m_boldFont;
}
else {
return is_striked ? m_normalStrikedFont : m_normalFont;
}
return is_bold ? (is_striked ? m_boldStrikedFont : m_boldFont)
: (is_striked ? m_normalStrikedFont : m_normalFont);
}
case Qt::ItemDataRole::DecorationRole: {

4
src/librssguard/gui/settings/settingsfeedsmessages.cpp
View file

@ -207,6 +207,7 @@ SettingsFeedsMessages::SettingsFeedsMessages(Settings* settings, QWidget* parent
this,
&SettingsFeedsMessages::dirtifySettings);
connect(m_ui->m_checkShowTooltips, &QCheckBox::toggled, this, &SettingsFeedsMessages::dirtifySettings);
connect(m_ui->m_cbStrikethroughDisabledFeeds, &QCheckBox::toggled, this, &SettingsFeedsMessages::dirtifySettings);
connect(m_ui->m_checkMultilineArticleList, &QCheckBox::toggled, this, &SettingsFeedsMessages::dirtifySettings);
connect(m_ui->m_checkMultilineArticleList, &QCheckBox::toggled, this, &SettingsFeedsMessages::requireRestart);
@ -352,6 +353,8 @@ void SettingsFeedsMessages::loadSettings() {
m_ui->m_cmbCountsFeedList->setEditText(settings()->value(GROUP(Feeds), SETTING(Feeds::CountFormat)).toString());
m_ui->m_checkShowTooltips
->setChecked(settings()->value(GROUP(Feeds), SETTING(Feeds::EnableTooltipsFeedsMessages)).toBool());
m_ui->m_cbStrikethroughDisabledFeeds
->setChecked(settings()->value(GROUP(Feeds), SETTING(Feeds::StrikethroughDisabledFeeds)).toBool());
m_ui->m_cmbIgnoreContentsChanges
->setChecked(settings()->value(GROUP(Messages), SETTING(Messages::IgnoreContentsChanges)).toBool());
m_ui->m_checkMultilineArticleList
@ -489,6 +492,7 @@ void SettingsFeedsMessages::saveSettings() {
settings()->setValue(GROUP(Feeds), Feeds::FeedsUpdateStartupDelay, m_ui->m_spinStartupUpdateDelay->value());
settings()->setValue(GROUP(Feeds), Feeds::CountFormat, m_ui->m_cmbCountsFeedList->currentText());
settings()->setValue(GROUP(Feeds), Feeds::EnableTooltipsFeedsMessages, m_ui->m_checkShowTooltips->isChecked());
settings()->setValue(GROUP(Feeds), Feeds::StrikethroughDisabledFeeds, m_ui->m_cbStrikethroughDisabledFeeds->isChecked());
settings()->setValue(GROUP(Messages), Messages::IgnoreContentsChanges, m_ui->m_cmbIgnoreContentsChanges->isChecked());
settings()->setValue(GROUP(Messages), Messages::MultilineArticleList, m_ui->m_checkMultilineArticleList->isChecked());
settings()->setValue(GROUP(Messages),

8
src/librssguard/gui/settings/settingsfeedsmessages.ui
View file

@ -266,6 +266,13 @@
</property>
</widget>
</item>
<item row="9" column="0" colspan="2">
<widget class="QCheckBox" name="m_cbStrikethroughDisabledFeeds">
<property name="text">
<string>Strikethrough disabled feed titles</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="m_cbUpdateFeedListDuringFetching">
<property name="text">
@ -727,6 +734,7 @@
<tabstop>m_cbUpdateFeedListDuringFetching</tabstop>
<tabstop>m_cbListsRestrictedShortcuts</tabstop>
<tabstop>m_checkShowTooltips</tabstop>
<tabstop>m_cbStrikethroughDisabledFeeds</tabstop>
<tabstop>m_checkRemoveReadMessagesOnExit</tabstop>
<tabstop>m_cbArticleViewerAlwaysVisible</tabstop>
<tabstop>m_cmbIgnoreContentsChanges</tabstop>

3
src/librssguard/miscellaneous/settings.cpp
View file

@ -100,6 +100,9 @@ DVALUE(char*) Feeds::CountFormatDef = "(%unread)";
DKEY Feeds::EnableTooltipsFeedsMessages = "show_tooltips";
DVALUE(bool) Feeds::EnableTooltipsFeedsMessagesDef = true;
DKEY Feeds::StrikethroughDisabledFeeds = "strikethrough_disabled_feeds";
DVALUE(bool) Feeds::StrikethroughDisabledFeedsDef = false;
DKEY Feeds::PauseFeedFetching = "pause_feed_fetching";
DVALUE(bool) Feeds::PauseFeedFetchingDef = false;

3
src/librssguard/miscellaneous/settings.h
View file

@ -98,6 +98,9 @@ namespace Feeds {
KEY EnableTooltipsFeedsMessages;
VALUE(bool) EnableTooltipsFeedsMessagesDef;
KEY StrikethroughDisabledFeeds;
VALUE(bool) StrikethroughDisabledFeedsDef;
KEY PauseFeedFetching;
VALUE(bool) PauseFeedFetchingDef;