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

Fixed unread batch marking + feed extended selections.

Browse source
This commit is contained in:
Martin Rotter 2013-12-17 21:26:14 +01:00
parent 010dd24e4b
commit e0e58dce96
3 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gui/feedsview.cpp
View file

@ -49,8 +49,7 @@ void FeedsView::setupAppearance() {
void FeedsView::selectionChanged(const QItemSelection &selected, void FeedsView::selectionChanged(const QItemSelection &selected,
const QItemSelection &deselected) { const QItemSelection &deselected) {
Q_UNUSED(selected) QTreeView::selectionChanged(selected, deselected);
Q_UNUSED(deselected)
QModelIndexList selection = selectionModel()->selectedRows(); QModelIndexList selection = selectionModel()->selectedRows();
QModelIndexList mapped_selection = m_proxyModel->mapListToSource(selection); QModelIndexList mapped_selection = m_proxyModel->mapListToSource(selection);

29
src/gui/messagesview.cpp
View file

@ -13,7 +13,7 @@
MessagesView::MessagesView(QWidget *parent) MessagesView::MessagesView(QWidget *parent)
: QTreeView(parent), m_contextMenu(NULL) { : QTreeView(parent), m_contextMenu(NULL), m_batchUnreadSwitch(false) {
m_proxyModel = new MessagesProxyModel(this); m_proxyModel = new MessagesProxyModel(this);
m_sourceModel = m_proxyModel->sourceModel(); m_sourceModel = m_proxyModel->sourceModel();
@ -167,14 +167,17 @@ void MessagesView::currentChanged(const QModelIndex &current,
current.row(), current.column(), current.row(), current.column(),
mapped_current_index.row(), mapped_current_index.column()); mapped_current_index.row(), mapped_current_index.column());
if (!signalsBlocked()) { if (mapped_current_index.isValid()) {
if (mapped_current_index.isValid()) { if (!m_batchUnreadSwitch) {
// Set this message as read only if current item
// wasn't changed by "mark selected messages unread" action.
m_sourceModel->setMessageRead(mapped_current_index.row(), 1); m_sourceModel->setMessageRead(mapped_current_index.row(), 1);
emit currentMessageChanged(m_sourceModel->messageAt(mapped_current_index.row()));
}
else {
emit currentMessageRemoved();
} }
emit currentMessageChanged(m_sourceModel->messageAt(mapped_current_index.row()));
}
else {
emit currentMessageRemoved();
} }
QTreeView::currentChanged(current, previous); QTreeView::currentChanged(current, previous);
@ -189,8 +192,8 @@ void MessagesView::openSelectedSourceArticlesExternally() {
QString browser = Settings::getInstance()->value(APP_CFG_MESSAGES, QString browser = Settings::getInstance()->value(APP_CFG_MESSAGES,
"external_browser_executable").toString(); "external_browser_executable").toString();
QString arguments = Settings::getInstance()->value(APP_CFG_MESSAGES, QString arguments = Settings::getInstance()->value(APP_CFG_MESSAGES,
"external_browser_arguments", "external_browser_arguments",
"%1").toString(); "%1").toString();
if (browser.isEmpty() || arguments.isEmpty()) { if (browser.isEmpty() || arguments.isEmpty()) {
QMessageBox::critical(this, QMessageBox::critical(this,
@ -244,9 +247,9 @@ void MessagesView::setSelectedMessagesReadStatus(int read) {
if (read == 0) { if (read == 0) {
// User selected to mark some messages as unread, if one // User selected to mark some messages as unread, if one
// of them will be marked as current, then it will be read again. // of them will be marked as current, then it will be read again.
blockSignals(true); m_batchUnreadSwitch = true;
setCurrentIndex(current_index); setCurrentIndex(current_index);
blockSignals(false); m_batchUnreadSwitch = false;
} }
else { else {
setCurrentIndex(current_index); setCurrentIndex(current_index);
@ -315,9 +318,9 @@ void MessagesView::setAllMessagesReadStatus(int read) {
if (read == 0) { if (read == 0) {
// User selected to mark some messages as unread, if one // User selected to mark some messages as unread, if one
// of them will be marked as current, then it will be read again. // of them will be marked as current, then it will be read again.
blockSignals(true); m_batchUnreadSwitch = true;
setCurrentIndex(current_index); setCurrentIndex(current_index);
blockSignals(false); m_batchUnreadSwitch = false;
} }
else { else {
setCurrentIndex(current_index); setCurrentIndex(current_index);

2
src/gui/messagesview.h
View file

@ -67,6 +67,8 @@ class MessagesView : public QTreeView {
MessagesProxyModel *m_proxyModel; MessagesProxyModel *m_proxyModel;
MessagesModel *m_sourceModel; MessagesModel *m_sourceModel;
bool m_batchUnreadSwitch;
}; };
#endif // MESSAGESVIEW_H #endif // MESSAGESVIEW_H