diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp
index 7f10552d9..10436c4b4 100644
--- a/retroshare-gui/src/gui/GenCertDialog.cpp
+++ b/retroshare-gui/src/gui/GenCertDialog.cpp
@@ -119,7 +119,8 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent)
ui.headerFrame->setHeaderText(tr("Create a new Identity"));
connect(ui.new_gpg_key_checkbox, SIGNAL(clicked()), this, SLOT(newGPGKeyGenUiSetup()));
- connect(ui.adv_checkbox, SIGNAL(clicked()), this, SLOT(hiddenUiSetup()));
+ connect(ui.adv_checkbox, SIGNAL(clicked()), this, SLOT(updateUiSetup()));
+ connect(ui.hidden_checkbox, SIGNAL(clicked()), this, SLOT(updateUiSetup()));
connect(ui.genButton, SIGNAL(clicked()), this, SLOT(genPerson()));
connect(ui.importIdentity_PB, SIGNAL(clicked()), this, SLOT(importIdentity()));
@@ -232,7 +233,7 @@ void GenCertDialog::init()
ui.header_label->setText(text);
newGPGKeyGenUiSetup();
- hiddenUiSetup();
+ updateUiSetup();
}
void GenCertDialog::mouseMoveEvent(QMouseEvent *e)
@@ -292,29 +293,47 @@ void GenCertDialog::newGPGKeyGenUiSetup() {
}
}
-void GenCertDialog::hiddenUiSetup()
+void GenCertDialog::updateUiSetup()
{
+ if (ui.adv_checkbox->isChecked())
+ {
+ ui.hidden_checkbox->show();
+ ui.keylength_label->show();
+ ui.keylength_comboBox->show();
+
+ if(ui.hidden_checkbox->isChecked())
+ {
+ ui.hiddenaddr_input->show();
+ ui.hiddenaddr_label->show();
+ ui.label_hiddenaddr2->show();
+ ui.hiddenport_label->show();
+ ui.hiddenport_spinBox->show();
+ }
+ else
+ {
+ ui.hiddenaddr_input->hide();
+ ui.hiddenaddr_label->hide();
+ ui.label_hiddenaddr2->hide();
+ ui.hiddenport_label->hide();
+ ui.hiddenport_spinBox->hide();
+ }
+ }
+ else
+ {
+ ui.hiddenaddr_input->hide();
+ ui.hiddenaddr_label->hide();
+ ui.label_hiddenaddr2->hide();
+ ui.hiddenport_label->hide();
+ ui.hiddenport_spinBox->hide();
+
+ ui.hidden_checkbox->hide();
+ ui.keylength_label->hide();
+ ui.keylength_comboBox->hide();
+
+ if(ui.hidden_checkbox->isChecked())
+ ui.hidden_checkbox->setChecked(false) ;
+ }
- if (ui.adv_checkbox->isChecked())
- {
- ui.hiddenaddr_input->show();
- ui.hiddenaddr_label->show();
- ui.label_hiddenaddr2->show();
- ui.hiddenport_label->show();
- ui.hiddenport_spinBox->show();
- ui.keylength_label->show();
- ui.keylength_comboBox->show();
- }
- else
- {
- ui.hiddenaddr_input->hide();
- ui.hiddenaddr_label->hide();
- ui.label_hiddenaddr2->hide();
- ui.hiddenport_label->hide();
- ui.hiddenport_spinBox->hide();
- ui.keylength_label->hide();
- ui.keylength_comboBox->hide();
- }
}
void GenCertDialog::exportIdentity()
@@ -368,7 +387,7 @@ void GenCertDialog::genPerson()
RsPgpId PGPId;
bool isHiddenLoc = false;
- if (ui.adv_checkbox->isChecked())
+ if (ui.hidden_checkbox->isChecked())
{
std::string hl = ui.hiddenaddr_input->text().toStdString();
uint16_t port = ui.hiddenport_spinBox->value();
@@ -443,8 +462,9 @@ void GenCertDialog::genPerson()
ui.genButton->hide();
ui.importIdentity_PB->hide();
ui.genprofileinfo_label->hide();
- ui.adv_checkbox->hide();
- ui.keylength_label->hide();
+ ui.hidden_checkbox->hide();
+ ui.adv_checkbox->hide();
+ ui.keylength_label->hide();
ui.keylength_comboBox->hide();
setCursor(Qt::WaitCursor) ;
diff --git a/retroshare-gui/src/gui/GenCertDialog.h b/retroshare-gui/src/gui/GenCertDialog.h
index d6769468c..3080207a9 100644
--- a/retroshare-gui/src/gui/GenCertDialog.h
+++ b/retroshare-gui/src/gui/GenCertDialog.h
@@ -42,7 +42,7 @@ private slots:
void exportIdentity();
void newGPGKeyGenUiSetup();
void grabMouse();
- void hiddenUiSetup();
+ void updateUiSetup();
private:
void init();
diff --git a/retroshare-gui/src/gui/GenCertDialog.ui b/retroshare-gui/src/gui/GenCertDialog.ui
index 160bf1cd8..a319168c5 100644
--- a/retroshare-gui/src/gui/GenCertDialog.ui
+++ b/retroshare-gui/src/gui/GenCertDialog.ui
@@ -6,8 +6,8 @@
0
0
- 805
- 509
+ 853
+ 592
@@ -17,444 +17,15 @@
:/images/logo/logo_48.png:/images/logo/logo_48.png
-
-
- 0
-
-
- 0
-
- -
-
-
-
- 0
- 30
-
-
-
-
-
-
-
-
- Tahoma
- 11
-
-
-
-
-
-
- true
-
-
-
- -
-
-
-
- Tahoma
- 11
-
-
-
- You can create and run Retroshare nodes on different computers using the same identity. To do so just export the selected identity, import it on the other computer and create a new node with it.
-
-
- true
-
-
-
- -
-
-
-
-
-
-
- It looks like you don't own any profile (PGP keys). Please fill in the form below to create one, or import an existing profile.
-
-
- true
-
-
-
- -
-
-
- 6
-
-
- 0
-
-
- 0
-
-
-
-
-
-
- 16777215
- 32
-
-
-
- Your profile is associated with a PGP key
-
-
- Create a new identity
-
-
-
- :/images/contact_new128.png:/images/contact_new128.png
-
-
-
- 32
- 32
-
-
-
- false
-
-
-
- -
-
-
-
- 16777215
- 32
-
-
-
- Your profile is associated with a PGP key
-
-
- Advanced
-
-
-
- :/images/kcmsystem24.png:/images/kcmsystem24.png
-
-
-
- 24
- 24
-
-
-
- false
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Import new identity
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Export selected identity
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
- Use identity
-
-
-
- -
-
-
- Name
-
-
-
- -
-
-
- Email
-
-
-
- -
-
-
- This password is for PGP
-
-
- Password
-
-
-
- -
-
-
- This password is for PGP
-
-
- Password (check)
-
-
-
- -
-
-
- Node
-
-
-
- -
-
-
- TOR address
-
-
-
- -
-
-
- RSA key length
-
-
-
-
-
- -
-
-
-
-
-
- Your profile is associated with a PGP key. RetroShare currently ignores DSA keys.
-
-
-
- -
-
-
- Enter your nickname here
-
-
- 64
-
-
-
- -
-
-
- 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.
-
-
- 64
-
-
-
- -
-
-
- Put a strong password here. This password protects your PGP key.
-
-
-
-
-
- 1024
-
-
- QLineEdit::Password
-
-
-
- -
-
-
- Put a strong password here. This password protects your PGP key.
-
-
-
-
-
- 1024
-
-
- QLineEdit::Password
-
-
-
- -
-
-
- 64
-
-
-
- -
-
-
- 6
-
-
-
-
-
- 64
-
-
-
- -
-
-
- Port
-
-
-
- -
-
-
- 1
-
-
- 65535
-
-
- 7812
-
-
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- 24
-
-
-
- -
-
-
-
- 10
-
-
-
- <html><head/><body><p align="justify">Before proceeding, move your mouse around to help Retroshare collect as much randomness as possible. Filling the progressbar to 20% is needed, 100% is advised.</p></body></html>
-
-
- true
-
-
-
- -
-
-
-
- 0
- 30
-
-
-
- 1
-
-
- This is a TOR Onion address of the form: xa76giaf6ifda7ri63i263.onion and your selected port, you must first launch TOR and create a new hidden service to generate this address.
-
-
- false
-
-
- true
-
-
-
- -
-
-
-
- 16777215
- 26
-
-
-
-
- Arial
- 50
- false
-
-
-
-
-
-
- Create new identity
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
-
- -
+
+
-
+ -
+
+
+
+ Tahoma
+ 11
+
+
+
+
+
+
+ true
+
+
+
+ -
+
+
+
+ Tahoma
+ 11
+
+
+
+ You can create and run Retroshare nodes on different computers using the same identity. To do so just export the selected identity, import it on the other computer and create a new node with it.
+
+
+ true
+
+
+
+ -
+
+
+ It looks like you don't own any profile (PGP keys). Please fill in the form below to create one, or import an existing profile.
+
+
+ true
+
+
+
+ -
+
+
-
+
+
+
+ 16777215
+ 32
+
+
+
+ Your profile is associated with a PGP key
+
+
+ Create a new identity
+
+
+
+ :/images/contact_new128.png:/images/contact_new128.png
+
+
+
+ 32
+ 32
+
+
+
+ false
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Import new identity
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Export selected identity
+
+
+
+ -
+
+
+
+ 16777215
+ 32
+
+
+
+ Your profile is associated with a PGP key
+
+
+ Advanced options
+
+
+
+ :/images/kcmsystem24.png:/images/kcmsystem24.png
+
+
+
+ 24
+ 24
+
+
+
+ false
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+ 6
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Create a hidden node
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
-
+
+
-
+
+
+ Use identity
+
+
+
+ -
+
+
+ Name
+
+
+
+ -
+
+
+ Email
+
+
+
+ -
+
+
+ This password is for PGP
+
+
+ Password
+
+
+
+ -
+
+
+ This password is for PGP
+
+
+ Password (check)
+
+
+
+ -
+
+
+ Node
+
+
+
+ -
+
+
+ TOR address
+
+
+
+ -
+
+
+ SSL key length
+
+
+
+
+
+ -
+
+
-
+
+
+ Your profile is associated with a PGP key. RetroShare currently ignores DSA keys.
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 32
+
+
+
+ Enter your nickname here
+
+
+ 64
+
+
+
+ -
+
+
+ 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.
+
+
+ 64
+
+
+
+ -
+
+
+ Put a strong password here. This password protects your PGP key.
+
+
+
+
+
+ 1024
+
+
+ QLineEdit::Password
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Put a strong password here. This password protects your PGP key.
+
+
+
+
+
+ 1024
+
+
+ QLineEdit::Password
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 64
+
+
+
+ -
+
+
+ 6
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 32
+
+
+
+ 64
+
+
+
+ -
+
+
+ Port
+
+
+
+ -
+
+
+ <html><head/><body><p>This is your connection port.</p><p>Any value between 1024 and 65535 </p><p>should be ok. You can change it later.</p></body></html>
+
+
+ 1
+
+
+ 65535
+
+
+ 7812
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 30
+
+
+
+ 1
+
+
+ This is a TOR Onion address of the form: xa76giaf6ifda7ri63i263.onion and your selected port, you must first launch TOR and create a new hidden service to generate this address.
+
+
+ false
+
+
+ true
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ <html><head/><body><p align="justify">Before proceeding, move your mouse around to help Retroshare collect as much randomness as possible. Filling the progressbar to 20% is needed, 100% is advised.</p></body></html>
+
+
+ true
+
+
+
+ -
+
+
+ 24
+
+
+
+ -
+
+
+
+ 16777215
+ 26
+
+
+
+
+ Arial
+ 50
+ false
+
+
+
+
+
+
+ Create new identity
+
+
+
+ headerFrame
+ header_label
+ genButton
+ header_label
+ layoutWidget
+ layoutWidget_2
+ genprofileinfo_label
+ entropy_bar
+ label_hiddenaddr2
+ entropy_label
+ layoutWidget_3
+ headerFrame
+ no_gpg_key_label
@@ -476,21 +527,6 @@ anonymous, you can use a fake email.
1
-
- genPGPuser
- name_input
- email_input
- password_input
- password_input_2
- node_input
- hiddenaddr_input
- hiddenport_spinBox
- genButton
- new_gpg_key_checkbox
- adv_checkbox
- importIdentity_PB
- exportIdentity_PB
-