diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp index f0de5ceee..3692e06d1 100644 --- a/retroshare-gui/src/gui/GenCertDialog.cpp +++ b/retroshare-gui/src/gui/GenCertDialog.cpp @@ -49,6 +49,9 @@ GenCertDialog::GenCertDialog(QWidget *parent, Qt::WFlags flags) //connect(ui.friendBox, SIGNAL(stateChanged(int)), this, SLOT(checkChanged(int))); //ui.genName->setFocus(Qt::OtherFocusReason); + + QString titleString("%1"); /* get all available pgp private certificates.... * mark last one as default. @@ -74,11 +77,17 @@ GenCertDialog::GenCertDialog(QWidget *parent, Qt::WFlags flags) if (foundGPGKeys) { ui.no_gpg_key_label->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") ) ) ; genNewGPGKey = false; } else { ui.no_gpg_key_label->show(); ui.new_gpg_key_checkbox->setChecked(true); ui.new_gpg_key_checkbox->hide(); + setWindowTitle(tr("Create new Profile")); + ui.genButton->setText(tr("Generate new Profile")); + ui.label_3->setText( titleString.arg( tr("Create a new Profile") ) ) ; genNewGPGKey = true; } newGPGKeyGenUiSetup(); @@ -115,6 +124,10 @@ void GenCertDialog::closeinfodlg() } void GenCertDialog::newGPGKeyGenUiSetup() { + + QString titleStr("%1"); + if (ui.new_gpg_key_checkbox->isChecked()) { genNewGPGKey = true; ui.name_label->show(); @@ -125,6 +138,9 @@ void GenCertDialog::newGPGKeyGenUiSetup() { ui.password_input->show(); ui.genPGPuserlabel->hide(); ui.genPGPuser->hide(); + setWindowTitle(tr("Create new Profile")); + ui.genButton->setText(tr("Generate new Profile")); + ui.label_3->setText( titleStr.arg( tr("Create a new Profile") ) ) ; } else { genNewGPGKey = false; ui.name_label->hide(); @@ -135,6 +151,9 @@ void GenCertDialog::newGPGKeyGenUiSetup() { ui.password_input->hide(); ui.genPGPuserlabel->show(); ui.genPGPuser->show(); + setWindowTitle(tr("Create new Location")); + ui.genButton->setText(tr("Generate new Location")); + ui.label_3->setText( titleStr.arg( tr("Create a new Location") ) ) ; } } void GenCertDialog::genPerson() diff --git a/retroshare-gui/src/gui/GenCertDialog.ui b/retroshare-gui/src/gui/GenCertDialog.ui index 091d7a01c..cc99a519b 100644 --- a/retroshare-gui/src/gui/GenCertDialog.ui +++ b/retroshare-gui/src/gui/GenCertDialog.ui @@ -6,8 +6,8 @@ 0 0 - 569 - 603 + 592 + 496 @@ -506,7 +506,7 @@ Qt::NoContextMenu - RetroShare : Create new user Profile + Create new Profile @@ -560,68 +560,6 @@ border-image: url(:/images/btn_26_pressed.png) 4; 0 - - - - - 16777215 - 140 - - - - QFrame#frame_2{background-image: url(:/images/genbackground.png);} - - - - QFrame::NoFrame - - - QFrame::Plain - - - - 6 - - - 6 - - - - - - 128 - 128 - - - - - - - :/images/contact_new128.png - - - true - - - - - - - <!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:'DejaVu 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;"><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="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:8pt; font-weight:600;"></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="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:8pt; font-weight:600;"></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> - - - - - - @@ -874,6 +812,72 @@ anonymous, you can use a fake email. + + + + + 16777215 + 140 + + + + QFrame#frame_2{background-image: url(:/images/genbackground.png);} + + + + QFrame::NoFrame + + + QFrame::Plain + + + + + + + 128 + 128 + + + + + + + :/images/contact_new128.png + + + true + + + + + + + <!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 Profile</span></p></body></html> + + + + + + + <!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:8pt; font-weight:600;">RetroShare uses gpg keys for identity management. </span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:8pt; font-weight:600;"></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;">You can install retroshare on different locations using the same gpg key.</span></p></body></html> + + + + + +