fixed PGP/SSL key size combo box (patch from sehraf, modified)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8252 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-05-15 10:19:57 +00:00
parent 723d540ce3
commit 487a52a669
2 changed files with 17 additions and 7 deletions

View File

@ -157,9 +157,9 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent)
ui.entropy_bar->setValue(0) ;
// make sure that QVariant always takes an 'int' otherwise the program will crash!
ui.keylength_comboBox->addItem("2048 bits", QVariant(2048));
ui.keylength_comboBox->addItem("3072 bits", QVariant(3072));
ui.keylength_comboBox->addItem("4096 bits", QVariant(4096));
ui.keylength_comboBox->addItem("default (2048 bits, recommended)", QVariant(2048));
ui.keylength_comboBox->addItem("high (3072 bits)", QVariant(3072));
ui.keylength_comboBox->addItem("insane (4096 bits)", QVariant(4096));
#if QT_VERSION >= 0x040700
ui.email_input->setPlaceholderText(tr("[Optional] Visible to your friends, and friends of friends.")) ;
@ -328,9 +328,19 @@ void GenCertDialog::updateUiSetup()
if (ui.adv_checkbox->isChecked())
{
ui.hidden_checkbox->show();
ui.keylength_label->show();
ui.keylength_comboBox->show();
if (ui.new_gpg_key_checkbox->isChecked())
{
// key length is only for pgp key creation
ui.keylength_label->show();
ui.keylength_comboBox->show();
}
else
{
ui.keylength_label->hide();
ui.keylength_comboBox->hide();
}
if(ui.hidden_checkbox->isChecked())
{
ui.hiddenaddr_input->show();

View File

@ -297,7 +297,7 @@
<item>
<widget class="QLabel" name="keylength_label">
<property name="text">
<string>SSL key length</string>
<string>PGP key length</string>
</property>
</widget>
</item>