Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-26 07:59:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed some UI bugs in Mail

Browse Source
This commit is contained in:
csoler 2022-11-27 18:36:42 +01:00
parent ea4df6306b
commit 6a2886da40
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/msgs/MessageModel.cpp
View File

@ -660,7 +660,7 @@ void RsMessageModel::setMessages(const std::list<Rs::Msgs::MsgInfoSummary>& msgs
for(auto it(msgs.begin());it!=msgs.end();++it) for(auto it(msgs.begin());it!=msgs.end();++it)
{ {
mMessagesMap[(*it).msgId] = mMessages.size(); mMessagesMap[(*it).msgId] = mMessages.size();
mMessages.push_back(*it); mMessages.push_back(*it);
} }
// now update prow for all posts // now update prow for all posts

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

@ -917,6 +917,8 @@ void MessagesDialog::changeBox(int box_row)
insertMsgTxtAndFiles(ui.messageTreeWidget->currentIndex()); insertMsgTxtAndFiles(ui.messageTreeWidget->currentIndex());
ui.messageTreeWidget->setPlaceholderText(placeholderText); ui.messageTreeWidget->setPlaceholderText(placeholderText);
ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_READ,box_row!=ROW_INBOX); ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_READ,box_row!=ROW_INBOX);
ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_STAR,box_row==ROW_OUTBOX);
ui.messageTreeWidget->setColumnHidden(RsMessageModel::COLUMN_THREAD_SPAM,box_row==ROW_OUTBOX);
} }
else else
{ {
@ -1152,13 +1154,11 @@ void MessagesDialog::removemessage()
bool doDelete = false; bool doDelete = false;
int listrow = ui.listWidget->currentRow(); int listrow = ui.listWidget->currentRow();
if (listrow == ROW_TRASHBOX) { if (listrow == ROW_TRASHBOX || listrow == ROW_OUTBOX)
doDelete = true;
if (QApplication::keyboardModifiers() & Qt::ShiftModifier)
doDelete = true; doDelete = true;
} else {
if (QApplication::keyboardModifiers() & Qt::ShiftModifier) {
doDelete = true;
}
}
foreach (const QString& m, selectedMessages) { foreach (const QString& m, selectedMessages) {
if (doDelete) { if (doDelete) {