Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-31 10:19:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2317 from PhenomRetroShare/Fix_MailDelete

Browse source 
Fix Mail delete
This commit is contained in:
defnax 2021-02-13 22:32:11 +01:00 • committed by GitHub
commit 3eb5142fe8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
retroshare-gui/src/gui/msgs/MessagesDialog.cpp
View file

@ -1047,7 +1047,6 @@ void MessagesDialog::markWithJunk(bool checked)
void MessagesDialog::insertMsgTxtAndFiles(const QModelIndex& proxy_index) void MessagesDialog::insertMsgTxtAndFiles(const QModelIndex& proxy_index)
{ {
/* get its Ids */ /* get its Ids */
std::string cid;
std::string mid; std::string mid;
QModelIndex real_index = mMessageProxyModel->mapToSource(proxy_index); QModelIndex real_index = mMessageProxyModel->mapToSource(proxy_index);
@ -1129,6 +1128,7 @@ void MessagesDialog::removemessage()
mMessageModel->updateMessages(); mMessageModel->updateMessages();
updateMessageSummaryList(); updateMessageSummaryList();
lastSelectedIndex = QModelIndex();
messageRemoved(); messageRemoved();
} }
@ -1382,24 +1382,24 @@ void MessagesDialog::updateMessageSummaryList()
/* set tag counts */ /* set tag counts */
int rowCount = ui.quickViewWidget->count(); int rowCount = ui.quickViewWidget->count();
for (int row = 0; row < rowCount; ++row) { for (int row = 0; row < rowCount; ++row) {
QListWidgetItem *item = ui.quickViewWidget->item(row); QListWidgetItem *qv_item = ui.quickViewWidget->item(row);
switch (item->data(ROLE_QUICKVIEW_TYPE).toInt()) { switch (qv_item->data(ROLE_QUICKVIEW_TYPE).toInt()) {
case QUICKVIEW_TYPE_TAG: case QUICKVIEW_TYPE_TAG:
{ {
int count = tagCount[item->data(ROLE_QUICKVIEW_ID).toInt()]; int count = tagCount[qv_item->data(ROLE_QUICKVIEW_ID).toInt()];
QString text = item->data(ROLE_QUICKVIEW_TEXT).toString(); QString text = qv_item->data(ROLE_QUICKVIEW_TEXT).toString();
if (count) { if (count) {
text += " (" + QString::number(count) + ")"; text += " (" + QString::number(count) + ")";
} }
item->setText(text); qv_item->setText(text);
} }
break; break;
case QUICKVIEW_TYPE_STATIC: case QUICKVIEW_TYPE_STATIC:
{ {
QString text = item->data(ROLE_QUICKVIEW_TEXT).toString(); QString text = qv_item->data(ROLE_QUICKVIEW_TEXT).toString();
switch (item->data(ROLE_QUICKVIEW_ID).toInt()) { switch (qv_item->data(ROLE_QUICKVIEW_ID).toInt()) {
case QUICKVIEW_STATIC_ID_STARRED: case QUICKVIEW_STATIC_ID_STARRED:
text += " (" + QString::number(starredCount) + ")"; text += " (" + QString::number(starredCount) + ")";
break; break;
@ -1414,7 +1414,7 @@ void MessagesDialog::updateMessageSummaryList()
break; break;
} }
item->setText(text); qv_item->setText(text);
} }
break; break;
} }