Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hide by default key length combobox, for advanced users get visible via advanced checkbox

Browse Source 
Set stylesheet for a Info Label
Changed Window icon to higher resolution

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8096 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2015-03-29 13:41:29 +00:00
parent 7ef30432f2
commit 6b584e9ae9
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
retroshare-gui/src/gui/GenCertDialog.cpp
View File

@ -119,7 +119,7 @@ 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.hidden_checkbox, SIGNAL(clicked()), this, SLOT(hiddenUiSetup()));
connect(ui.adv_checkbox, SIGNAL(clicked()), this, SLOT(hiddenUiSetup()));
connect(ui.genButton, SIGNAL(clicked()), this, SLOT(genPerson()));
connect(ui.importIdentity_PB, SIGNAL(clicked()), this, SLOT(importIdentity()));
@ -264,8 +264,8 @@ void GenCertDialog::newGPGKeyGenUiSetup() {
ui.genButton->setVisible(true);
ui.genprofileinfo_label->hide();
ui.header_label->show();
ui.keylength_label->show();
ui.keylength_comboBox->show();
//ui.keylength_label->show();
//ui.keylength_comboBox->show();
} else {
genNewGPGKey = false;
ui.name_label->hide();
@ -295,13 +295,15 @@ void GenCertDialog::newGPGKeyGenUiSetup() {
void GenCertDialog::hiddenUiSetup()
{
if (ui.hidden_checkbox->isChecked())
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
{
@ -310,6 +312,8 @@ void GenCertDialog::hiddenUiSetup()
ui.label_hiddenaddr2->hide();
ui.hiddenport_label->hide();
ui.hiddenport_spinBox->hide();
ui.keylength_label->hide();
ui.keylength_comboBox->hide();
}
}
@ -364,7 +368,7 @@ void GenCertDialog::genPerson()
RsPgpId PGPId;
bool isHiddenLoc = false;
if (ui.hidden_checkbox->isChecked())
if (ui.adv_checkbox->isChecked())
{
std::string hl = ui.hiddenaddr_input->text().toStdString();
uint16_t port = ui.hiddenport_spinBox->value();
@ -439,7 +443,7 @@ void GenCertDialog::genPerson()
ui.genButton->hide();
ui.importIdentity_PB->hide();
ui.genprofileinfo_label->hide();
ui.hidden_checkbox->hide();
ui.adv_checkbox->hide();
ui.keylength_label->hide();
ui.keylength_comboBox->hide();

15
retroshare-gui/src/gui/GenCertDialog.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="images.qrc">
<normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
<normaloff>:/images/logo/logo_48.png</normaloff>:/images/logo/logo_48.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<property name="margin">
@ -119,7 +119,7 @@
</widget>
</item>
<item>
<widget class="QCheckBox" name="hidden_checkbox">
<widget class="QCheckBox" name="adv_checkbox">
<property name="maximumSize">
<size>
<width>16777215</width>
@ -130,11 +130,11 @@
<string>Your profile is associated with a PGP key</string>
</property>
<property name="text">
<string>Create a hidden node.</string>
<string>Advanced</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/tor-logo.png</normaloff>:/images/tor-logo.png</iconset>
<normaloff>:/images/kcmsystem24.png</normaloff>:/images/kcmsystem24.png</iconset>
</property>
<property name="iconSize">
<size>
@ -376,6 +376,11 @@ anonymous, you can use a fake email.</string>
</item>
<item row="4" column="0">
<widget class="QLabel" name="entropy_label">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;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.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
@ -482,7 +487,7 @@ anonymous, you can use a fake email.</string>
<tabstop>hiddenport_spinBox</tabstop>
<tabstop>genButton</tabstop>
<tabstop>new_gpg_key_checkbox</tabstop>
<tabstop>hidden_checkbox</tabstop>
<tabstop>adv_checkbox</tabstop>
<tabstop>importIdentity_PB</tabstop>
<tabstop>exportIdentity_PB</tabstop>
</tabstops>

2
retroshare-gui/src/gui/qss/stylesheet/Standard.qss
View File

@ -20,7 +20,7 @@ HeaderFrame > QFrame#frame > QLabel#headerLabel {
/* GenCertDialog */
GenCertDialog QLabel#genprofileinfo_label, QLabel#header_label
GenCertDialog QLabel#genprofileinfo_label, QLabel#header_label, QLabel#entropy_label
{
border: 1px solid #DCDC41;
border-radius: 6px;