Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-26 07:55:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed a few bugs in cert creation window

Browse source
This commit is contained in:
csoler 2017-02-15 19:17:41 +01:00
parent 59f428f096
commit b81764893a
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
retroshare-gui/src/gui/GenCertDialog.cpp
View file

@ -145,6 +145,7 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent)
connect(ui.password_input_2, SIGNAL(textChanged(QString)), this, SLOT(updateCheckLabels())); connect(ui.password_input_2, SIGNAL(textChanged(QString)), this, SLOT(updateCheckLabels()));
connect(ui.name_input, SIGNAL(textChanged(QString)), this, SLOT(updateCheckLabels())); connect(ui.name_input, SIGNAL(textChanged(QString)), this, SLOT(updateCheckLabels()));
connect(ui.node_input, SIGNAL(textChanged(QString)), this, SLOT(updateCheckLabels())); connect(ui.node_input, SIGNAL(textChanged(QString)), this, SLOT(updateCheckLabels()));
connect(ui.reuse_existing_node_CB, SIGNAL(toggled(bool)), this, SLOT(updateCheckLabels()));
entropy_timer = new QTimer ; entropy_timer = new QTimer ;
entropy_timer->start(20) ; entropy_timer->start(20) ;
@ -177,6 +178,7 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent)
initKeyList(); initKeyList();
setupState(); setupState();
updateCheckLabels();
} }
GenCertDialog::~GenCertDialog() GenCertDialog::~GenCertDialog()
@ -278,6 +280,7 @@ void GenCertDialog::setupState()
ui.password_input->setVisible(true); ui.password_input->setVisible(true);
ui.password_label->setVisible(true); ui.password_label->setVisible(true);
ui.password2_check_LB->setVisible(generate_new);
ui.password_input_2->setVisible(generate_new); ui.password_input_2->setVisible(generate_new);
ui.password_label_2->setVisible(generate_new); ui.password_label_2->setVisible(generate_new);
@ -297,13 +300,13 @@ void GenCertDialog::setupState()
if(mEntropyOk && mAllFieldsOk) if(mEntropyOk && mAllFieldsOk)
{ {
ui.genButton->setEnabled(true) ; ui.genButton->setEnabled(true) ;
ui.genButton->setIcon(QIcon(":/images/resume.png")) ; ui.genButton->setIcon(QIcon(IMAGE_GOOD)) ;
ui.genButton->setToolTip(tr("Click to create your node and/or profile")) ; ui.genButton->setToolTip(tr("Click to create your node and/or profile")) ;
} }
else else
{ {
ui.genButton->setEnabled(false) ; ui.genButton->setEnabled(false) ;
ui.genButton->setIcon(QIcon(":/images/delete.png")) ; ui.genButton->setIcon(QIcon(IMAGE_BAD)) ;
ui.genButton->setToolTip(tr("Disabled until all fields correctly set and enough randomness collected.")) ; ui.genButton->setToolTip(tr("Disabled until all fields correctly set and enough randomness collected.")) ;
} }
} }
@ -329,6 +332,7 @@ void GenCertDialog::updateCheckLabels()
QPixmap good( IMAGE_GOOD ) ; QPixmap good( IMAGE_GOOD ) ;
QPixmap bad ( IMAGE_BAD ) ; QPixmap bad ( IMAGE_BAD ) ;
bool generate_new = !ui.reuse_existing_node_CB->isChecked();
mAllFieldsOk = true ; mAllFieldsOk = true ;
if(ui.node_input->text().length() > 3) if(ui.node_input->text().length() > 3)
@ -339,7 +343,7 @@ void GenCertDialog::updateCheckLabels()
ui.node_name_check_LB ->setPixmap(bad) ; ui.node_name_check_LB ->setPixmap(bad) ;
} }
if(ui.name_input->text().length() > 3) if(!generate_new || ui.name_input->text().length() > 3)
ui.profile_name_check_LB ->setPixmap(good) ; ui.profile_name_check_LB ->setPixmap(good) ;
else else
{ {
@ -358,7 +362,9 @@ void GenCertDialog::updateCheckLabels()
ui.password2_check_LB ->setPixmap(good) ; ui.password2_check_LB ->setPixmap(good) ;
else else
{ {
if(generate_new)
mAllFieldsOk = false ; mAllFieldsOk = false ;
ui.password2_check_LB ->setPixmap(bad) ; ui.password2_check_LB ->setPixmap(bad) ;
} }
@ -498,6 +504,8 @@ void GenCertDialog::genPerson()
ui.nickname_input->hide(); ui.nickname_input->hide();
ui.password_label_2->hide(); ui.password_label_2->hide();
ui.password_input_2->hide(); ui.password_input_2->hide();
ui.password2_check_LB->hide();
ui.password_check_LB->hide();
ui.password_label->hide(); ui.password_label->hide();
ui.password_input->hide(); ui.password_input->hide();
//ui.genPGPuserlabel->hide(); //ui.genPGPuserlabel->hide();