mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-08-13 08:35:45 -04:00
removed email field from GenCertDialog, since it is not useful inside RS
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6478 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
66d38ff1bb
commit
9592baab3b
2 changed files with 54 additions and 36 deletions
|
@ -50,6 +50,10 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent)
|
||||||
ui.name_input->setPlaceholderText(tr("[Required] Visible to your friends, and friends of friends."));
|
ui.name_input->setPlaceholderText(tr("[Required] Visible to your friends, and friends of friends."));
|
||||||
ui.password_input->setPlaceholderText(tr("[Required] This password protects your PGP key."));
|
ui.password_input->setPlaceholderText(tr("[Required] This password protects your PGP key."));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
ui.email_input->hide() ;
|
||||||
|
ui.email_label->hide() ;
|
||||||
|
|
||||||
/* get all available pgp private certificates....
|
/* get all available pgp private certificates....
|
||||||
* mark last one as default.
|
* mark last one as default.
|
||||||
*/
|
*/
|
||||||
|
@ -119,8 +123,8 @@ void GenCertDialog::newGPGKeyGenUiSetup() {
|
||||||
genNewGPGKey = true;
|
genNewGPGKey = true;
|
||||||
ui.name_label->show();
|
ui.name_label->show();
|
||||||
ui.name_input->show();
|
ui.name_input->show();
|
||||||
ui.email_label->show();
|
// ui.email_label->show();
|
||||||
ui.email_input->show();
|
// ui.email_input->show();
|
||||||
ui.password_label->show();
|
ui.password_label->show();
|
||||||
ui.password_input->show();
|
ui.password_input->show();
|
||||||
ui.genPGPuserlabel->hide();
|
ui.genPGPuserlabel->hide();
|
||||||
|
@ -134,8 +138,8 @@ void GenCertDialog::newGPGKeyGenUiSetup() {
|
||||||
genNewGPGKey = false;
|
genNewGPGKey = false;
|
||||||
ui.name_label->hide();
|
ui.name_label->hide();
|
||||||
ui.name_input->hide();
|
ui.name_input->hide();
|
||||||
ui.email_label->hide();
|
// ui.email_label->hide();
|
||||||
ui.email_input->hide();
|
// ui.email_input->hide();
|
||||||
ui.password_label->hide();
|
ui.password_label->hide();
|
||||||
ui.password_input->hide();
|
ui.password_input->hide();
|
||||||
ui.genPGPuserlabel->show();
|
ui.genPGPuserlabel->show();
|
||||||
|
@ -236,8 +240,8 @@ void GenCertDialog::genPerson()
|
||||||
ui.new_gpg_key_checkbox->hide();
|
ui.new_gpg_key_checkbox->hide();
|
||||||
ui.name_label->hide();
|
ui.name_label->hide();
|
||||||
ui.name_input->hide();
|
ui.name_input->hide();
|
||||||
ui.email_label->hide();
|
// ui.email_label->hide();
|
||||||
ui.email_input->hide();
|
// ui.email_input->hide();
|
||||||
ui.password_label->hide();
|
ui.password_label->hide();
|
||||||
ui.password_input->hide();
|
ui.password_input->hide();
|
||||||
ui.genPGPuserlabel->hide();
|
ui.genPGPuserlabel->hide();
|
||||||
|
@ -253,7 +257,8 @@ void GenCertDialog::genPerson()
|
||||||
QCoreApplication::processEvents();
|
QCoreApplication::processEvents();
|
||||||
while(QAbstractEventDispatcher::instance()->processEvents(QEventLoop::AllEvents)) ;
|
while(QAbstractEventDispatcher::instance()->processEvents(QEventLoop::AllEvents)) ;
|
||||||
|
|
||||||
RsInit::GeneratePGPCertificate(ui.name_input->text().toUtf8().constData(), ui.email_input->text().toUtf8().constData(), ui.password_input->text().toUtf8().constData(), PGPId, err_string);
|
std::string email_str = "" ;
|
||||||
|
RsInit::GeneratePGPCertificate(ui.name_input->text().toUtf8().constData(), email_str.c_str(), ui.password_input->text().toUtf8().constData(), PGPId, err_string);
|
||||||
|
|
||||||
setCursor(Qt::ArrowCursor) ;
|
setCursor(Qt::ArrowCursor) ;
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,6 +51,19 @@
|
||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
<widget class="QGroupBox" name="groupBox">
|
<widget class="QGroupBox" name="groupBox">
|
||||||
<layout class="QGridLayout" name="gridLayout_2">
|
<layout class="QGridLayout" name="gridLayout_2">
|
||||||
|
<item row="9" column="0" colspan="2">
|
||||||
|
<spacer name="verticalSpacer">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Vertical</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>1</width>
|
||||||
|
<height>1</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
<item row="0" column="0" colspan="2">
|
<item row="0" column="0" colspan="2">
|
||||||
<widget class="QLabel" name="no_gpg_key_label">
|
<widget class="QLabel" name="no_gpg_key_label">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -80,21 +93,8 @@
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>Enter your nickname here</string>
|
<string>Enter your nickname here</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
<property name="maxLength">
|
||||||
</item>
|
<number>64</number>
|
||||||
<item row="4" column="0">
|
|
||||||
<widget class="QLabel" name="email_label">
|
|
||||||
<property name="text">
|
|
||||||
<string>Email</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="1">
|
|
||||||
<widget class="QLineEdit" name="email_input">
|
|
||||||
<property name="toolTip">
|
|
||||||
<string>Be careful: this email will be visible to your friends and friends
|
|
||||||
of your friends. This information is required by PGP, but to stay
|
|
||||||
anonymous, you can use a fake email.</string>
|
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -116,6 +116,9 @@ anonymous, you can use a fake email.</string>
|
||||||
<property name="inputMask">
|
<property name="inputMask">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="maxLength">
|
||||||
|
<number>1024</number>
|
||||||
|
</property>
|
||||||
<property name="echoMode">
|
<property name="echoMode">
|
||||||
<enum>QLineEdit::Password</enum>
|
<enum>QLineEdit::Password</enum>
|
||||||
</property>
|
</property>
|
||||||
|
@ -129,7 +132,11 @@ anonymous, you can use a fake email.</string>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="6" column="1">
|
<item row="6" column="1">
|
||||||
<widget class="QLineEdit" name="location_input"/>
|
<widget class="QLineEdit" name="location_input">
|
||||||
|
<property name="maxLength">
|
||||||
|
<number>64</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="7" column="1">
|
<item row="7" column="1">
|
||||||
<widget class="QLabel" name="label_location2">
|
<widget class="QLabel" name="label_location2">
|
||||||
|
@ -177,19 +184,6 @@ anonymous, you can use a fake email.</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="9" column="0" colspan="2">
|
|
||||||
<spacer name="verticalSpacer">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Vertical</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>1</width>
|
|
||||||
<height>1</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0" colspan="2">
|
<item row="1" column="0" colspan="2">
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,0,0">
|
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,0,0">
|
||||||
<property name="spacing">
|
<property name="spacing">
|
||||||
|
@ -259,6 +253,25 @@ anonymous, you can use a fake email.</string>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="4" column="0">
|
||||||
|
<widget class="QLabel" name="email_label">
|
||||||
|
<property name="text">
|
||||||
|
<string>Email</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="4" column="1">
|
||||||
|
<widget class="QLineEdit" name="email_input">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Be careful: this email will be visible to your friends and friends
|
||||||
|
of your friends. This information is required by PGP, but to stay
|
||||||
|
anonymous, you can use a fake email.</string>
|
||||||
|
</property>
|
||||||
|
<property name="maxLength">
|
||||||
|
<number>64</number>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue