Added "You have a friend request" label to FriendRequest Dialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5088 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2012-04-10 15:55:12 +00:00
parent e31ea01305
commit 6aa7cd1e14
28 changed files with 116 additions and 7 deletions

View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>372</width> <width>372</width>
<height>328</height> <height>355</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -200,7 +200,7 @@ border-image: url(:/images/btn_blue_hover.png) 4;
<enum>QFrame::Plain</enum> <enum>QFrame::Plain</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="AvatarWidget" name="avatar" native="true"> <widget class="AvatarWidget" name="avatar" native="true">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@ -216,7 +216,7 @@ border-image: url(:/images/btn_blue_hover.png) 4;
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="1" column="2">
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="title"> <property name="title">
<string>Peer Info</string> <string>Peer Info</string>
@ -288,7 +288,7 @@ border-image: url(:/images/btn_blue_hover.png) 4;
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="3"> <item row="2" column="0" colspan="3">
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="3"> <item row="0" column="0" colspan="3">
<widget class="QLabel" name="web_of_trust_label"> <widget class="QLabel" name="web_of_trust_label">
@ -384,7 +384,7 @@ border-image: url(:/images/btn_blue_hover.png) 4;
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="0" colspan="3"> <item row="3" column="0" colspan="3">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -397,6 +397,25 @@ border-image: url(:/images/btn_blue_hover.png) 4;
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="0" colspan="3">
<widget class="QLabel" name="label_3">
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">
border: 2px solid #CCCCCC;
border-radius:6px;
background: white;
</string>
</property>
<property name="text">
<string>You have a friend request.</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -417,6 +436,7 @@ border-image: url(:/images/btn_blue_hover.png) 4;
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../images.qrc"/> <include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

View File

@ -4440,6 +4440,10 @@ p, li { white-space: pre-wrap; }
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>You have a friend request.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FriendSelectionWidget</name> <name>FriendSelectionWidget</name>

View File

@ -4425,6 +4425,10 @@ p, li { white-space: pre-wrap; }
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>You have a friend request.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FriendSelectionWidget</name> <name>FriendSelectionWidget</name>

View File

@ -4592,6 +4592,10 @@ p, li { white-space: pre-wrap; }
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished">Måske password er forkert</translation> <translation type="unfinished">Måske password er forkert</translation>
</message> </message>
<message>
<source>You have a friend request.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FriendSelectionWidget</name> <name>FriendSelectionWidget</name>

View File

@ -5174,7 +5174,12 @@ p, li { white-space: pre-wrap; }
<translation>Voll </translation> <translation>Voll </translation>
</message> </message>
<message> <message>
<location line="-59"/> <location line="+44"/>
<source>You have a friend request.</source>
<translation>Du hast eine Freundschaftsanfrage.</translation>
</message>
<message>
<location line="-103"/>
<source>Sign GPG Key</source> <source>Sign GPG Key</source>
<translation>Unterzeichne GPG Schlüssel</translation> <translation>Unterzeichne GPG Schlüssel</translation>
</message> </message>

View File

@ -4010,6 +4010,10 @@ p, li { white-space: pre-wrap; }
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>You have a friend request.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FriendSelectionWidget</name> <name>FriendSelectionWidget</name>

View File

@ -4311,6 +4311,10 @@ p, li { white-space: pre-wrap; }
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished">Probablemente la contraseña es erronea</translation> <translation type="unfinished">Probablemente la contraseña es erronea</translation>
</message> </message>
<message>
<source>You have a friend request.</source>
<translation>Usted tiene una solicitud de amigo.</translation>
</message>
</context> </context>
<context> <context>
<name>FriendSelectionWidget</name> <name>FriendSelectionWidget</name>

View File

@ -4868,6 +4868,10 @@ p, li { white-space: pre-wrap; }
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>You have a friend request.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FriendSelectionWidget</name> <name>FriendSelectionWidget</name>

View File

@ -4150,6 +4150,10 @@ p, li { white-space: pre-wrap; }
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>You have a friend request.</source>
<translation>Vous avez une demande d&apos;ami.</translation>
</message>
</context> </context>
<context> <context>
<name>FriendSelectionWidget</name> <name>FriendSelectionWidget</name>

View File

@ -4432,6 +4432,10 @@ p, li { white-space: pre-wrap; }
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>You have a friend request.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FriendSelectionWidget</name> <name>FriendSelectionWidget</name>

View File

@ -4448,6 +4448,10 @@ p, li { white-space: pre-wrap; }
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>You have a friend request.</source>
<translation>Hai una richiesta di amicizia.</translation>
</message>
</context> </context>
<context> <context>
<name>FriendSelectionWidget</name> <name>FriendSelectionWidget</name>

View File

@ -5116,6 +5116,10 @@ p, li { white-space: pre-wrap; }
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>You have a friend request.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FriendSelectionWidget</name> <name>FriendSelectionWidget</name>

View File

@ -4448,6 +4448,10 @@ p, li { white-space: pre-wrap; }
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished"> </translation> <translation type="unfinished"> </translation>
</message> </message>
<message>
<source>You have a friend request.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FriendSelectionWidget</name> <name>FriendSelectionWidget</name>

View File

@ -4010,6 +4010,10 @@ p, li { white-space: pre-wrap; }
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>You have a friend request.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FriendSelectionWidget</name> <name>FriendSelectionWidget</name>

View File

@ -4548,6 +4548,10 @@ p, li { white-space: pre-wrap; }
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>You have a friend request.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FriendSelectionWidget</name> <name>FriendSelectionWidget</name>

View File

@ -4420,6 +4420,10 @@ p, li { white-space: pre-wrap; }
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>You have a friend request.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FriendSelectionWidget</name> <name>FriendSelectionWidget</name>

View File

@ -4854,6 +4854,10 @@ p, li { white-space: pre-wrap; }
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished">Может быть, неправильный пароль</translation> <translation type="unfinished">Может быть, неправильный пароль</translation>
</message> </message>
<message>
<source>You have a friend request.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FriendSelectionWidget</name> <name>FriendSelectionWidget</name>

View File

@ -4489,6 +4489,10 @@ p, li { white-space: pre-wrap; }
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>You have a friend request.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FriendSelectionWidget</name> <name>FriendSelectionWidget</name>

View File

@ -4374,6 +4374,10 @@ p, li { white-space: pre-wrap; }
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>You have a friend request.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FriendSelectionWidget</name> <name>FriendSelectionWidget</name>

View File

@ -5698,6 +5698,10 @@ p, li { white-space: pre-wrap; }
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>You have a friend request.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FriendSelectionWidget</name> <name>FriendSelectionWidget</name>

View File

@ -1657,7 +1657,7 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<source>None </source> <source>None </source>
<translation type="unfinished"></translation> <translation type="unfinished">yok</translation>
</message> </message>
<message> <message>
<source>Marginal </source> <source>Marginal </source>
@ -4434,6 +4434,10 @@ p, li { white-space: pre-wrap; }
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished">Belki şifre yanlış</translation> <translation type="unfinished">Belki şifre yanlış</translation>
</message> </message>
<message>
<source>You have a friend request.</source>
<translation>Bir arkadaşlık isteği var.</translation>
</message>
</context> </context>
<context> <context>
<name>FriendSelectionWidget</name> <name>FriendSelectionWidget</name>

View File

@ -4629,6 +4629,10 @@ p, li { white-space: pre-wrap; }
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>You have a friend request.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FriendSelectionWidget</name> <name>FriendSelectionWidget</name>

View File

@ -4010,6 +4010,10 @@ p, li { white-space: pre-wrap; }
<source>Maybe password is wrong</source> <source>Maybe password is wrong</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>You have a friend request.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FriendSelectionWidget</name> <name>FriendSelectionWidget</name>