diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp
index f4e71554f..ed4d8ab07 100644
--- a/retroshare-gui/src/gui/GenCertDialog.cpp
+++ b/retroshare-gui/src/gui/GenCertDialog.cpp
@@ -71,8 +71,6 @@ void GenCertDialog::init()
ui.genPGPuser->clear() ;
- QString titleString("%1");
-
std::list pgpIds;
std::list::iterator it;
bool foundGPGKeys = false;
@@ -91,20 +89,18 @@ void GenCertDialog::init()
if (foundGPGKeys) {
ui.no_gpg_key_label->hide();
- ui.progressBar->hide();
ui.new_gpg_key_checkbox->setChecked(false);
setWindowTitle(tr("Create new Location"));
ui.genButton->setText(tr("Generate new Location"));
- ui.label_3->setText( titleString.arg( tr("Create a new Location") ) ) ;
+ ui.headerLabel->setText(tr("Create a new Location"));
genNewGPGKey = false;
} else {
ui.no_gpg_key_label->show();
ui.new_gpg_key_checkbox->setChecked(true);
ui.new_gpg_key_checkbox->setEnabled(false);
- ui.progressBar->hide();
setWindowTitle(tr("Create new Identity"));
ui.genButton->setText(tr("Generate new Identity"));
- ui.label_3->setText( titleString.arg( tr("Create a new Identity") ) ) ;
+ ui.headerLabel->setText(tr("Create a new Identity"));
genNewGPGKey = true;
}
newGPGKeyGenUiSetup();
@@ -112,9 +108,6 @@ void GenCertDialog::init()
void GenCertDialog::newGPGKeyGenUiSetup() {
- QString titleStr("%1");
-
if (ui.new_gpg_key_checkbox->isChecked()) {
genNewGPGKey = true;
ui.name_label->show();
@@ -132,7 +125,7 @@ void GenCertDialog::newGPGKeyGenUiSetup() {
// ui.importIdentity_PB->hide() ;
setWindowTitle(tr("Create new Identity"));
ui.genButton->setText(tr("Generate new Identity"));
- ui.label_3->setText( titleStr.arg( tr("Create a new Identity") ) ) ;
+ ui.headerLabel->setText(tr("Create a new Identity"));
} else {
genNewGPGKey = false;
ui.name_label->hide();
@@ -147,7 +140,7 @@ void GenCertDialog::newGPGKeyGenUiSetup() {
ui.importIdentity_PB->show() ;
setWindowTitle(tr("Create new Location"));
ui.genButton->setText(tr("Generate new Location"));
- ui.label_3->setText( titleStr.arg( tr("Create a new Location") ) ) ;
+ ui.headerLabel->setText(tr("Create a new Location"));
}
}
@@ -240,7 +233,6 @@ void GenCertDialog::genPerson()
std::string err_string;
ui.no_gpg_key_label->setText(tr("Generating new GPG key, please be patient: this process needs generating large prime numbers, and can take some minutes on slow computers. \n\nFill in your GPG password when asked, to sign your new key."));
ui.no_gpg_key_label->show();
- ui.progressBar->show();
ui.new_gpg_key_checkbox->hide();
ui.name_label->hide();
ui.name_input->hide();
diff --git a/retroshare-gui/src/gui/GenCertDialog.ui b/retroshare-gui/src/gui/GenCertDialog.ui
index ad3cbbee0..17923e14c 100644
--- a/retroshare-gui/src/gui/GenCertDialog.ui
+++ b/retroshare-gui/src/gui/GenCertDialog.ui
@@ -17,47 +17,6 @@
:/images/rstray3.png:/images/rstray3.png
-
- 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
@@ -73,19 +32,6 @@ border-image: url(:/images/btn_26_pressed.png) 4;
30
-
- QFrame#frame{
-background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-stop:0 #FEFEFE, stop:1 #E8E8E8);
-
-border: 1px solid #CCCCCC;}
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
@@ -116,19 +62,6 @@ border: 1px solid #CCCCCC;}
-
-
-
- 0
-
-
- -1
-
-
- false
-
-
-
- -
6
@@ -197,7 +130,7 @@ border: 1px solid #CCCCCC;}
- -
+
-
@@ -210,42 +143,42 @@ border: 1px solid #CCCCCC;}
- -
+
-
Use identity
- -
+
-
Your profile is associated to a GPG key. RetroShare currently ignores DSA keys.
- -
+
-
Name
- -
+
-
Enter here your nickname
- -
+
-
Email
- -
+
-
Be careful: this email will be visible to your friends and friends
@@ -254,7 +187,7 @@ anonymous, you can use a fake email.
- -
+
-
This Password is for GPG
@@ -264,7 +197,7 @@ anonymous, you can use a fake email.
- -
+
-
Put a strong password here. This password protects your GPG key.
@@ -277,17 +210,17 @@ anonymous, you can use a fake email.
- -
+
-
Location
- -
+
-
- -
+
-
@@ -309,7 +242,7 @@ anonymous, you can use a fake email.
- -
+
-
@@ -317,9 +250,6 @@ anonymous, you can use a fake email.
26
-
-
-
Generate New Identity
@@ -329,7 +259,7 @@ anonymous, you can use a fake email.
- -
+
-
Qt::Vertical
@@ -349,17 +279,13 @@ anonymous, you can use a fake email.
-
-
+
16777215
140
-
- QFrame#frame_2{background-image: url(:/images/genbackground.png);}
-
-
QFrame::NoFrame
@@ -374,7 +300,7 @@ anonymous, you can use a fake email.
3
-
-
+
128
@@ -393,20 +319,21 @@ anonymous, you can use a fake email.
-
-
+
-
-
+
+
+
+ 16
+
+
- <!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:'Ubuntu'; font-size:11pt; 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 Identity</span></p></body></html>
+ Create a new Identity
-
-
+
<!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">
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 0b4d31733..441916f1e 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -231,9 +231,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
config file RetroShare.conf */
connect(ui.actionQuit, SIGNAL(triggered()), this, SLOT(doQuit()));
- /* load the StyleSheet*/
- Rshare::loadStyleSheet(Rshare::stylesheet());
-
QList > notify;
/* Create the Main pages and actions */
diff --git a/retroshare-gui/src/gui/profile/ProfileManager.ui b/retroshare-gui/src/gui/profile/ProfileManager.ui
index cbad7aa33..107a7c31c 100644
--- a/retroshare-gui/src/gui/profile/ProfileManager.ui
+++ b/retroshare-gui/src/gui/profile/ProfileManager.ui
@@ -26,43 +26,6 @@
:/images/rstray3.png:/images/rstray3.png
-
- QToolButton, QPushButton, QComboBox {
-border-image: url(:/images/btn_26.png) 4;
-border-width: 4;
-padding: 0px 6px;
-font-size: 12px;
-}
-
-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
@@ -78,19 +41,6 @@ border-image: url(:/images/btn_26_pressed.png) 4;
30
-
- QFrame#frame{
-background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-stop:0 #FEFEFE, stop:1 #E8E8E8);
-
-border: 1px solid #CCCCCC;}
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
@@ -129,9 +79,6 @@ border: 1px solid #CCCCCC;}
26
-
-
-
Generate New Identity
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
index e3167fb2f..5753f7775 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss
@@ -18,6 +18,28 @@ HeaderFrame > QLabel#headerLabel {
color: rgb(255, 255, 255);
}
+/* GenCertDialog */
+
+GenCertDialog > QFrame#headerFrame {
+ background-image: url(:/images/genbackground.png);
+}
+
+GenCertDialog > QFrame#headerFrame > QLabel#headerLabel {
+ color: rgb(255, 255, 255);
+}
+
+GenCertDialog > QFrame#frame {
+ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FEFEFE, stop:1 #E8E8E8);
+ border: 1px solid #CCCCCC;
+}
+
+/* ProfileManager */
+
+ProfileManager > QFrame#frame {
+ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FEFEFE, stop:1 #E8E8E8);
+ border: 1px solid #CCCCCC;
+}
+
/* FriendsDialog */
FriendsDialog QFrame#headerFrame {
diff --git a/retroshare-gui/src/rshare.cpp b/retroshare-gui/src/rshare.cpp
index 6a48ec01d..501f949e8 100644
--- a/retroshare-gui/src/rshare.cpp
+++ b/retroshare-gui/src/rshare.cpp
@@ -87,7 +87,7 @@ Rshare::qt_msg_handler(QtMsgType type, const char *s)
/** Constructor. Parses the command-line arguments, resets Rshare's
* configuration (if requested), and sets up the GUI style and language
* translation. */
-Rshare::Rshare(QStringList args, int &argc, char **argv, QString dir)
+Rshare::Rshare(QStringList args, int &argc, char **argv, const QString &dir)
: QApplication(argc, argv)
{
qInstallMsgHandler(qt_msg_handler);
@@ -345,6 +345,10 @@ Rshare::setSheet(QString sheet)
}
/* Apply the specified GUI stylesheet */
_stylesheet = sheet;
+
+ /* load the StyleSheet*/
+ loadStyleSheet(_stylesheet);
+
return true;
}
diff --git a/retroshare-gui/src/rshare.h b/retroshare-gui/src/rshare.h
index a186dc80c..d75751302 100644
--- a/retroshare-gui/src/rshare.h
+++ b/retroshare-gui/src/rshare.h
@@ -56,7 +56,7 @@ class Rshare : public QApplication
public:
/** Constructor. */
- Rshare(QStringList args, int &argc, char **argv, QString dir);
+ Rshare(QStringList args, int &argc, char **argv, const QString &dir);
/** Destructor. */
~Rshare();