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

removed unused Email page from ConnectFriendWizard

Browse source
This commit is contained in:
csoler 2019-06-10 00:22:57 +02:00
parent 0c510a55e9
commit c0436b781c
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
3 changed files with 4 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -418,22 +418,6 @@ void ConnectFriendWizard::initializePage(int id)
break; break;
case Page_WebMail: case Page_WebMail:
case Page_Email:
{
ui->EmailPage->registerField("addressEdit*", ui->addressEdit);
ui->EmailPage->registerField("subjectEdit*", ui->subjectEdit);
ui->subjectEdit->setText(tr("RetroShare Invitation"));
ui->inviteTextEdit->setPlainText(GetStartedDialog::GetInviteText());
QString body = ui->inviteTextEdit->toPlainText();
body += "\n" + GetStartedDialog::GetCutBelowText();
body += "\n\n" + QString::fromUtf8(rsPeers->GetRetroshareInvite().c_str());
ui->inviteTextEdit->setPlainText(body);
}
break;
case Page_ErrorMessage: case Page_ErrorMessage:
break; break;
case Page_Conclusion: case Page_Conclusion:
@ -762,21 +746,6 @@ bool ConnectFriendWizard::validateCurrentPage()
} }
break; break;
} }
case Page_Email:
{
QString mailaddresses = ui->addressEdit->text();
if (mailaddresses.isEmpty()) {
return false;
}
QString body = ui->inviteTextEdit->toPlainText();
body += "\n" + GetStartedDialog::GetCutBelowText();
body += "\n\n" + QString::fromUtf8(rsPeers->GetRetroshareInvite().c_str());
sendMail (mailaddresses, ui->subjectEdit->text(), body);
}
break;
case Page_ErrorMessage: case Page_ErrorMessage:
break; break;
case Page_Conclusion: case Page_Conclusion:
@ -817,7 +786,6 @@ int ConnectFriendWizard::nextId() const
case Page_Text: case Page_Text:
case Page_Cert: case Page_Cert:
case Page_WebMail: case Page_WebMail:
case Page_Email:
case Page_ErrorMessage: case Page_ErrorMessage:
case Page_Conclusion: case Page_Conclusion:
case Page_FriendRequest: case Page_FriendRequest:
@ -1309,9 +1277,9 @@ void ConnectFriendWizard::signAllSelectedUsers()
//============================= RsidPage ===================================== //============================= RsidPage =====================================
#endif
//============================ Emailpage ===================================== //============================ Emailpage =====================================
#endif
//========================= ErrorMessagePage ================================= //========================= ErrorMessagePage =================================

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) Q_PROPERTY(QString titleColor READ titleColor WRITE setTitleColor)
public: public:
enum Page { Page_Text, Page_Cert, Page_ErrorMessage, Page_Conclusion, Page_WebMail, Page_Email, Page_FriendRequest, Page_FriendRecommendations }; enum Page { Page_Text, Page_Cert, Page_ErrorMessage, Page_Conclusion, Page_WebMail, Page_FriendRequest, Page_FriendRecommendations };
ConnectFriendWizard(QWidget *parent = 0); ConnectFriendWizard(QWidget *parent = 0);
~ConnectFriendWizard(); ~ConnectFriendWizard();

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

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1100</width> <width>1161</width>
<height>604</height> <height>817</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -577,58 +577,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="ConnectFriendPage" name="EmailPage">
<property name="title">
<string>Invite Friends by Email</string>
</property>
<property name="subTitle">
<string>Enter your friends' email addresses (separate each one with a semicolon)</string>
</property>
<attribute name="pageId">
<string notr="true">ConnectFriendWizard::Page_Email</string>
</attribute>
<layout class="QVBoxLayout" name="EmailPageVLayout">
<item>
<layout class="QHBoxLayout" name="addressHLayout">
<item>
<widget class="QLabel" name="addressLabel">
<property name="text">
<string>Your friends' email addresses:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="addressEdit">
<property name="whatsThis">
<string>Enter Friends Email addresses</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="subjectHLayout">
<item>
<widget class="QLabel" name="subjectLabel">
<property name="text">
<string>Subject:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="subjectEdit"/>
</item>
</layout>
</item>
<item>
<widget class="QPlainTextEdit" name="inviteTextEdit">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="ConnectFriendPage" name="FriendRequestPage"> <widget class="ConnectFriendPage" name="FriendRequestPage">
<property name="title"> <property name="title">
<string>Friend request</string> <string>Friend request</string>