Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-25 15:35:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

improved request page design

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5435 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2012-08-17 13:45:05 +00:00
parent c3db4dacf7
commit c5ad4ba206
2 changed files with 153 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

4
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View file

@ -276,6 +276,8 @@ void ConnectFriendWizard::initializePage(int id)
{ {
std::cerr << "Friend request page id : " << peerDetails.id << "; gpg_id : " << peerDetails.gpg_id << std::endl; std::cerr << "Friend request page id : " << peerDetails.id << "; gpg_id : " << peerDetails.gpg_id << std::endl;
setPixmap(QWizard::LogoPixmap, QPixmap(":/images/user/user_request48.png"));
//set the radio button to sign the GPG key //set the radio button to sign the GPG key
if (peerDetails.accept_connection && !peerDetails.ownsign) { if (peerDetails.accept_connection && !peerDetails.ownsign) {
//gpg key connection is already accepted, don't propose to accept it again //gpg key connection is already accepted, don't propose to accept it again
@ -306,6 +308,8 @@ void ConnectFriendWizard::initializePage(int id)
ui->fr_emailEdit->setText(QString::fromUtf8(peerDetails.email.c_str())); ui->fr_emailEdit->setText(QString::fromUtf8(peerDetails.email.c_str()));
ui->fr_locationEdit->setText(QString::fromUtf8(peerDetails.location.c_str())); ui->fr_locationEdit->setText(QString::fromUtf8(peerDetails.location.c_str()));
ui->fr_label->setText(tr("You have a friend request from") + " " + QString::fromUtf8(peerDetails.name.c_str()));
fillGroups(this, ui->fr_groupComboBox, groupId); fillGroups(this, ui->fr_groupComboBox, groupId);
} }
break; break;

38
retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
View file

@ -411,6 +411,9 @@
<attribute name="verticalHeaderVisible"> <attribute name="verticalHeaderVisible">
<bool>false</bool> <bool>false</bool>
</attribute> </attribute>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
<column/> <column/>
<column/> <column/>
<column/> <column/>
@ -526,6 +529,28 @@
<attribute name="pageId"> <attribute name="pageId">
<string notr="true">ConnectFriendWizard::Page_FriendRequest</string> <string notr="true">ConnectFriendWizard::Page_FriendRequest</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_2">
<property name="leftMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QFrame" name="frame">
<property name="styleSheet">
<string notr="true">QFrame#frame{
border: 2px solid #CCCCCC;
border-radius:6px;
background: white;
}</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<widget class="QLabel" name="fr_label"> <widget class="QLabel" name="fr_label">
@ -536,9 +561,6 @@
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"> <string notr="true">
border: 2px solid #CCCCCC;
border-radius:6px;
background: white;
</string> </string>
</property> </property>
<property name="text"> <property name="text">
@ -560,6 +582,12 @@ background: white;
<height>96</height> <height>96</height>
</size> </size>
</property> </property>
<property name="styleSheet">
<string notr="true">
border: 2px solid #CCCCCC;
border-radius:6px;
background: white;</string>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
@ -664,6 +692,9 @@ background: white;
</item> </item>
</layout> </layout>
</widget> </widget>
</item>
</layout>
</widget>
<widget class="ConnectFriendPage" name="ErrorMessagePage"> <widget class="ConnectFriendPage" name="ErrorMessagePage">
<property name="title"> <property name="title">
<string>Sorry, some error appeared</string> <string>Sorry, some error appeared</string>
@ -844,6 +875,7 @@ background: white;
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../images.qrc"/> <include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>