mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-08-19 19:38:57 -04:00
improved request page design
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5435 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax
parent
c3db4dacf7
commit
c5ad4ba206
2 changed files with 153 additions and 117 deletions
|
|
@ -275,6 +275,8 @@ void ConnectFriendWizard::initializePage(int id)
|
||||||
case Page_FriendRequest:
|
case Page_FriendRequest:
|
||||||
{
|
{
|
||||||
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) {
|
||||||
|
|
@ -305,6 +307,8 @@ void ConnectFriendWizard::initializePage(int id)
|
||||||
ui->fr_nameEdit->setText(QString::fromUtf8(peerDetails.name.c_str()));
|
ui->fr_nameEdit->setText(QString::fromUtf8(peerDetails.name.c_str()));
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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,142 +529,170 @@
|
||||||
<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">
|
<layout class="QGridLayout" name="gridLayout_2">
|
||||||
<item row="0" column="0" colspan="2">
|
<property name="leftMargin">
|
||||||
<widget class="QLabel" name="fr_label">
|
<number>6</number>
|
||||||
<property name="font">
|
</property>
|
||||||
<font>
|
<property name="rightMargin">
|
||||||
<pointsize>12</pointsize>
|
<number>6</number>
|
||||||
</font>
|
</property>
|
||||||
</property>
|
<item row="0" column="0">
|
||||||
|
<widget class="QFrame" name="frame">
|
||||||
<property name="styleSheet">
|
<property name="styleSheet">
|
||||||
<string notr="true">
|
<string notr="true">QFrame#frame{
|
||||||
border: 2px solid #CCCCCC;
|
border: 2px solid #CCCCCC;
|
||||||
border-radius:6px;
|
border-radius:6px;
|
||||||
background: white;
|
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">
|
||||||
|
<item row="0" column="0" colspan="2">
|
||||||
|
<widget class="QLabel" name="fr_label">
|
||||||
|
<property name="font">
|
||||||
|
<font>
|
||||||
|
<pointsize>12</pointsize>
|
||||||
|
</font>
|
||||||
|
</property>
|
||||||
|
<property name="styleSheet">
|
||||||
|
<string notr="true">
|
||||||
</string>
|
</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
|
||||||
<string>You have a friend request .</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0">
|
|
||||||
<widget class="AvatarWidget" name="avatar">
|
|
||||||
<property name="minimumSize">
|
|
||||||
<size>
|
|
||||||
<width>96</width>
|
|
||||||
<height>96</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="maximumSize">
|
|
||||||
<size>
|
|
||||||
<width>96</width>
|
|
||||||
<height>96</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="1">
|
|
||||||
<widget class="QGroupBox" name="fr_peerDetailsFrame">
|
|
||||||
<property name="title">
|
|
||||||
<string>Peer details</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QFormLayout" name="formLayout_3">
|
|
||||||
<property name="fieldGrowthPolicy">
|
|
||||||
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
|
|
||||||
</property>
|
|
||||||
<item row="0" column="0">
|
|
||||||
<widget class="QLabel" name="fr_nameLabel">
|
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Name:</string>
|
<string>You have a friend request .</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="1">
|
|
||||||
<widget class="QLabel" name="fr_nameEdit">
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true">Name</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="0">
|
|
||||||
<widget class="QLabel" name="fr_emailLabel">
|
|
||||||
<property name="text">
|
|
||||||
<string>Email:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="3" column="0">
|
|
||||||
<widget class="QLabel" name="fr_locationLabel">
|
|
||||||
<property name="text">
|
|
||||||
<string>Location:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="3" column="1">
|
|
||||||
<widget class="QLabel" name="fr_locationEdit">
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true">Location</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="1">
|
|
||||||
<widget class="QLabel" name="fr_emailEdit">
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true">Email</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="0" colspan="2">
|
|
||||||
<widget class="QGroupBox" name="fr_optionsFrame">
|
|
||||||
<property name="title">
|
|
||||||
<string>Options</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QFormLayout" name="formLayout_4">
|
|
||||||
<item row="0" column="0">
|
|
||||||
<widget class="QLabel" name="fr_groupLabel">
|
|
||||||
<property name="text">
|
|
||||||
<string>Add friend to group:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="1">
|
|
||||||
<widget class="QComboBox" name="fr_groupComboBox"/>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
<widget class="QCheckBox" name="fr_signGPGCheckBox">
|
<widget class="AvatarWidget" name="avatar">
|
||||||
<property name="text">
|
<property name="minimumSize">
|
||||||
<string>Authenticate friend (Sign GPG Key)</string>
|
<size>
|
||||||
|
<width>96</width>
|
||||||
|
<height>96</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize">
|
||||||
|
<size>
|
||||||
|
<width>96</width>
|
||||||
|
<height>96</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="styleSheet">
|
||||||
|
<string notr="true">
|
||||||
|
border: 2px solid #CCCCCC;
|
||||||
|
border-radius:6px;
|
||||||
|
background: white;</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="0">
|
<item row="1" column="1">
|
||||||
<widget class="QCheckBox" name="fr_acceptNoSignGPGCheckBox">
|
<widget class="QGroupBox" name="fr_peerDetailsFrame">
|
||||||
<property name="text">
|
<property name="title">
|
||||||
<string>Add as friend to connect with</string>
|
<string>Peer details</string>
|
||||||
</property>
|
</property>
|
||||||
|
<layout class="QFormLayout" name="formLayout_3">
|
||||||
|
<property name="fieldGrowthPolicy">
|
||||||
|
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
|
||||||
|
</property>
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="fr_nameLabel">
|
||||||
|
<property name="text">
|
||||||
|
<string>Name:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="1">
|
||||||
|
<widget class="QLabel" name="fr_nameEdit">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">Name</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="0">
|
||||||
|
<widget class="QLabel" name="fr_emailLabel">
|
||||||
|
<property name="text">
|
||||||
|
<string>Email:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="0">
|
||||||
|
<widget class="QLabel" name="fr_locationLabel">
|
||||||
|
<property name="text">
|
||||||
|
<string>Location:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="1">
|
||||||
|
<widget class="QLabel" name="fr_locationEdit">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">Location</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="1">
|
||||||
|
<widget class="QLabel" name="fr_emailEdit">
|
||||||
|
<property name="text">
|
||||||
|
<string notr="true">Email</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="2" column="0" colspan="2">
|
||||||
|
<widget class="QGroupBox" name="fr_optionsFrame">
|
||||||
|
<property name="title">
|
||||||
|
<string>Options</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QFormLayout" name="formLayout_4">
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="fr_groupLabel">
|
||||||
|
<property name="text">
|
||||||
|
<string>Add friend to group:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="1">
|
||||||
|
<widget class="QComboBox" name="fr_groupComboBox"/>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0">
|
||||||
|
<widget class="QCheckBox" name="fr_signGPGCheckBox">
|
||||||
|
<property name="text">
|
||||||
|
<string>Authenticate friend (Sign GPG Key)</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="0">
|
||||||
|
<widget class="QCheckBox" name="fr_acceptNoSignGPGCheckBox">
|
||||||
|
<property name="text">
|
||||||
|
<string>Add as friend to connect with</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="0" colspan="2">
|
||||||
|
<spacer name="fr_verticalSpacer">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Vertical</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>488</width>
|
||||||
|
<height>118</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="3" column="0" colspan="2">
|
|
||||||
<spacer name="fr_verticalSpacer">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Vertical</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>488</width>
|
|
||||||
<height>118</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="ConnectFriendPage" name="ErrorMessagePage">
|
<widget class="ConnectFriendPage" name="ErrorMessagePage">
|
||||||
|
|
@ -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>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue