Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-23 05:41:24 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Quick view for Messages with Attachments

Browse Source
This commit is contained in:
defnax 2020-05-20 02:03:18 +02:00
parent 623e803584
commit f96f1cf8b1
5 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
retroshare-gui/src/gui/icons.qrc
View File

@ -311,6 +311,7 @@
<file>icons/mail/foward.png</file> <file>icons/mail/foward.png</file>
<file>icons/mail/reply.png</file> <file>icons/mail/reply.png</file>
<file>icons/mail/reply-all.png</file> <file>icons/mail/reply-all.png</file>
<file>icons/mail/attach16.png</file>
<file>icons/mail/attach24.png</file> <file>icons/mail/attach24.png</file>
<file>icons/mail/write-mail.png</file> <file>icons/mail/write-mail.png</file>
<file>icons/textedit/align.png</file> <file>icons/textedit/align.png</file>

BIN
retroshare-gui/src/gui/icons/mail/attach16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 628 B

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

@ -342,7 +342,8 @@ bool RsMessageModel::passesFilter(const Rs::Msgs::MsgInfoSummary& fmpe,int colum
|| (std::find(fmpe.msgtags.begin(),fmpe.msgtags.end(),mQuickViewFilter) != fmpe.msgtags.end()) || (std::find(fmpe.msgtags.begin(),fmpe.msgtags.end(),mQuickViewFilter) != fmpe.msgtags.end())
|| (mQuickViewFilter==QUICK_VIEW_STARRED && (fmpe.msgflags & RS_MSG_STAR)) || (mQuickViewFilter==QUICK_VIEW_STARRED && (fmpe.msgflags & RS_MSG_STAR))
|| (mQuickViewFilter==QUICK_VIEW_SYSTEM && (fmpe.msgflags & RS_MSG_SYSTEM)) || (mQuickViewFilter==QUICK_VIEW_SYSTEM && (fmpe.msgflags & RS_MSG_SYSTEM))
|| (mQuickViewFilter==QUICK_VIEW_SPAM && (fmpe.msgflags & RS_MSG_SPAM)); || (mQuickViewFilter==QUICK_VIEW_SPAM && (fmpe.msgflags & RS_MSG_SPAM))
|| (mQuickViewFilter==QUICK_VIEW_ATTACHMENT && (fmpe.count >= 1));
#ifdef DEBUG_MESSAGE_MODEL #ifdef DEBUG_MESSAGE_MODEL
std::cerr << "Passes filter: type=" << mFilterType << " s=\"" << s.toStdString() << "MsgFlags=" << fmpe.msgflags << " msgtags=" ; std::cerr << "Passes filter: type=" << mFilterType << " s=\"" << s.toStdString() << "MsgFlags=" << fmpe.msgflags << " msgtags=" ;
foreach(uint32_t i,fmpe.msgtags) std::cerr << i << " " ; foreach(uint32_t i,fmpe.msgtags) std::cerr << i << " " ;

1
retroshare-gui/src/gui/msgs/MessageModel.h
View File

@ -76,6 +76,7 @@ public:
QUICK_VIEW_STARRED = 0x06, QUICK_VIEW_STARRED = 0x06,
QUICK_VIEW_SYSTEM = 0x07, QUICK_VIEW_SYSTEM = 0x07,
QUICK_VIEW_SPAM = 0x08, QUICK_VIEW_SPAM = 0x08,
QUICK_VIEW_ATTACHMENT = 0x09,
QUICK_VIEW_USER = 100 QUICK_VIEW_USER = 100
}; };

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

@ -63,6 +63,8 @@
#define IMAGE_NOTFICATION ":/icons/notification.png" #define IMAGE_NOTFICATION ":/icons/notification.png"
#define IMAGE_SPAM_ON ":/images/junk_on.png" #define IMAGE_SPAM_ON ":/images/junk_on.png"
#define IMAGE_SPAM_OFF ":/images/junk_off.png" #define IMAGE_SPAM_OFF ":/images/junk_off.png"
#define IMAGE_ATTACHMENTS ":/icons/mail/attach24.png"
#define IMAGE_ATTACHMENT ":/icons/mail/attach16.png"
#define IMAGE_INBOX ":/images/folder-inbox.png" #define IMAGE_INBOX ":/images/folder-inbox.png"
#define IMAGE_OUTBOX ":/images/folder-outbox.png" #define IMAGE_OUTBOX ":/images/folder-outbox.png"
@ -82,6 +84,7 @@
#define QUICKVIEW_STATIC_ID_STARRED 1 #define QUICKVIEW_STATIC_ID_STARRED 1
#define QUICKVIEW_STATIC_ID_SYSTEM 2 #define QUICKVIEW_STATIC_ID_SYSTEM 2
#define QUICKVIEW_STATIC_ID_SPAM 3 #define QUICKVIEW_STATIC_ID_SPAM 3
#define QUICKVIEW_STATIC_ID_ATTACHMENT 4
#define ROW_INBOX 0 #define ROW_INBOX 0
#define ROW_OUTBOX 1 #define ROW_OUTBOX 1
@ -446,6 +449,16 @@ void MessagesDialog::fillQuickView()
itemToSelect = item; itemToSelect = item;
} }
item = new QListWidgetItem(tr("Attachment"), ui.quickViewWidget);
item->setIcon(QIcon(IMAGE_ATTACHMENT));
item->setData(ROLE_QUICKVIEW_TYPE, QUICKVIEW_TYPE_STATIC);
item->setData(ROLE_QUICKVIEW_ID, QUICKVIEW_STATIC_ID_ATTACHMENT);
item->setData(ROLE_QUICKVIEW_TEXT, item->text()); // for updateMessageSummaryList
if (selectedType == QUICKVIEW_TYPE_STATIC && selectedId == QUICKVIEW_STATIC_ID_ATTACHMENT) {
itemToSelect = item;
}
for (tag = tags.types.begin(); tag != tags.types.end(); ++tag) { for (tag = tags.types.begin(); tag != tags.types.end(); ++tag) {
text = TagDefs::name(tag->first, tag->second.first); text = TagDefs::name(tag->first, tag->second.first);
@ -835,23 +848,27 @@ void MessagesDialog::changeQuickView(int newrow)
ui.tabWidget->setTabText(0, tr("Spam")); ui.tabWidget->setTabText(0, tr("Spam"));
ui.tabWidget->setTabIcon(0, QIcon(IMAGE_SPAM_ON)); ui.tabWidget->setTabIcon(0, QIcon(IMAGE_SPAM_ON));
break; break;
case 0x03: f = RsMessageModel::QUICK_VIEW_IMPORTANT; 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->setTabText(0, tr("Important"));
ui.tabWidget->setTabIcon(0, QIcon(IMAGE_FOLDER)); ui.tabWidget->setTabIcon(0, QIcon(IMAGE_FOLDER));
break; break;
case 0x04: f = RsMessageModel::QUICK_VIEW_WORK ; case 0x05: f = RsMessageModel::QUICK_VIEW_WORK ;
ui.tabWidget->setTabText(0, tr("Work")); ui.tabWidget->setTabText(0, tr("Work"));
ui.tabWidget->setTabIcon(0, QIcon(IMAGE_FOLDER)); ui.tabWidget->setTabIcon(0, QIcon(IMAGE_FOLDER));
break; break;
case 0x05: f = RsMessageModel::QUICK_VIEW_PERSONAL ; case 0x06: f = RsMessageModel::QUICK_VIEW_PERSONAL ;
ui.tabWidget->setTabText(0, tr("Personal")); ui.tabWidget->setTabText(0, tr("Personal"));
ui.tabWidget->setTabIcon(0, QIcon(IMAGE_FOLDER)); ui.tabWidget->setTabIcon(0, QIcon(IMAGE_FOLDER));
break; break;
case 0x06: f = RsMessageModel::QUICK_VIEW_TODO ; case 0x07: f = RsMessageModel::QUICK_VIEW_TODO ;
ui.tabWidget->setTabText(0, tr("Todo")); ui.tabWidget->setTabText(0, tr("Todo"));
ui.tabWidget->setTabIcon(0, QIcon(IMAGE_FOLDER)); ui.tabWidget->setTabIcon(0, QIcon(IMAGE_FOLDER));
break; break;
case 0x07: f = RsMessageModel::QUICK_VIEW_LATER ; case 0x08: f = RsMessageModel::QUICK_VIEW_LATER ;
ui.tabWidget->setTabText(0, tr("Later")); ui.tabWidget->setTabText(0, tr("Later"));
ui.tabWidget->setTabIcon(0, QIcon(IMAGE_FOLDER)); ui.tabWidget->setTabIcon(0, QIcon(IMAGE_FOLDER));
break; break;
@ -1160,6 +1177,7 @@ void MessagesDialog::updateMessageSummaryList()
unsigned int starredCount = 0; unsigned int starredCount = 0;
unsigned int systemCount = 0; unsigned int systemCount = 0;
unsigned int spamCount = 0; unsigned int spamCount = 0;
unsigned int attachmentCount = 0;
/* calculating the new messages */ /* calculating the new messages */
@ -1354,6 +1372,9 @@ void MessagesDialog::updateMessageSummaryList()
case QUICKVIEW_STATIC_ID_SPAM: case QUICKVIEW_STATIC_ID_SPAM:
text += " (" + QString::number(spamCount) + ")"; text += " (" + QString::number(spamCount) + ")";
break; break;
case QUICKVIEW_STATIC_ID_ATTACHMENT:
text += " (" + QString::number(attachmentCount) + ")";
break;
} }
item->setText(text); item->setText(text);