Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-08 14:42:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Display Info Label's on Conclusion Page, when its a Friend request.

Browse source 
Added default stylesheet's for the labels

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8354 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2015-06-03 15:04:24 +00:00
parent 5fd9ab59d7
commit d959d27e41
4 changed files with 195 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -104,6 +104,9 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) :
ui->foffRadioButton->hide(); ui->foffRadioButton->hide();
ui->rsidRadioButton->hide(); ui->rsidRadioButton->hide();
ui->fr_label->hide();
ui->requestinfolabel->hide();
connect(ui->acceptNoSignGPGCheckBox,SIGNAL(toggled(bool)), ui->_options_GB,SLOT(setEnabled(bool))) ; connect(ui->acceptNoSignGPGCheckBox,SIGNAL(toggled(bool)), ui->_options_GB,SLOT(setEnabled(bool))) ;
connect(ui->addKeyToKeyring_CB,SIGNAL(toggled(bool)), ui->acceptNoSignGPGCheckBox,SLOT(setChecked(bool))) ; connect(ui->addKeyToKeyring_CB,SIGNAL(toggled(bool)), ui->acceptNoSignGPGCheckBox,SLOT(setChecked(bool))) ;
} }
@ -146,6 +149,10 @@ void ConnectFriendWizard::setCertificate(const QString &certificate, bool friend
// Cyril: I disabled this because it seems to be not used anymore. // Cyril: I disabled this because it seems to be not used anymore.
//setStartId(friendRequest ? Page_FriendRequest : Page_Conclusion); //setStartId(friendRequest ? Page_FriendRequest : Page_Conclusion);
setStartId(Page_Conclusion); setStartId(Page_Conclusion);
if (friendRequest){
ui->fr_label->show();
ui->requestinfolabel->show();
}
} else { } else {
// error message // error message
setField("errorMessage", tr("Certificate Load Failed") + ": \n\n" + getErrorString(cert_load_error_code)) ; setField("errorMessage", tr("Certificate Load Failed") + ": \n\n" + getErrorString(cert_load_error_code)) ;
@ -166,6 +173,10 @@ void ConnectFriendWizard::setGpgId(const RsPgpId &gpgId, const RsPeerId &sslId,
//setStartId(friendRequest ? Page_FriendRequest : Page_Conclusion); //setStartId(friendRequest ? Page_FriendRequest : Page_Conclusion);
setStartId(Page_Conclusion); setStartId(Page_Conclusion);
if (friendRequest){
ui->fr_label->show();
ui->requestinfolabel->show();
}
} }
ConnectFriendWizard::~ConnectFriendWizard() ConnectFriendWizard::~ConnectFriendWizard()
@ -364,6 +375,7 @@ void ConnectFriendWizard::initializePage(int id)
} }
} }
ui->fr_label->setText(tr("You have a friend request from") + " " + QString::fromUtf8(peerDetails.name.c_str()));
ui->nameEdit->setText(QString::fromUtf8(peerDetails.name.c_str())); ui->nameEdit->setText(QString::fromUtf8(peerDetails.name.c_str()));
ui->trustEdit->setText(trustString); ui->trustEdit->setText(trustString);
ui->emailEdit->setText(QString::fromUtf8(peerDetails.email.c_str())); ui->emailEdit->setText(QString::fromUtf8(peerDetails.email.c_str()));
@ -441,7 +453,7 @@ void ConnectFriendWizard::initializePage(int id)
ui->fr_nodeEdit->setText(loc); ui->fr_nodeEdit->setText(loc);
ui->fr_label->setText(tr("You have a friend request from") + " " + QString::fromUtf8(peerDetails.name.c_str())); ui->fr_label_3->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);
} }

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

@ -542,7 +542,7 @@
<widget class="QFrame" name="frame"> <widget class="QFrame" name="frame">
<layout class="QVBoxLayout" name="verticalLayout_13"> <layout class="QVBoxLayout" name="verticalLayout_13">
<item> <item>
<widget class="StyledLabel" name="fr_label"> <widget class="StyledLabel" name="fr_label_3">
<property name="text"> <property name="text">
<string notr="true">You have a friend request from</string> <string notr="true">You have a friend request from</string>
</property> </property>
@ -723,7 +723,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="StyledLabel" name="requestinfolabel"> <widget class="StyledLabel" name="requestinfolabel_3">
<property name="text"> <property name="text">
<string>To accept the Friend Request, click the Finish button.</string> <string>To accept the Friend Request, click the Finish button.</string>
</property> </property>
@ -855,6 +855,89 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="StyledLabel" name="fr_label">
<property name="palette">
<palette>
<active>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="text">
<string notr="true">You have a friend request from</string>
</property>
<property name="margin">
<number>2</number>
</property>
</widget>
</item>
<item> <item>
<widget class="QGroupBox" name="peerDetailsFrame"> <widget class="QGroupBox" name="peerDetailsFrame">
<property name="title"> <property name="title">
@ -1051,6 +1134,86 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="StyledLabel" name="requestinfolabel">
<property name="palette">
<palette>
<active>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
<property name="text">
<string>To accept the Friend Request, click the Finish button.</string>
</property>
<property name="margin">
<number>2</number>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWizardPage" name="FriendRecommendationsPage"> <widget class="QWizardPage" name="FriendRecommendationsPage">

18
retroshare-gui/src/gui/qss/stylesheet/Standard.qss
View file

@ -330,10 +330,11 @@ GenCertDialog > QFrame#headerFrame > QLabel#headerLabel {
/* ConnectFriendWizard */ /* ConnectFriendWizard */
ConnectFriendWizard QWizardPage#FriendRequestPage > QFrame#frame { ConnectFriendWizard QWizardPage#ConclusionPage > QGroupBox#peerDetailsFrame {
border: 2px solid #CCCCCC; border: 2px solid #CCCCCC;
border-radius:6px; border-radius:6px;
background: white; background: white;
padding: 12 12px;
} }
ConnectFriendWizard QWizardPage#ConclusionPage > QLabel#makefriend_infolabel ConnectFriendWizard QWizardPage#ConclusionPage > QLabel#makefriend_infolabel
@ -344,6 +345,14 @@ ConnectFriendWizard QWizardPage#ConclusionPage > QLabel#makefriend_infolabel
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2); background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2);
} }
ConnectFriendWizard QLabel#fr_label, QLabel#requestinfolabel
{
border: 1px solid #DCDC41;
border-radius: 6px;
background: #FFFFD7;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2);
}
/* Toaster */ /* Toaster */
ChatToaster > QFrame#windowFrame, ChatToaster > QFrame#windowFrame,
@ -526,13 +535,6 @@ ServerPage QPlainTextEdit#plainTextEdit {
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2); background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2);
} }
ConnectFriendWizard QLabel#requestinfolabel {
border: 1px solid #DCDC41;
border-radius: 6px;
background: #FFFFD7;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2);
}
/* ProfileManager */ /* ProfileManager */
ProfileManager > QFrame#headerFrame { ProfileManager > QFrame#headerFrame {

9
retroshare-gui/src/gui/qss/stylesheet/qss.default
View file

@ -99,9 +99,14 @@ HeaderFrame QLabel#headerLabel
qproperty-fontSizeFactor: 225; qproperty-fontSizeFactor: 225;
} }
ConnectFrientWizard QLabel#fr_label, ConnectFrientWizard QLabel#requestinfolabel ConnectFrientWizard QLabel#fr_label
{ {
qproperty-fontSizeFactor: 150; qproperty-fontSizeFactor: 125;
}
ConnectFrientWizard QLabel#requestinfolabel
{
qproperty-fontSizeFactor: 125;
} }
ConnectFriendWizard QLabel#makefriend_infolabel ConnectFriendWizard QLabel#makefriend_infolabel