From 63b98f3ccc315c98e42dcd08f96e62d154066c74 Mon Sep 17 00:00:00 2001 From: defnax Date: Fri, 12 Feb 2010 01:02:18 +0000 Subject: [PATCH] improved design of profile generation git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2288 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/GenCertDialog.cpp | 2 +- retroshare-gui/src/gui/GenCertDialog.ui | 945 +++++++---------------- retroshare-gui/src/gui/images.qrc | 2 + 3 files changed, 286 insertions(+), 663 deletions(-) diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp index 8c4323998..2ca31ea08 100644 --- a/retroshare-gui/src/gui/GenCertDialog.cpp +++ b/retroshare-gui/src/gui/GenCertDialog.cpp @@ -45,7 +45,7 @@ GenCertDialog::GenCertDialog(QWidget *parent, Qt::WFlags flags) connect(ui.new_gpg_key_checkbox, SIGNAL(clicked()), this, SLOT(newGPGKeyGenUiSetup())); - WidgetBackgroundImage::setBackgroundImage(ui.loginLabel, ":images/new-account.png", WidgetBackgroundImage::AdjustSize); + //WidgetBackgroundImage::setBackgroundImage(ui.loginLabel, ":images/new-account.png", WidgetBackgroundImage::AdjustSize); connect(ui.genButton, SIGNAL(clicked()), this, SLOT(genPerson())); diff --git a/retroshare-gui/src/gui/GenCertDialog.ui b/retroshare-gui/src/gui/GenCertDialog.ui index 14f3bec8a..65c7ebffb 100644 --- a/retroshare-gui/src/gui/GenCertDialog.ui +++ b/retroshare-gui/src/gui/GenCertDialog.ui @@ -6,8 +6,8 @@ 0 0 - 462 - 454 + 569 + 444 @@ -28,9 +28,9 @@ - 16 - 16 - 16 + 0 + 0 + 0 @@ -183,9 +183,9 @@ - 16 - 16 - 16 + 0 + 0 + 0 @@ -338,9 +338,9 @@ - 104 - 104 - 104 + 0 + 0 + 0 @@ -392,9 +392,9 @@ - 104 - 104 - 104 + 0 + 0 + 0 @@ -410,9 +410,9 @@ - 104 - 104 - 104 + 0 + 0 + 0 @@ -512,675 +512,296 @@ :/images/rstray3.png:/images/rstray3.png - - - 6 + + QToolButton, QPushButton, QComboBox { +border-image: url(:/images/btn_26.png) 4; +border-width: 4; +padding: 0px 6px; +font-size: 12px; +} + +*{ +color: black; +} + +QComboBox QAbstractItemView { +background-color:white; +} + +QComboBox::down-arrow { +image: url(:/images/combobox_arrow.png); +} + +QComboBox:drop-down +{ +subcontrol-origin: padding; +subcontrol-position: top right; +border-left-style: none; +border-top-right-radius: 1px; +border-bottom-right-radius: 1px; +} + +QToolButton:hover, QPushButton:hover, QComboBox:hover { +border-image: url(:/images/btn_26_hover.png) 4; +} + +QToolButton:disabled, QPushButton:disabled, QComboBox::disabled { +color:gray; +} + +QToolButton:pressed, QPushButton:pressed{ +border-image: url(:/images/btn_26_pressed.png) 4; +} + + + + 0 - - - - true - - - - 0 - 0 - - - - - 0 - 140 - - + + 0 + + + 16777215 140 - - - - - - - 0 - 0 - 0 - - - - - - - 212 - 208 - 200 - - - - - - - 255 - 255 - 255 - - - - - - - 234 - 229 - 220 - - - - - - - 128 - 128 - 128 - - - - - - - 141 - 139 - 133 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 212 - 208 - 200 - - - - - - - 64 - 64 - 64 - - - - - - - 10 - 36 - 106 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 232 - 232 - 232 - - - - - - - - - 0 - 0 - 0 - - - - - - - 212 - 208 - 200 - - - - - - - 255 - 255 - 255 - - - - - - - 234 - 229 - 220 - - - - - - - 128 - 128 - 128 - - - - - - - 141 - 139 - 133 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 212 - 208 - 200 - - - - - - - 64 - 64 - 64 - - - - - - - 212 - 208 - 200 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 232 - 232 - 232 - - - - - - - - - 106 - 104 - 100 - - - - - - - 212 - 208 - 200 - - - - - - - 255 - 255 - 255 - - - - - - - 233 - 231 - 227 - - - - - - - 128 - 128 - 128 - - - - - - - 141 - 139 - 133 - - - - - - - 106 - 104 - 100 - - - - - - - 255 - 255 - 255 - - - - - - - 106 - 104 - 100 - - - - - - - 212 - 208 - 200 - - - - - - - 212 - 208 - 200 - - - - - - - 0 - 0 - 0 - - - - - - - 10 - 36 - 106 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 232 - 232 - 232 - - - - - + + QFrame#frame_2{background-image: url(:/images/genbackground.png);} + - - <!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:'Arial'; font-size:8pt; 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;"><span style=" font-size:16pt; color:#000000;">Create a new RetroShare profile</span><br /><br /><span style=" font-weight:600;">Retroshare uses gpg keys for identity management. You can use an existing gpg key, or create a new one with this form.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Please fill in the location field (example : "home", "laptop", etc). It will be permanently attached to this retroshare installation, and visible to your peers.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">You can install retroshare on different locations using the same gpg key.</span></p></body></html> + + QFrame::NoFrame - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + QFrame::Plain - - true - - - 105 - - - - - - - Qt::Vertical - - - - 20 - 20 - - - - - - - - - - - - - - It looks like you don't own any GPG keys. Please fill in the form below to generate one, or use your favorite gnupg key manager. + + + 6 + + + 6 + + + + + + 128 + 128 + - + + + + + :/images/contact_new128.png + + true - - - - QFormLayout::AllNonFixedFieldsGrow - - - - - Use GPG key - - - - - - - - - - Name - - - - - - - - - - Location: - - - - - - - - - - Email - - - - - - - - - - GPG Password - - - - - - - - - - QLineEdit::Password - - - - - - - + + - - - - - - - - Generate a new a new gpg key + <!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:'MS Shell Dlg 2'; font-size:8.25pt; 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;"><span style=" font-family:'Arial'; font-size:16pt; color:#ffffff;">Create a new RetroShare profile</span><span style=" font-family:'Arial'; font-size:8pt;"><br /><br /></span><span style=" font-family:'Arial'; font-size:8pt; font-weight:600;">Retroshare uses gpg keys for identity management. </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:8pt; font-weight:600;">You can use an existing gpg key, or create a new one with this form.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:8pt; font-weight:600;">Please fill in the location field (example : "home", "laptop", etc). </span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:8pt; font-weight:600;">It will be permanently attached to this retroshare installation, and visible to</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:8pt; font-weight:600;">your peers.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:8pt; font-weight:600;">You can install retroshare on different locations using the same gpg key.</span></p></body></html> - - - - Qt::Vertical + + + + QFrame#frame{ +background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, +stop:0 #FEFEFE, stop:1 #E8E8E8); + +border: 1px solid #CCCCCC;} - - - 20 - 20 - + + QFrame::StyledPanel - - - - - - - - Generate New Profile - - - - - - - Qt::Horizontal - - - - 210 - 22 - - - - - - - - Info - - - - + + QFrame::Raised + + + + + + + + + + + + It looks like you don't own any GPG keys. Please fill in the form below to generate one, or use your favorite gnupg key manager. + + + true + + + + + + + QFormLayout::AllNonFixedFieldsGrow + + + + + Use GPG key + + + + + + + + + + Name + + + + + + + + + + Email + + + + + + + + + + GPG Password + + + + + + + + + + QLineEdit::Password + + + + + + + Location: + + + + + + + + + + + + + + + + + + + Generate a new a new gpg key + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + 16777215 + 26 + + + + Generate New Profile + + + + :/images/contact_new.png:/images/contact_new.png + + + + + + + Qt::Horizontal + + + + 210 + 22 + + + + + + + + + 16777215 + 26 + + + + Info + + + + :/images/info16.png:/images/info16.png + + + + + + + diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 1fdd6b9e1..f2b3f254b 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -109,6 +109,7 @@ images/console-small-hover.png images/console-small-up.png images/contract_hover.png + images/contact_new128.png images/dadd.png images/dauthed.png images/daway.png @@ -208,6 +209,7 @@ images/graph-area.png images/graph-line.png images/groupchat.png + images/genbackground.png images/gohome.png images/help.png images/help24.png