Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-17 13:30:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

improved GenCertDialog with small indicator text, and hide location by default

Browse source
This commit is contained in:
csoler 2017-07-30 14:31:52 +02:00
parent 2e1bd2dd51
commit e82b6fc1fe
4 changed files with 41 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -162,6 +162,10 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent)
ui.keylength_comboBox->addItem("High (3072 bits)", QVariant(3072));
ui.keylength_comboBox->addItem("Very high (4096 bits)", QVariant(4096));
// Default value.
ui.node_input->setText("My computer") ;
#if QT_VERSION >= 0x040700
ui.node_input->setPlaceholderText(tr("Node name")) ;
ui.hiddenaddr_input->setPlaceholderText(tr("Tor/I2P address")) ;
@ -280,8 +284,9 @@ void GenCertDialog::setupState()
ui.nickname_label->setVisible(adv_state && !mOnlyGenerateIdentity);
ui.nickname_input->setVisible(adv_state && !mOnlyGenerateIdentity);
ui.node_label->setVisible(true);
ui.node_input->setVisible(true);
ui.node_name_check_LB->setVisible(adv_state);
ui.node_label->setVisible(adv_state);
ui.node_input->setVisible(adv_state);
ui.password_input->setVisible(true);
ui.password_label->setVisible(true);
@ -298,33 +303,38 @@ void GenCertDialog::setupState()
ui.hiddenaddr_input->setVisible(hidden_state);
ui.hiddenaddr_label->setVisible(hidden_state);
ui.hiddenport_label->setVisible(hidden_state);
ui.hiddenport_spinBox->setVisible(hidden_state);
ui.cbUseBob->setVisible(hidden_state);
if(!mAllFieldsOk)
{
ui.genButton->setToolTip(tr("<p>Node creation is disabled until all fields correctly set.</p>")) ;
ui.genButton->setText(tr("Generate (locked)"));
ui.genButton->setEnabled(false) ;
ui.generate_label->setPixmap(QPixmap(IMAGE_BAD)) ;
ui.genButton->setVisible(false) ;
ui.generate_label->setVisible(false) ;
ui.info_label->setText("Please fill your profile name and password...") ;
ui.info_label->setVisible(true) ;
}
else if(!mEntropyOk)
{
ui.genButton->setToolTip(tr("<p>Node creation is disabled until enough randomness is collected. Please mouve your mouse around until you reach at least 20%.</p>")) ;
ui.genButton->setText(tr("More randomness needed (move your mouse around)"));
ui.genButton->setEnabled(false) ;
ui.generate_label->setPixmap(QPixmap(IMAGE_BAD)) ;
ui.genButton->setVisible(false) ;
ui.generate_label->setVisible(false) ;
ui.info_label->setText("Need more randomness! Please move your mouse around to reach 20%") ;
ui.info_label->setVisible(true) ;
}
else
{
ui.genButton->setEnabled(true) ;
//ui.genButton->setIcon(QIcon(IMAGE_GOOD)) ;
ui.genButton->setToolTip(tr("Click to create your node and/or profile")) ;
ui.genButton->setText(tr("Generate"));
ui.generate_label->setPixmap(QPixmap(IMAGE_GOOD)) ;
ui.genButton->setVisible(true) ;
ui.generate_label->setVisible(false) ;
ui.info_label->setVisible(false) ;
}
}

12
retroshare-gui/src/gui/GenCertDialog.ui
View file

@ -128,7 +128,7 @@
<property name="bottomMargin">
<number>24</number>
</property>
<item row="0" column="0">
<item row="1" column="0">
<layout class="QGridLayout" name="profilGLayout">
<item row="14" column="2">
<widget class="QComboBox" name="keylength_comboBox">
@ -699,6 +699,16 @@
</item>
</layout>
</item>
<item row="0" column="0">
<widget class="QLabel" name="info_label">
<property name="text">
<string>TextLabel</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>