Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-23 13:54:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed the Msg Feed Item too

Browse source
This commit is contained in:
defnax 2020-12-20 19:54:25 +01:00
parent c4b6c34dbe
commit 54f040c17a
3 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

35
retroshare-gui/src/gui/feeds/MsgItem.cpp
View file

@ -117,19 +117,28 @@ void MsgItem::updateItemStatic()
if (!mIsHome) if (!mIsHome)
{ {
if (mi.msgflags & RS_MSG_USER_REQUEST) if ((mi.msgflags & RS_MSG_USER_REQUEST) && (!mi.rsgxsid_srcId.isNull()))
{ {
title = QString::fromUtf8(mi.title.c_str()) + " " + tr("from") + " " + srcName; title = QString::fromUtf8(mi.title.c_str()) + " " + tr("from") + " " + srcName;
replyButton->setText(tr("Reply to invite")); replyButton->setText(tr("Reply to invite"));
subjectLabel->hide(); subjectLabel->hide();
inviteFrame->show(); inviteFrame->show();
} }
else else if ((mi.msgflags & RS_MSG_USER_REQUEST) && mi.rsgxsid_srcId.isNull())
{ {
title = tr("Message From") + ": " + srcName; title = QString::fromUtf8(mi.title.c_str()) + " " + " " + srcName;
sendinviteButton->hide(); subjectLabel->hide();
inviteFrame->hide(); inviteFrame->show();
} infoLabel->setText(tr("This message invites you to make friend! You may accept this request."));
sendinviteButton->hide();
replyButton->hide();
}
else
{
title = tr("Message From") + ": " + srcName;
sendinviteButton->hide();
inviteFrame->hide();
}
} }
else else
{ {

4
retroshare-gui/src/gui/feeds/MsgItem.ui
View file

@ -161,10 +161,6 @@
<property name="text"> <property name="text">
<string>Reply Message</string> <string>Reply Message</string>
</property> </property>
<property name="icon">
<iconset>
<normaloff>:/images/mail_reply.png</normaloff>:/images/mail_reply.png</iconset>
</property>
</widget> </widget>
</item> </item>
<item> <item>

BIN
retroshare-gui/src/release/Data/LOC06_43542d01e908b37636990038a8633cab/file_sharing/dirlist_7fe5ae5f67034e189936e5af4c778b47.bin Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 76 KiB