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

Merge pull request #2188 from defnax/message-composer

Browse Source 
Message Composer fixes
This commit is contained in:
defnax 2020-12-29 13:54:58 +01:00 committed by GitHub
commit b4557064a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
retroshare-gui/src/gui/msgs/MessageComposer.cpp
View File

@ -219,7 +219,11 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
/* initialize friends list */
ui.friendSelectionWidget->setHeaderText(tr("Send To:"));
ui.friendSelectionWidget->setModus(FriendSelectionWidget::MODUS_MULTI);
ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_GXS);
ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_GXS
#ifdef RS_DIRECT_CHAT
| FriendSelectionWidget::SHOW_SSL
#endif // RS_DIRECT_CHAT
);
ui.friendSelectionWidget->start();
QActionGroup *grp = new QActionGroup(this);
@ -265,6 +269,9 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
/* Add filter types */
ui.filterComboBox->addItem(tr("All people"));
ui.filterComboBox->addItem(tr("My contacts"));
#ifdef RS_DIRECT_CHAT
ui.filterComboBox->addItem(tr("Friend Nodes"));
#endif // RS_DIRECT_CHAT
ui.filterComboBox->setCurrentIndex(0);
if(rsIdentity->nbRegularContacts() > 0)
@ -1056,8 +1063,25 @@ MessageComposer *MessageComposer::newMsg(const std::string &msgId /* = ""*/)
QString MessageComposer::buildReplyHeader(const MessageInfo &msgInfo)
{
RetroShareLink link = RetroShareLink::createMessage(msgInfo.rspeerid_srcId, "");
QString from = link.toHtml();
RetroShareLink link;
QString from;
if(msgInfo.msgflags & RS_MSG_DISTANT)
{
link = RetroShareLink::createMessage(msgInfo.rsgxsid_srcId, "");
if (link.valid())
{
from += link.toHtml();
}
}
else
{
link = RetroShareLink::createMessage(msgInfo.rspeerid_srcId, "");
if (link.valid())
{
from += link.toHtml();
}
}
QString to;
for ( std::set<RsPeerId>::const_iterator it = msgInfo.rspeerid_msgto.begin(); it != msgInfo.rspeerid_msgto.end(); ++it)
@ -2608,6 +2632,11 @@ void MessageComposer::filterComboBoxChanged(int i)
case 1:
ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_CONTACTS);
break;
#ifdef RS_DIRECT_CHAT
case 2:
ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_SSL);
break;
#endif // RS_DIRECT_CHAT
}
}