Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-13 16:45:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fixed removing/displaying message tags in tags menu

Browse source
This commit is contained in:
csoler 2022-12-04 21:18:41 +01:00
parent 7b78b87c65
commit 93746f5075
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -282,7 +282,6 @@ MessagesDialog::MessagesDialog(QWidget *parent)
connect(ui.listWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(folderlistWidgetCustomPopupMenu(QPoint))); connect(ui.listWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(folderlistWidgetCustomPopupMenu(QPoint)));
connect(ui.listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(changeBox(int))); connect(ui.listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(changeBox(int)));
//connect(ui.quickViewWidget, SIGNAL(currentRowChanged(int)), this, SLOT(changeQuickView(int)));
connect(ui.tabWidget, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int))); connect(ui.tabWidget, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
connect(ui.tabWidget, SIGNAL(tabCloseRequested(int)), this, SLOT(tabCloseRequested(int))); connect(ui.tabWidget, SIGNAL(tabCloseRequested(int)), this, SLOT(tabCloseRequested(int)));
connect(ui.newmessageButton, SIGNAL(clicked()), this, SLOT(newmessage())); connect(ui.newmessageButton, SIGNAL(clicked()), this, SLOT(newmessage()));
@ -1517,11 +1516,10 @@ std::cerr << "NewInboxCount = " << newInboxCount << " NewDraftCount = " << newDr
void MessagesDialog::tagAboutToShow() void MessagesDialog::tagAboutToShow()
{ {
#ifdef TODO
TagsMenu *menu = dynamic_cast<TagsMenu*>(ui.tagButton->menu()); TagsMenu *menu = dynamic_cast<TagsMenu*>(ui.tagButton->menu());
if (menu == NULL) {
if (menu == NULL)
return; return;
}
// activate actions from the first selected row // activate actions from the first selected row
MsgTagInfo tagInfo; MsgTagInfo tagInfo;
@ -1532,8 +1530,7 @@ void MessagesDialog::tagAboutToShow()
if(!msgids.empty()) if(!msgids.empty())
rsMail->getMessageTag(msgids.front().toStdString(), tagInfo); rsMail->getMessageTag(msgids.front().toStdString(), tagInfo);
menu->activateActions(tagInfo.tagIds); menu->activateActions(tagInfo);
#endif
} }
void MessagesDialog::tagRemoveAll() void MessagesDialog::tagRemoveAll()
@ -1547,9 +1544,8 @@ void MessagesDialog::tagRemoveAll()
void MessagesDialog::tagSet(int tagId, bool set) void MessagesDialog::tagSet(int tagId, bool set)
{ {
if (tagId == 0) { if (tagId == 0)
return; return;
}
QList<QString> msgids; QList<QString> msgids;
getSelectedMessages(msgids); getSelectedMessages(msgids);