Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-09-26 03:10:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added new friend request toaster from defnax.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5120 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-04-25 19:19:16 +00:00
parent 586e8bc042
commit 9501a4fe2c
14 changed files with 419 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -122,7 +122,7 @@ background-color: #2291E0;
</font>
</property>
<property name="text">
<string>TextLabel</string>
<string notr="true">TextLabel</string>
</property>
</widget>
</item>

6
retroshare-gui/src/gui/feeds/SecurityItem.cpp
View file

@ -118,14 +118,14 @@ void SecurityItem::updateItemStatic()
{
case SEC_TYPE_CONNECT_ATTEMPT:
title = tr("Connect Attempt");
request_label->show();
request_label->setText(requesttext.arg(tr("wants to be friends with you on RetroShare")));
request_label->show();
request_label->setText(requesttext.arg(tr("wants to be friend with you on RetroShare")));
avatar->setDefaultAvatar(":images/avatar_request.png");
break;
case SEC_TYPE_AUTH_DENIED:
title = tr("Not Yet Friends");
request_label->hide();
avatar->setDefaultAvatar(":images/avatar_request.png");
avatar->setDefaultAvatar(":images/avatar_request.png");
break;
case SEC_TYPE_UNKNOWN_IN:
title = tr("Unknown (Incoming) Connect Attempt");

6
retroshare-gui/src/gui/feeds/SecurityItem.ui
View file

@ -119,11 +119,7 @@ border-radius: 10px}</string>
<item row="0" column="1">
<widget class="QLabel" name="request_label">
<property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; color:#000000;&quot;&gt;TextLabel&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string notr="true">TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>