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

Fixed display of "TextLabel" in SecurityItem.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5956 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-12-09 18:26:30 +00:00
parent 6e60be0ef7
commit 63d66ee53c
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
retroshare-gui/src/gui/feeds/SecurityItem.cpp
View File

@ -119,7 +119,6 @@ void SecurityItem::updateItemStatic()
case SEC_TYPE_CONNECT_ATTEMPT: case SEC_TYPE_CONNECT_ATTEMPT:
title = tr("Connect Attempt"); title = tr("Connect Attempt");
requestLabel->show(); requestLabel->show();
requestLabel->setText(tr("wants to be friend with you on RetroShare"));
avatar->setDefaultAvatar(":images/avatar_request.png"); avatar->setDefaultAvatar(":images/avatar_request.png");
break; break;
case SEC_TYPE_AUTH_DENIED: case SEC_TYPE_AUTH_DENIED:

10
retroshare-gui/src/gui/feeds/SecurityItem.ui
View File

@ -143,21 +143,23 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="requestLabel"> <widget class="QLabel" name="requestLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>14</pointsize> <pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string notr="true">TextLabel</string> <string>wants to be friend with you on RetroShare</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>

20
retroshare-gui/src/lang/retroshare_en.ts
View File

@ -10057,10 +10057,6 @@ Reducing image to %1x%2 pixels?</source>
<source>Accept Friend Request</source> <source>Accept Friend Request</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>wants to be friend with you on RetroShare</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>ServerPage</name> <name>ServerPage</name>
@ -10254,6 +10250,10 @@ peers still need to trust each other to allow connection. </source>
<source>Share flags and groups: </source> <source>Share flags and groups: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Edit Shared Folder</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>ShareKey</name> <name>ShareKey</name>
@ -10372,6 +10372,10 @@ p, li { white-space: pre-wrap; }
<source>Apply and close</source> <source>Apply and close</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Edit Shared Folder</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>SharedFilesDialog</name> <name>SharedFilesDialog</name>
@ -10515,6 +10519,14 @@ p, li { white-space: pre-wrap; }
<source>Split View</source> <source>Split View</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Edit Share Permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Edit Shared Folder</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>SoundPage</name> <name>SoundPage</name>