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

add only read option to article filtering

Browse Source
This commit is contained in:
Martin Rotter 2024-12-10 09:57:14 +01:00
parent 8ebefbfea4
commit 9326418478
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -158,6 +158,12 @@ if(NOT OS2)
list(APPEND QT_COMPONENTS Multimedia) list(APPEND QT_COMPONENTS Multimedia)
endif() endif()
if(MINGW AND NO_LITE)
message(WARNING "MinGW can only compile lite version of RSS Guard. Switching to it.")
set(NO_LITE OFF)
endif()
if(ENABLE_MEDIAPLAYER_QTMULTIMEDIA AND ENABLE_MEDIAPLAYER_LIBMPV) if(ENABLE_MEDIAPLAYER_QTMULTIMEDIA AND ENABLE_MEDIAPLAYER_LIBMPV)
message(FATAL_ERROR "You can only enable 1 media player backend.") message(FATAL_ERROR "You can only enable 1 media player backend.")
endif() endif()

8
src/librssguard/core/messagesproxymodel.cpp
View File

@ -36,6 +36,10 @@ void MessagesProxyModel::initializeFilters() {
return !m_sourceModel->data(msg_row_index, MSG_DB_READ_INDEX, Qt::ItemDataRole::EditRole).toBool(); return !m_sourceModel->data(msg_row_index, MSG_DB_READ_INDEX, Qt::ItemDataRole::EditRole).toBool();
}; };
m_filters[MessageListFilter::ShowRead] = [this](int msg_row_index) {
return m_sourceModel->data(msg_row_index, MSG_DB_READ_INDEX, Qt::ItemDataRole::EditRole).toBool();
};
m_filters[MessageListFilter::ShowImportant] = [this](int msg_row_index) { m_filters[MessageListFilter::ShowImportant] = [this](int msg_row_index) {
return m_sourceModel->data(msg_row_index, MSG_DB_IMPORTANT_INDEX, Qt::ItemDataRole::EditRole).toBool(); return m_sourceModel->data(msg_row_index, MSG_DB_IMPORTANT_INDEX, Qt::ItemDataRole::EditRole).toBool();
}; };
@ -235,8 +239,8 @@ int MessagesProxyModel::additionalArticleId() const {
return m_additionalArticleId; return m_additionalArticleId;
} }
void MessagesProxyModel::setAdditionalArticleId(int newAdditionalArticleId) { void MessagesProxyModel::setAdditionalArticleId(int additional_article_id) {
m_additionalArticleId = newAdditionalArticleId; m_additionalArticleId = additional_article_id;
} }
void MessagesProxyModel::setMessageListFilter(MessageListFilter filter) { void MessagesProxyModel::setMessageListFilter(MessageListFilter filter) {

5
src/librssguard/core/messagesproxymodel.h
View File

@ -25,7 +25,8 @@ class MessagesProxyModel : public QSortFilterProxyModel {
ShowThisWeek = 128, ShowThisWeek = 128,
ShowLastWeek = 256, ShowLastWeek = 256,
ShowOnlyWithAttachments = 512, ShowOnlyWithAttachments = 512,
ShowOnlyWithScore = 1024 ShowOnlyWithScore = 1024,
ShowRead = 2048
}; };
explicit MessagesProxyModel(MessagesModel* source_model, QObject* parent = nullptr); explicit MessagesProxyModel(MessagesModel* source_model, QObject* parent = nullptr);
@ -53,7 +54,7 @@ class MessagesProxyModel : public QSortFilterProxyModel {
virtual void sort(int column, Qt::SortOrder order = Qt::AscendingOrder); virtual void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
int additionalArticleId() const; int additionalArticleId() const;
void setAdditionalArticleId(int newAdditionalArticleId); void setAdditionalArticleId(int additional_article_id);
private: private:
void initializeFilters(); void initializeFilters();

5
src/librssguard/gui/toolbars/messagestoolbar.cpp
View File

@ -277,6 +277,11 @@ void MessagesToolBar::initializeHighlighter() {
tr("Show unread articles"), tr("Show unread articles"),
QVariant::fromValue(MessagesProxyModel::MessageListFilter::ShowUnread), QVariant::fromValue(MessagesProxyModel::MessageListFilter::ShowUnread),
QSL("show_unread")); QSL("show_unread"));
addActionToMenu(m_menuMessageFilter,
qApp->icons()->fromTheme(QSL("mail-mark-read")),
tr("Show read articles"),
QVariant::fromValue(MessagesProxyModel::MessageListFilter::ShowRead),
QSL("show_read"));
addActionToMenu(m_menuMessageFilter, addActionToMenu(m_menuMessageFilter,
qApp->icons()->fromTheme(QSL("mail-mark-important")), qApp->icons()->fromTheme(QSL("mail-mark-important")),
tr("Show important articles"), tr("Show important articles"),