Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 15:39:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1955 from PhenomRetroShare/Fix_MessageQuickViewSelection

Browse Source 
Fix Message QuickView Selection for user tags
This commit is contained in:
defnax 2020-05-21 14:23:17 +02:00 committed by GitHub
commit 0a4b191384
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 51 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
retroshare-gui/src/gui/msgs/MessagesDialog.cpp
View File

@ -833,54 +833,35 @@ void MessagesDialog::changeQuickView(int newrow)
changeBox(-1); changeBox(-1);
listMode = LIST_QUICKVIEW; listMode = LIST_QUICKVIEW;
RsMessageModel::QuickViewFilter f = RsMessageModel::QUICK_VIEW_ALL ; RsMessageModel::QuickViewFilter f = RsMessageModel::QUICK_VIEW_ALL ;
QListWidgetItem* item = ui.quickViewWidget->item(newrow);
if(newrow >= 0) // -1 means that nothing is selected if(item )
switch(newrow) {
{ switch (item->data(ROLE_QUICKVIEW_TYPE).toInt()) {
case 0x00: f = RsMessageModel::QUICK_VIEW_STARRED ; case QUICKVIEW_TYPE_TAG:
ui.tabWidget->setTabText(0, tr("Starred")); f = RsMessageModel::QuickViewFilter( item->data(ROLE_QUICKVIEW_ID).toUInt());
ui.tabWidget->setTabIcon(0, QIcon(IMAGE_STAR_ON)); break;
break; case QUICKVIEW_TYPE_STATIC:
case 0x01: f = RsMessageModel::QUICK_VIEW_SYSTEM ; switch (item->data(ROLE_QUICKVIEW_ID).toInt()) {
ui.tabWidget->setTabText(0, tr("System")); case QUICKVIEW_STATIC_ID_STARRED: f = RsMessageModel::QUICK_VIEW_STARRED;
ui.tabWidget->setTabIcon(0, QIcon(IMAGE_SYSTEM)); break;
break; case QUICKVIEW_STATIC_ID_SYSTEM: f = RsMessageModel::QUICK_VIEW_SYSTEM;
case 0x02: f = RsMessageModel::QUICK_VIEW_SPAM ; break;
ui.tabWidget->setTabText(0, tr("Spam")); case QUICKVIEW_STATIC_ID_SPAM: f = RsMessageModel::QUICK_VIEW_SPAM;
ui.tabWidget->setTabIcon(0, QIcon(IMAGE_SPAM_ON)); break;
break; case QUICKVIEW_STATIC_ID_ATTACHMENT: f = RsMessageModel::QUICK_VIEW_ATTACHMENT;
case 0x03: f = RsMessageModel::QUICK_VIEW_ATTACHMENT ; }
ui.tabWidget->setTabText(0, tr("Attachment"));
ui.tabWidget->setTabIcon(0, QIcon(IMAGE_ATTACHMENT));
break;
case 0x04: f = RsMessageModel::QUICK_VIEW_IMPORTANT;
ui.tabWidget->setTabText(0, tr("Important"));
ui.tabWidget->setTabIcon(0, QIcon(IMAGE_FOLDER));
break;
case 0x05: f = RsMessageModel::QUICK_VIEW_WORK ;
ui.tabWidget->setTabText(0, tr("Work"));
ui.tabWidget->setTabIcon(0, QIcon(IMAGE_FOLDER));
break;
case 0x06: f = RsMessageModel::QUICK_VIEW_PERSONAL ;
ui.tabWidget->setTabText(0, tr("Personal"));
ui.tabWidget->setTabIcon(0, QIcon(IMAGE_FOLDER));
break;
case 0x07: f = RsMessageModel::QUICK_VIEW_TODO ;
ui.tabWidget->setTabText(0, tr("Todo"));
ui.tabWidget->setTabIcon(0, QIcon(IMAGE_FOLDER));
break;
case 0x08: f = RsMessageModel::QUICK_VIEW_LATER ;
ui.tabWidget->setTabText(0, tr("Later"));
ui.tabWidget->setTabIcon(0, QIcon(IMAGE_FOLDER));
break;
default:
f = RsMessageModel::QuickViewFilter( (int)RsMessageModel::QUICK_VIEW_USER + newrow - 0x07);
} }
mMessageModel->setQuickViewFilter(f);
ui.tabWidget->setTabText(0, item->data(ROLE_QUICKVIEW_TEXT).toString());
ui.tabWidget->setTabIcon(0, item->icon());
}
mMessageModel->setQuickViewFilter(f);
mMessageProxyModel->setFilterRegExp(QRegExp(RsMessageModel::FilterString)); // this triggers the update of the proxy model mMessageProxyModel->setFilterRegExp(QRegExp(RsMessageModel::FilterString)); // this triggers the update of the proxy model
insertMsgTxtAndFiles(ui.messageTreeWidget->currentIndex()); insertMsgTxtAndFiles(ui.messageTreeWidget->currentIndex());
} }
void MessagesDialog::messagesTagsChanged() void MessagesDialog::messagesTagsChanged()
@ -903,32 +884,34 @@ void MessagesDialog::currentChanged(const QModelIndex& new_proxy_index,const QMo
// click in messageTreeWidget // click in messageTreeWidget
void MessagesDialog::clicked(const QModelIndex& proxy_index) void MessagesDialog::clicked(const QModelIndex& proxy_index)
{ {
if(!proxy_index.isValid()) if(!proxy_index.isValid())
return; return;
QModelIndex real_index = mMessageProxyModel->mapToSource(proxy_index); QModelIndex real_index = mMessageProxyModel->mapToSource(proxy_index);
switch (proxy_index.column()) switch (proxy_index.column())
{ {
case RsMessageModel::COLUMN_THREAD_READ: case RsMessageModel::COLUMN_THREAD_READ:
{ {
mMessageModel->setMsgReadStatus(real_index, !isMessageRead(proxy_index)); mMessageModel->setMsgReadStatus(real_index, !isMessageRead(proxy_index));
//Already updated by currentChanged //Already updated by currentChanged
//insertMsgTxtAndFiles(proxy_index); //insertMsgTxtAndFiles(proxy_index);
updateMessageSummaryList(); updateMessageSummaryList();
return; return;
} }
case RsMessageModel::COLUMN_THREAD_STAR: case RsMessageModel::COLUMN_THREAD_STAR:
{ {
mMessageModel->setMsgStar(real_index, !hasMessageStar(proxy_index)); mMessageModel->setMsgStar(real_index, !hasMessageStar(proxy_index));
return; updateMessageSummaryList();
} return;
case RsMessageModel::COLUMN_THREAD_SPAM: }
{ case RsMessageModel::COLUMN_THREAD_SPAM:
mMessageModel->setMsgJunk(real_index, !hasMessageSpam(proxy_index)); {
return; mMessageModel->setMsgJunk(real_index, !hasMessageSpam(proxy_index));
} updateMessageSummaryList();
} return;
}
}
// show current message directly // show current message directly
//Already updated by currentChanged //Already updated by currentChanged