diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp index 11bd8f7dd..1887ca304 100644 --- a/retroshare-gui/src/gui/GenCertDialog.cpp +++ b/retroshare-gui/src/gui/GenCertDialog.cpp @@ -161,12 +161,12 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent) ui.keylength_comboBox->addItem("Very high (4096 bits)", QVariant(4096)); #if QT_VERSION >= 0x040700 - ui.node_input->setPlaceholderText(tr("[Required] Examples: Home, Laptop,...(Visible to friends).")) ; - ui.hiddenaddr_input->setPlaceholderText(tr("[Optional] Tor/I2P address (Example: xa76giaf6ifda7ri63i263.onion)")) ; - ui.name_input->setPlaceholderText(tr("[Required] Visible to friends, and friends of friends.")); - ui.nickname_input->setPlaceholderText(tr("[Optional] Used to write in chat rooms and forums. Can be set later.")); - ui.password_input->setPlaceholderText(tr("[Required] This password protects your data. Dont forget it!")); - ui.password_input_2->setPlaceholderText(tr("[Required] Type the same password again here.")); + ui.node_input->setPlaceholderText(tr("Node name")) ; + ui.hiddenaddr_input->setPlaceholderText(tr("Tor/I2P address")) ; + ui.name_input->setPlaceholderText(tr("Username")); + ui.nickname_input->setPlaceholderText(tr("Identity name")); + ui.password_input->setPlaceholderText(tr("Password")); + ui.password_input_2->setPlaceholderText(tr("Password again")); #endif ui.nickname_input->setMaxLength(RSID_MAXIMUM_NICKNAME_SIZE); @@ -294,7 +294,7 @@ void GenCertDialog::setupState() ui.entropy_bar->setVisible(true); ui.genButton->setVisible(true); - ui.genButton->setText(generate_new?tr("Generate new profile and node"):tr("Generate new node")); + ui.genButton->setText(generate_new?tr("Generate"):tr("Generate")); ui.hiddenaddr_input->setVisible(hidden_state); ui.hiddenaddr_label->setVisible(hidden_state); diff --git a/retroshare-gui/src/gui/GenCertDialog.ui b/retroshare-gui/src/gui/GenCertDialog.ui index 468c17693..9eb77800e 100644 --- a/retroshare-gui/src/gui/GenCertDialog.ui +++ b/retroshare-gui/src/gui/GenCertDialog.ui @@ -6,8 +6,8 @@ 0 0 - 533 - 544 + 520 + 611 @@ -34,13 +34,16 @@ 0 - + 0 0 + + + QFrame::StyledPanel @@ -48,6 +51,9 @@ QFrame::Raised + + 9 + @@ -105,19 +111,63 @@ - + - - QFrame::StyledPanel - - - QFrame::Raised - + + 24 + + + 24 + + + 24 + + + 24 + + + + + + 0 + 0 + + + + PGP Key Length + + + + + + + + + + + 24 + 24 + + + + + + + :/icons/svg/randomness.svg + + + true + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -125,17 +175,7 @@ - - - - PGP key length - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - + @@ -163,42 +203,6 @@ - - - - This password is for PGP - - - Password - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - - - - This password is for PGP - - - Password (check) - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - @@ -229,7 +233,7 @@ - + @@ -271,16 +275,6 @@ - - - - Node name - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - @@ -365,7 +359,7 @@ - + @@ -394,46 +388,6 @@ - - - - Profile name - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Randomness - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Node type - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - hidden address - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - @@ -498,20 +452,7 @@ - - - - - - - Chat identity - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - + @@ -564,6 +505,191 @@ + + + + + 24 + 24 + + + + + + + :/icons/svg/person.svg + + + true + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 24 + 24 + + + + + + + + + + :/icons/svg/chat-lobbies.svg + + + true + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 24 + 24 + + + + + + + :/icons/svg/network.svg + + + true + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 24 + 24 + + + + + + + :/icons/svg/keyring.svg + + + true + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 24 + 24 + + + + This password is for PGP + + + + + + :/icons/svg/password.svg + + + true + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 24 + 24 + + + + This password is for PGP + + + + + + :/icons/svg/password.svg + + + true + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 24 + 24 + + + + + + + :/icons/svg/hidden.svg + + + true + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 24 + 24 + + + + + + + :/icons/svg/netgraph.svg + + + true + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + diff --git a/retroshare-gui/src/gui/StartDialog.ui b/retroshare-gui/src/gui/StartDialog.ui index 4665dfdc0..3d2a4dc44 100644 --- a/retroshare-gui/src/gui/StartDialog.ui +++ b/retroshare-gui/src/gui/StartDialog.ui @@ -17,6 +17,9 @@ :/images/logo/logo_32.png:/images/logo/logo_32.png + + false + 0 @@ -31,296 +34,313 @@ 0 - - - 0 + + + false - - 0 + + QFrame#loginframe{ +background-image: url(:/images/logo/background.png); +background-repeat: repeat; +} - - 0 + + QFrame::StyledPanel - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - - - - - 85 - 170 - 255 - - - - - - - - - 85 - 170 - 255 - - - - - - - - - 118 - 116 - 108 - - - - - - - - - 18 - - - - - - - :/images/logo/logo_spash2.png - - - - - - - Qt::Horizontal - - - - 48 - 20 - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 60 - 20 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 60 - 20 - - - - - - - - true - - - - 0 - 0 - - - - - - - - - - - 9 - + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + - - - Profile - Location: - - - - - - + + - 22 - 22 + 0 + 0 - - + + + + + + + 85 + 170 + 255 + + + + + + + + + 85 + 170 + 255 + + + + + + + + + 118 + 116 + 108 + + + + + - - :/icons/svg/person.svg - - - true - - - - - - - - - - - 22 - 22 - - - - - - - :/icons/svg/password.svg - - - true - - - - - - - QLineEdit::Password - - - Password - - - - - - - Remember Password - - - false - - - - - - 12 + 18 - Log In + - - true - - - false + + :/images/logo/logo_spash2.png + + + + Qt::Horizontal + + + + 48 + 20 + + + + - - - - - - - - Qt::Horizontal + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 60 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 60 + 20 + + + + + + + + true + + + + 0 + 0 + + + + + + + + + + + 9 - - - 40 - 20 - - - - - - - - Opens a dialog for creating a new profile or + + + + Profile - Location: + + + + + + + + 22 + 22 + + + + + + + :/icons/svg/person.svg + + + true + + + + + + + + + + + 22 + 22 + + + + + + + :/icons/svg/password.svg + + + true + + + + + + + QLineEdit::Password + + + Password + + + + + + + Remember Password + + + false + + + + + + + + 12 + + + + Log In + + + true + + + false + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Opens a dialog for creating a new profile or adding locations to an existing profile. The current identities/locations will not be affected. - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="Create new Profile..."><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;">Manage profiles and nodes...</span></a></p></body></html> - - - - - - + + + + + + + diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index e9b7d32bd..737b12ae3 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -1,5 +1,7 @@ + icons/svg/hidden.svg + icons/svg/randomness.svg icons/svg/password.svg icons/stars/star0.png icons/stars/star1.png diff --git a/retroshare-gui/src/gui/icons/svg/randomness.svg b/retroshare-gui/src/gui/icons/svg/randomness.svg new file mode 100644 index 000000000..b0b8e0b9f --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/randomness.svg @@ -0,0 +1,197 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index fbdb66d3d..887cb6620 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -1,5 +1,6 @@ + images/logo/background.png images/logo/logo_spash2.png images/network_map.png images/global_switch_on.png diff --git a/retroshare-gui/src/gui/images/logo/background.png b/retroshare-gui/src/gui/images/logo/background.png new file mode 100644 index 000000000..b3d347d7e Binary files /dev/null and b/retroshare-gui/src/gui/images/logo/background.png differ diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index c3f0c1012..8b746991b 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -665,49 +665,49 @@ IdEditDialog QLabel#info_label background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2); } GenCertDialog QComboBox#genPGPuser { - border: 4px solid #0099cc; + border: 2px solid #0099cc; border-radius: 6px; background: white; font: bold; } GenCertDialog QSpinBox#hiddenport_spinBox { - border: 4px solid #0099cc; + border: 2px solid #0099cc; border-radius: 6px; background: white; font: bold; } GenCertDialog QLineEdit#hiddenaddr_input { - border: 4px solid #0099cc; + border: 2px solid #0099cc; border-radius: 6px; background: white; font: bold; } GenCertDialog QLineEdit#password_input_2 { - border: 4px solid #0099cc; + border: 2px solid #0099cc; border-radius: 6px; background: white; font: bold; } GenCertDialog QLineEdit#password_input { - border: 4px solid #0099cc; + border: 2px solid #0099cc; border-radius: 6px; background: white; font: bold; } GenCertDialog QLineEdit#nickname_input { - border: 4px solid #0099cc; + border: 2px solid #0099cc; border-radius: 6px; background: white; font: bold; } GenCertDialog QLineEdit#node_input { - border: 4px solid #0099cc; + border: 2px solid #0099cc; border-radius: 6px; background: white; font: bold; } GenCertDialog QLineEdit#name_input { - border: 4px solid #0099cc; + border: 2px solid #0099cc; border-radius: 6px; background: white; font: bold; @@ -772,4 +772,14 @@ StartDialog QPushButton#loadButton { StartDialog QPushButton#loadButton:hover { border-image: url(:/images/btn_blue_hover.png) 4; -} \ No newline at end of file +} + +StartDialog QFrame#loginframe{ + background-image: url(:/images/logo/background.png); + background-repeat: repeat; +} + +GenCertDialog QFrame#profileframe{ + background-image: url(:/images/logo/background.png); + background-repeat: repeat; +}