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

improved style/layout of gen cert dialog

Browse Source
This commit is contained in:
csoler 2017-02-12 21:45:22 +01:00
parent ccacba797f
commit 5069ba86dd
4 changed files with 397 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,9 @@
#include <math.h> #include <math.h>
#include <iostream> #include <iostream>
#define IMAGE_GOOD ":/images/accepted16.png"
#define IMAGE_BAD ":/images/deletemail24.png"
class EntropyCollectorWidget: public QTextBrowser class EntropyCollectorWidget: public QTextBrowser
{ {
public: public:
@ -110,12 +113,15 @@ void GenCertDialog::grabMouse()
ui.genButton->setEnabled(false) ; ui.genButton->setEnabled(false) ;
//ui.genButton->setIcon(QIcon(":/images/delete.png")) ; //ui.genButton->setIcon(QIcon(":/images/delete.png")) ;
ui.genButton->setToolTip(tr("Currently disabled. Please move your mouse around until you reach at least 20%")) ; ui.genButton->setToolTip(tr("Currently disabled. Please move your mouse around until you reach at least 20%")) ;
ui.randomness_check_LB->setPixmap(QPixmap(IMAGE_BAD)) ;
} }
else else
{ {
ui.genButton->setEnabled(true) ; ui.genButton->setEnabled(true) ;
//ui.genButton->setIcon(QIcon(":/images/resume.png")) ; //ui.genButton->setIcon(QIcon(":/images/resume.png")) ;
ui.genButton->setToolTip(tr("Click to create your node and/or profile")) ; ui.genButton->setToolTip(tr("Click to create your node and/or profile")) ;
ui.randomness_check_LB->setPixmap(QPixmap(IMAGE_GOOD)) ;
} }
RsInit::collectEntropy(E+(F << 16)) ; RsInit::collectEntropy(E+(F << 16)) ;
@ -145,6 +151,11 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent)
connect(ui.importIdentity_PB, SIGNAL(clicked()), this, SLOT(importIdentity())); connect(ui.importIdentity_PB, SIGNAL(clicked()), this, SLOT(importIdentity()));
connect(ui.exportIdentity_PB, SIGNAL(clicked()), this, SLOT(exportIdentity())); connect(ui.exportIdentity_PB, SIGNAL(clicked()), this, SLOT(exportIdentity()));
connect(ui.password_input, 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.node_input, SIGNAL(textChanged(QString)), this, SLOT(updateCheckLabels()));
entropy_timer = new QTimer ; entropy_timer = new QTimer ;
entropy_timer->start(20) ; entropy_timer->start(20) ;
QObject::connect(entropy_timer,SIGNAL(timeout()),this,SLOT(grabMouse())) ; QObject::connect(entropy_timer,SIGNAL(timeout()),this,SLOT(grabMouse())) ;
@ -158,7 +169,7 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent)
#if QT_VERSION >= 0x040700 #if QT_VERSION >= 0x040700
ui.node_input->setPlaceholderText(tr("[Required] Examples: Home, Laptop,...")) ; ui.node_input->setPlaceholderText(tr("[Required] Examples: Home, Laptop,...")) ;
ui.hiddenaddr_input->setPlaceholderText(tr("[Required] Tor/I2P address - Examples: xa76giaf6ifda7ri63i263.onion (obtained by you from Tor)")) ; ui.hiddenaddr_input->setPlaceholderText(tr("[Optional] Tor/I2P address - Examples: xa76giaf6ifda7ri63i263.onion (obtained by you from Tor)")) ;
ui.name_input->setPlaceholderText(tr("[Required] Identifies your Retrohare node(s). Visible to your friends, and friends of friends.")); ui.name_input->setPlaceholderText(tr("[Required] Identifies your Retrohare node(s). Visible to your friends, and friends of friends."));
ui.nickname_input->setPlaceholderText(tr("[Optional] Used when you write in chat lobbies, forums and channel comments. Can be setup later if you need one.")); ui.nickname_input->setPlaceholderText(tr("[Optional] Used when you write in chat lobbies, forums and channel comments. Can be setup later if you need one."));
ui.password_input->setPlaceholderText(tr("[Required] This password protects your data and is required when re-start.")); ui.password_input->setPlaceholderText(tr("[Required] This password protects your data and is required when re-start."));
@ -273,15 +284,15 @@ void GenCertDialog::setupState()
ui.node_label->setVisible(true); ui.node_label->setVisible(true);
ui.node_input->setVisible(true); ui.node_input->setVisible(true);
ui.password_label->setVisible(true);
ui.password_label_2->setVisible(true);
ui.password_input->setVisible(true); ui.password_input->setVisible(true);
ui.password_input_2->setVisible(true); ui.password_label->setVisible(true);
ui.password_input_2->setVisible(generate_new);
ui.password_label_2->setVisible(generate_new);
ui.keylength_label->setVisible(adv_state); ui.keylength_label->setVisible(adv_state);
ui.keylength_comboBox->setVisible(adv_state); ui.keylength_comboBox->setVisible(adv_state);
ui.entropy_label->setVisible(true);
ui.entropy_bar->setVisible(true); ui.entropy_bar->setVisible(true);
ui.genButton->setVisible(true); ui.genButton->setVisible(true);
@ -289,9 +300,10 @@ void GenCertDialog::setupState()
ui.hiddenaddr_input->setVisible(hidden_state); ui.hiddenaddr_input->setVisible(hidden_state);
ui.hiddenaddr_label->setVisible(hidden_state); ui.hiddenaddr_label->setVisible(hidden_state);
ui.label_hiddenaddr->setVisible(hidden_state);
ui.hiddenport_label->setVisible(hidden_state); ui.hiddenport_label->setVisible(hidden_state);
ui.hiddenport_spinBox->setVisible(hidden_state); ui.hiddenport_spinBox->setVisible(hidden_state);
updateCheckLabels();
} }
void GenCertDialog::exportIdentity() void GenCertDialog::exportIdentity()
@ -310,6 +322,17 @@ void GenCertDialog::exportIdentity()
QMessageBox::information(this,tr("Profile not saved"),tr("Your profile was not saved. An error occurred.")) ; QMessageBox::information(this,tr("Profile not saved"),tr("Your profile was not saved. An error occurred.")) ;
} }
void GenCertDialog::updateCheckLabels()
{
QPixmap good( IMAGE_GOOD ) ;
QPixmap bad ( IMAGE_BAD ) ;
ui.node_name_check_LB ->setPixmap( (ui.node_input->text().length() > 3)?good:bad ) ;
ui.profile_name_check_LB->setPixmap( (ui.name_input->text().length() > 3)?good:bad ) ;
ui.password_check_LB ->setPixmap( (ui.password_input->text().length() > 3)?good:bad ) ;
ui.password2_check_LB ->setPixmap( (ui.password_input->text().length() > 3 && ui.password_input->text() == ui.password_input_2->text())?good:bad) ;
}
bool GenCertDialog::importIdentity() bool GenCertDialog::importIdentity()
{ {
QString fname ; QString fname ;
@ -386,7 +409,9 @@ void GenCertDialog::genPerson()
isHiddenLoc = true; isHiddenLoc = true;
} }
if (!genNewGPGKey) {
if (!genNewGPGKey)
{
if (genLoc.length() < 3) { if (genLoc.length() < 3) {
/* Message Dialog */ /* Message Dialog */
QMessageBox::warning(this, QMessageBox::warning(this,
@ -470,11 +495,9 @@ void GenCertDialog::genPerson()
err_string); err_string);
setCursor(Qt::ArrowCursor) ; setCursor(Qt::ArrowCursor) ;
// now cache the PGP password so that it's not asked again for immediately signing the key
rsNotify->cachePgpPassphrase(ui.password_input->text().toUtf8().constData()) ;
} }
// now cache the PGP password so that it's not asked again for immediately signing the key
rsNotify->cachePgpPassphrase(ui.password_input->text().toUtf8().constData()) ;
//generate a random ssl password //generate a random ssl password
std::string sslPasswd = RSRandom::random_alphaNumericString(RsInit::getSslPwdLen()) ; std::string sslPasswd = RSRandom::random_alphaNumericString(RsInit::getSslPwdLen()) ;

1
retroshare-gui/src/gui/GenCertDialog.h
View File

@ -44,6 +44,7 @@ private slots:
void setupState(); void setupState();
void switchReuseExistingNode(); void switchReuseExistingNode();
void grabMouse(); void grabMouse();
void updateCheckLabels();
private: private:
void initKeyList(); void initKeyList();

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

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1745</width> <width>1278</width>
<height>1296</height> <height>1296</height>
</rect> </rect>
</property> </property>
@ -35,6 +35,12 @@
</property> </property>
<item> <item>
<widget class="QFrame" name="frame"> <widget class="QFrame" name="frame">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
@ -42,6 +48,19 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="images.qrc">:/images/logo/logo_splash.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item> <item>
<layout class="QHBoxLayout" name="toolBarHLayout"> <layout class="QHBoxLayout" name="toolBarHLayout">
<item> <item>
@ -88,19 +107,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="images.qrc">:/images/logo/logo_splash.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item> <item>
<widget class="StyledLabel" name="header_label"> <widget class="StyledLabel" name="header_label">
<property name="palette"> <property name="palette">
@ -284,75 +290,10 @@ Alternatively you can use an existing profile. Just uncheck &quot;Create a new p
</item> </item>
<item> <item>
<layout class="QGridLayout" name="profilGLayout"> <layout class="QGridLayout" name="profilGLayout">
<item row="0" column="0"> <item row="10" column="0">
<widget class="QLabel" name="label_nodeType"> <widget class="QLabel" name="hiddenaddr_label">
<property name="text"> <property name="text">
<string>Node type</string> <string>hidden address</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="password_label_2">
<property name="toolTip">
<string>This password is for PGP</string>
</property>
<property name="text">
<string>Password (check)</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="8" column="2">
<widget class="QLineEdit" name="password_input_2">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Put a strong password here. This password protects your private PGP key.</string>
</property>
<property name="inputMask">
<string/>
</property>
<property name="maxLength">
<number>1024</number>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="name_label">
<property name="text">
<string>Profile name</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QLineEdit" name="nickname_input">
<property name="toolTip">
<string>You can have one or more identities. They are used when you write in chat lobbies, forums and channel comments. They act as the destination for distant chat and the Retroshare distant mail system.</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="nickname_label">
<property name="toolTip">
<string/>
</property>
<property name="text">
<string>Chat identity</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -372,101 +313,93 @@ Alternatively you can use an existing profile. Just uncheck &quot;Create a new p
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="2"> <item row="13" column="2">
<widget class="QComboBox" name="keylength_comboBox"/> <widget class="QComboBox" name="keylength_comboBox">
</item> <property name="sizePolicy">
<item row="7" column="2"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<widget class="QLineEdit" name="password_input"> <horstretch>0</horstretch>
<property name="toolTip"> <verstretch>0</verstretch>
<string>Put a strong password here. This password protects your private PGP key.</string> </sizepolicy>
</property>
<property name="inputMask">
<string/>
</property>
<property name="maxLength">
<number>1024</number>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="0"> <item row="8" column="0">
<widget class="QLabel" name="hiddenaddr_label"> <widget class="QLabel" name="password_label_2">
<property name="toolTip">
<string>This password is for PGP</string>
</property>
<property name="text"> <property name="text">
<string>hidden address</string> <string>Password (check)</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="2"> <item row="7" column="3">
<layout class="QHBoxLayout" name="hiddenInfoHLayout"> <widget class="QLabel" name="password_check_LB">
<property name="spacing"> <property name="text">
<number>6</number> <string/>
</property> </property>
<item> </widget>
<widget class="QLineEdit" name="hiddenaddr_input">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>32</height>
</size>
</property>
<property name="maxLength">
<number>64</number>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="hiddenport_label">
<property name="text">
<string>Port</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="hiddenport_spinBox">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>65535</number>
</property>
<property name="value">
<number>7812</number>
</property>
</widget>
</item>
</layout>
</item> </item>
<item row="11" column="2"> <item row="6" column="2">
<widget class="QLabel" name="label_hiddenaddr"> <widget class="QLineEdit" name="nickname_input">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This can be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. If you do not yet have one, you can still go on, and make it right later in RetroShare's Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>You can have one or more identities. They are used when you write in chat lobbies, forums and channel comments. They act as the destination for distant chat and the Retroshare distant mail system.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="0"> <item row="14" column="2">
<widget class="QProgressBar" name="entropy_bar">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="value">
<number>24</number>
</property>
</widget>
</item>
<item row="14" column="3">
<widget class="QLabel" name="randomness_check_LB">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="5" column="3">
<widget class="QLabel" name="node_name_check_LB">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="nickname_label">
<property name="toolTip">
<string/>
</property>
<property name="text">
<string>Chat identity</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="13" column="0">
<widget class="QLabel" name="keylength_label"> <widget class="QLabel" name="keylength_label">
<property name="text"> <property name="text">
<string>PGP key length</string> <string>PGP key length</string>
@ -478,6 +411,12 @@ Alternatively you can use an existing profile. Just uncheck &quot;Create a new p
</item> </item>
<item row="5" column="2"> <item row="5" column="2">
<widget class="QLineEdit" name="node_input"> <widget class="QLineEdit" name="node_input">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
@ -489,20 +428,6 @@ Alternatively you can use an existing profile. Just uncheck &quot;Create a new p
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2">
<widget class="QComboBox" name="nodeType_CB">
<item>
<property name="text">
<string>Standard node</string>
</property>
</item>
<item>
<property name="text">
<string>TOR/I2P Hidden node</string>
</property>
</item>
</widget>
</item>
<item row="5" column="0"> <item row="5" column="0">
<widget class="QLabel" name="node_label"> <widget class="QLabel" name="node_label">
<property name="text"> <property name="text">
@ -513,12 +438,39 @@ Alternatively you can use an existing profile. Just uncheck &quot;Create a new p
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="3">
<widget class="QLabel" name="profile_name_check_LB">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QComboBox" name="nodeType_CB">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Standard node</string>
</property>
</item>
<item>
<property name="text">
<string>TOR/I2P Hidden node</string>
</property>
</item>
</widget>
</item>
<item row="4" column="2"> <item row="4" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QLineEdit" name="name_input"> <widget class="QLineEdit" name="name_input">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -548,6 +500,12 @@ Alternatively you can use an existing profile. Just uncheck &quot;Create a new p
</item> </item>
<item> <item>
<widget class="QComboBox" name="genPGPuser"> <widget class="QComboBox" name="genPGPuser">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</string> <string>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</string>
</property> </property>
@ -556,7 +514,7 @@ Alternatively you can use an existing profile. Just uncheck &quot;Create a new p
<item> <item>
<widget class="QPushButton" name="exportIdentity_PB"> <widget class="QPushButton" name="exportIdentity_PB">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -569,7 +527,7 @@ Alternatively you can use an existing profile. Just uncheck &quot;Create a new p
<item> <item>
<widget class="QPushButton" name="importIdentity_PB"> <widget class="QPushButton" name="importIdentity_PB">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -581,6 +539,12 @@ Alternatively you can use an existing profile. Just uncheck &quot;Create a new p
</item> </item>
<item> <item>
<widget class="QCheckBox" name="reuse_existing_node_CB"> <widget class="QCheckBox" name="reuse_existing_node_CB">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Re-use an existing profile</string> <string>Re-use an existing profile</string>
</property> </property>
@ -588,6 +552,157 @@ Alternatively you can use an existing profile. Just uncheck &quot;Create a new p
</item> </item>
</layout> </layout>
</item> </item>
<item row="10" column="2">
<layout class="QHBoxLayout" name="hiddenInfoHLayout">
<property name="spacing">
<number>6</number>
</property>
<item>
<widget class="QLineEdit" name="hiddenaddr_input">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>32</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="maxLength">
<number>64</number>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="hiddenport_label">
<property name="text">
<string>Port</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="hiddenport_spinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>65535</number>
</property>
<property name="value">
<number>7812</number>
</property>
</widget>
</item>
</layout>
</item>
<item row="8" column="2">
<widget class="QLineEdit" name="password_input_2">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Put a strong password here. This password protects your private PGP key.</string>
</property>
<property name="inputMask">
<string/>
</property>
<property name="maxLength">
<number>1024</number>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item row="8" column="3">
<widget class="QLabel" name="password2_check_LB">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="7" column="2">
<widget class="QLineEdit" name="password_input">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Put a strong password here. This password protects your private PGP key.</string>
</property>
<property name="inputMask">
<string/>
</property>
<property name="maxLength">
<number>1024</number>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="name_label">
<property name="text">
<string>Profile name</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_nodeType">
<property name="text">
<string>Node type</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="14" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Randomness</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>
@ -604,101 +719,70 @@ Alternatively you can use an existing profile. Just uncheck &quot;Create a new p
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="StyledLabel" name="entropy_label"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="palette"> <item>
<palette> <spacer name="horizontalSpacer_2">
<active> <property name="orientation">
<colorrole role="Base"> <enum>Qt::Horizontal</enum>
<brush brushstyle="SolidPattern"> </property>
<color alpha="255"> <property name="sizeHint" stdset="0">
<red>255</red> <size>
<green>255</green> <width>40</width>
<blue>255</blue> <height>20</height>
</color> </size>
</brush> </property>
</colorrole> </spacer>
<colorrole role="Window"> </item>
<brush brushstyle="SolidPattern"> <item>
<color alpha="255"> <widget class="QPushButton" name="genButton">
<red>255</red> <property name="sizePolicy">
<green>255</green> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<blue>178</blue> <horstretch>0</horstretch>
</color> <verstretch>0</verstretch>
</brush> </sizepolicy>
</colorrole> </property>
</active> <property name="styleSheet">
<inactive> <string notr="true"/>
<colorrole role="Base"> </property>
<brush brushstyle="SolidPattern"> <property name="text">
<color alpha="255"> <string>Go!</string>
<red>255</red> </property>
<green>255</green> </widget>
<blue>255</blue> </item>
</color> <item>
</brush> <widget class="QLabel" name="go_check_LB">
</colorrole> <property name="text">
<colorrole role="Window"> <string/>
<brush brushstyle="SolidPattern"> </property>
<color alpha="255"> </widget>
<red>255</red> </item>
<green>255</green> <item>
<blue>178</blue> <spacer name="horizontalSpacer">
</color> <property name="orientation">
</brush> <enum>Qt::Horizontal</enum>
</colorrole> </property>
</inactive> <property name="sizeHint" stdset="0">
<disabled> <size>
<colorrole role="Base"> <width>40</width>
<brush brushstyle="SolidPattern"> <height>20</height>
<color alpha="255"> </size>
<red>255</red> </property>
<green>255</green> </spacer>
<blue>178</blue> </item>
</color> </layout>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>178</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
</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 required, 100% is advised.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item> </item>
<item> <item>
<widget class="QProgressBar" name="entropy_bar"> <spacer name="verticalSpacer_2">
<property name="value"> <property name="orientation">
<number>24</number> <enum>Qt::Vertical</enum>
</property> </property>
</widget> <property name="sizeHint" stdset="0">
</item> <size>
<item> <width>20</width>
<widget class="QPushButton" name="genButton"> <height>40</height>
<property name="styleSheet"> </size>
<string notr="true"/>
</property> </property>
<property name="text"> </spacer>
<string>Go!</string>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -713,15 +797,25 @@ Alternatively you can use an existing profile. Just uncheck &quot;Create a new p
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>nickname_input</tabstop> <tabstop>name_input</tabstop>
<tabstop>node_input</tabstop>
<tabstop>password_input</tabstop> <tabstop>password_input</tabstop>
<tabstop>password_input_2</tabstop> <tabstop>password_input_2</tabstop>
<tabstop>adv_checkbox</tabstop>
<tabstop>keylength_comboBox</tabstop>
<tabstop>nodeType_CB</tabstop>
<tabstop>exportIdentity_PB</tabstop>
<tabstop>reuse_existing_node_CB</tabstop>
<tabstop>nickname_input</tabstop>
<tabstop>genPGPuser</tabstop>
<tabstop>hiddenaddr_input</tabstop> <tabstop>hiddenaddr_input</tabstop>
<tabstop>hiddenport_spinBox</tabstop> <tabstop>hiddenport_spinBox</tabstop>
<tabstop>genButton</tabstop>
<tabstop>importIdentity_PB</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="images.qrc"/>
<include location="icons.qrc"/> <include location="icons.qrc"/>
<include location="images.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

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

@ -715,8 +715,6 @@ GenCertDialog QLineEdit#name_input {
GenCertDialog QPushButton#genButton { GenCertDialog QPushButton#genButton {
border-image: url(:/images/btn_blue.png) 4; border-image: url(:/images/btn_blue.png) 4;
border-width: 4; border-width: 4;
/* padding: 0px 6px;*/
/* font-size: 16px; */
font: bold; font: bold;
color: white; color: white;
} }
@ -727,7 +725,7 @@ GenCertDialog QPushButton#genButton:hover {
GenCertDialog QPushButton#genButton:disabled { GenCertDialog QPushButton#genButton:disabled {
border-image: url(:/images/btn_27.png) 4; border-image: url(:/images/btn_27.png) 4;
font-size: 16px; /* font-size: 16px; */
font: bold; font: bold;
color: black; color: black;
} }