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

removed unused intro page from ConnectFriendWizard

Browse Source
This commit is contained in:
csoler 2019-06-10 00:12:20 +02:00
parent a7141cbf69
commit 6294aefc6d
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
3 changed files with 5 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View File

@ -91,7 +91,7 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) :
setWizardStyle(ModernStyle);
#endif
setStartId(Page_Intro);
setStartId(Page_Cert);
// at this moment I don't know, what information should be in help
// setOption(HaveHelpButton, true);
@ -106,8 +106,8 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) :
ui->ErrorMessagePage->registerField("errorMessage", ui->messageLabel, "text");
/* disable not used pages */
ui->foffRadioButton->hide();
ui->rsidRadioButton->hide();
//ui->foffRadioButton->hide();
//ui->rsidRadioButton->hide();
ui->cp_Label->hide();
ui->requestinfolabel->hide();
@ -277,7 +277,6 @@ QString ConnectFriendWizard::getErrorString(uint32_t error_code)
void ConnectFriendWizard::setCertificate(const QString &certificate, bool friendRequest)
{
if (certificate.isEmpty()) {
setStartId(Page_Intro);
return;
}
@ -383,9 +382,6 @@ static void fillGroups(ConnectFriendWizard *wizard, QComboBox *comboBox, const Q
void ConnectFriendWizard::initializePage(int id)
{
switch ((Page) id) {
case Page_Intro:
ui->textRadioButton->setChecked(true);
break;
case Page_Text:
connect(ui->userCertHelpButton, SIGNAL( clicked()), this, SLOT(showHelpUserCert()));
connect(ui->userCertIncludeSignaturesButton, SIGNAL(clicked()), this, SLOT(toggleSignatureState()));
@ -716,7 +712,6 @@ bool ConnectFriendWizard::validateCurrentPage()
error = true;
switch ((Page) currentId()) {
case Page_Intro:
case Page_WebMail:
break;
case Page_Text:
@ -858,15 +853,6 @@ bool ConnectFriendWizard::validateCurrentPage()
int ConnectFriendWizard::nextId() const
{
switch ((Page) currentId()) {
case Page_Intro:
if (ui->textRadioButton->isChecked()) return Page_Text;
if (ui->certRadioButton->isChecked()) return Page_Cert;
if (ui->foffRadioButton->isChecked()) return Page_Foff;
if (ui->rsidRadioButton->isChecked()) return Page_Rsid;
if (ui->webmailRadioButton->isChecked()) return Page_WebMail;
if (ui->emailRadioButton->isChecked()) return Page_Email;
if (ui->friendRecommendationsRadioButton->isChecked()) return Page_FriendRecommendations;
return ConnectFriendWizard::Page_Foff;
case Page_Text:
case Page_Cert:
case Page_Rsid:

2
retroshare-gui/src/gui/connect/ConnectFriendWizard.h
View File

@ -50,7 +50,7 @@ class ConnectFriendWizard : public QWizard
Q_PROPERTY(QString titleColor READ titleColor WRITE setTitleColor)
public:
enum Page { Page_Intro, Page_Text, Page_Cert, Page_ErrorMessage, Page_Conclusion, Page_Foff, Page_Rsid, Page_WebMail, Page_Email, Page_FriendRequest, Page_FriendRecommendations };
enum Page { Page_Text, Page_Cert, Page_ErrorMessage, Page_Conclusion, Page_Foff, Page_Rsid, Page_WebMail, Page_Email, Page_FriendRequest, Page_FriendRecommendations };
ConnectFriendWizard(QWidget *parent = 0);
~ConnectFriendWizard();

65
retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>1134</width>
<width>1100</width>
<height>604</height>
</rect>
</property>
@ -17,69 +17,6 @@
<iconset resource="../images.qrc">
<normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
</property>
<widget class="ConnectFriendPage" name="IntroPage">
<property name="title">
<string>Add a new Friend</string>
</property>
<property name="subTitle">
<string>This wizard will help you to connect to your friend(s) to RetroShare network.&lt;br&gt;Select how you would like to add a friend:</string>
</property>
<attribute name="pageId">
<string notr="true">ConnectFriendWizard::Page_Intro</string>
</attribute>
<layout class="QVBoxLayout" name="IntroPageVLayout">
<item>
<widget class="QRadioButton" name="textRadioButton">
<property name="text">
<string>Enter the certificate manually</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="certRadioButton">
<property name="text">
<string>&amp;You get a certificate file from your friend</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="foffRadioButton">
<property name="text">
<string>Ma&amp;ke friend with selected friends of my friends</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="rsidRadioButton">
<property name="text">
<string>Enter RetroShare ID manually</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="webmailRadioButton">
<property name="text">
<string>Send an In&amp;vitation by Web Mail Providers</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="emailRadioButton">
<property name="text">
<string>&amp;Send an Invitation by Email
(Your friend will receive an email with instructions how to download RetroShare)</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="friendRecommendationsRadioButton">
<property name="text">
<string>Recommend many friends to each other</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="ConnectFriendPage" name="TextPage">
<property name="title">
<string>RetroShare certificate</string>