Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-09 17:45:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace identity with profile in GernCertDialog (patch from Henry)

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8246 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
electron128 2015-05-14 13:18:58 +00:00
parent e449e709b5
commit c01680808f
2 changed files with 63 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

81
retroshare-gui/src/gui/GenCertDialog.cpp
View file

@ -106,7 +106,7 @@ void GenCertDialog::grabMouse()
{ {
ui.genButton2->setEnabled(true) ; ui.genButton2->setEnabled(true) ;
ui.genButton2->setIcon(QIcon(":/images/resume.png")) ; ui.genButton2->setIcon(QIcon(":/images/resume.png")) ;
ui.genButton2->setToolTip(tr("CLick to create your node and/or identity")) ; ui.genButton2->setToolTip(tr("Click to create your node and/or profile")) ;
} }
RsInit::collectEntropy(E+(F << 16)) ; RsInit::collectEntropy(E+(F << 16)) ;
@ -124,7 +124,7 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent)
ui.setupUi(this); ui.setupUi(this);
ui.headerFrame->setHeaderImage(QPixmap(":/images/contact_new128.png")); ui.headerFrame->setHeaderImage(QPixmap(":/images/contact_new128.png"));
ui.headerFrame->setHeaderText(tr("Create a new Identity")); ui.headerFrame->setHeaderText(tr("Create a new profile"));
connect(ui.new_gpg_key_checkbox, SIGNAL(clicked()), this, SLOT(newGPGKeyGenUiSetup())); connect(ui.new_gpg_key_checkbox, SIGNAL(clicked()), this, SLOT(newGPGKeyGenUiSetup()));
connect(ui.adv_checkbox, SIGNAL(clicked()), this, SLOT(updateUiSetup())); connect(ui.adv_checkbox, SIGNAL(clicked()), this, SLOT(updateUiSetup()));
@ -166,11 +166,11 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent)
ui.node_input->setPlaceholderText(tr("[Required] Examples: Home, Laptop,...")) ; ui.node_input->setPlaceholderText(tr("[Required] Examples: Home, Laptop,...")) ;
ui.hiddenaddr_input->setPlaceholderText(tr("[Required] Examples: xa76giaf6ifda7ri63i263.onion (obtained by you from TOR)")) ; ui.hiddenaddr_input->setPlaceholderText(tr("[Required] Examples: xa76giaf6ifda7ri63i263.onion (obtained by you from TOR)")) ;
ui.name_input->setPlaceholderText(tr("[Required] Visible to your friends, and friends of friends.")); ui.name_input->setPlaceholderText(tr("[Required] Visible to your friends, and friends of friends."));
ui.password_input->setPlaceholderText(tr("[Required] This password protects your PGP key.")); ui.password_input->setPlaceholderText(tr("[Required] This password protects your private PGP key."));
ui.password_input_2->setPlaceholderText(tr("[Required] Type the same password again here.")); ui.password_input_2->setPlaceholderText(tr("[Required] Type the same password again here."));
#endif #endif
ui.node_input->setToolTip(tr("Enter a meaningful node description. e.g. : home, laptop, etc. \nThis field will be used to differentiate different installations with\nthe same identity (PGP key).")) ; ui.node_input->setToolTip(tr("Enter a meaningful node description. e.g. : home, laptop, etc. \nThis field will be used to differentiate different installations with\nthe same profile (PGP key pair).")) ;
ui.email_input->hide() ; ui.email_input->hide() ;
ui.email_label->hide() ; ui.email_label->hide() ;
@ -222,14 +222,14 @@ void GenCertDialog::init()
ui.no_gpg_key_label->setVisible(!mOnlyGenerateIdentity); ui.no_gpg_key_label->setVisible(!mOnlyGenerateIdentity);
ui.new_gpg_key_checkbox->setChecked(true); ui.new_gpg_key_checkbox->setChecked(true);
ui.new_gpg_key_checkbox->setEnabled(true); ui.new_gpg_key_checkbox->setEnabled(true);
setWindowTitle(tr("Create new Identity")); setWindowTitle(tr("Create new profile"));
ui.genButton2->setText(tr("Generate new Identity")); ui.genButton2->setText(tr("Generate new profile and node"));
ui.headerFrame->setHeaderText(tr("Create a new Identity")); ui.headerFrame->setHeaderText(tr("Create a new profile and node"));
genNewGPGKey = true; genNewGPGKey = true;
} }
QString text; /*= ui.header_label->text() + "\n";*/ QString text; /*= ui.header_label->text() + "\n";*/
text += tr("You can create a new identity with this form."); text += tr("You can create a new profile with this form.");
if (mOnlyGenerateIdentity) { if (mOnlyGenerateIdentity) {
ui.new_gpg_key_checkbox->setChecked(true); ui.new_gpg_key_checkbox->setChecked(true);
@ -237,12 +237,12 @@ void GenCertDialog::init()
ui.genprofileinfo_label->hide(); ui.genprofileinfo_label->hide();
} else { } else {
text += "\n"; text += "\n";
text += tr("Alternatively you can use an existing identity. Just uncheck \"Create a new identity\""); text += tr("Alternatively you can use an existing profile. Just uncheck \"Create a new profile\"");
} }
ui.header_label->setText(text); ui.header_label->setText(text);
newGPGKeyGenUiSetup(); newGPGKeyGenUiSetup();
updateUiSetup(); //updateUiSetup();
} }
void GenCertDialog::mouseMoveEvent(QMouseEvent *e) void GenCertDialog::mouseMoveEvent(QMouseEvent *e)
@ -253,6 +253,8 @@ void GenCertDialog::mouseMoveEvent(QMouseEvent *e)
} }
void GenCertDialog::newGPGKeyGenUiSetup() { void GenCertDialog::newGPGKeyGenUiSetup() {
bool adv_state = ui.adv_checkbox->isChecked();
bool hidden_state = ui.hidden_checkbox->isChecked();
if (ui.new_gpg_key_checkbox->isChecked()) { if (ui.new_gpg_key_checkbox->isChecked()) {
genNewGPGKey = true; genNewGPGKey = true;
@ -268,15 +270,22 @@ void GenCertDialog::newGPGKeyGenUiSetup() {
ui.genPGPuser->hide(); ui.genPGPuser->hide();
ui.importIdentity_PB->hide() ; ui.importIdentity_PB->hide() ;
ui.exportIdentity_PB->hide(); ui.exportIdentity_PB->hide();
setWindowTitle(tr("Create new identity")); setWindowTitle(tr("Create new profile"));
ui.genButton2->setText(tr("Generate new identity and node")); ui.genButton2->setText(tr("Generate new profile and node"));
ui.headerFrame->setHeaderText(tr("Create a new identity")); ui.headerFrame->setHeaderText(tr("Create a new profile and node"));
ui.genButton2->setVisible(true); ui.no_gpg_key_label->setText(tr("Please fill out this form to create a profile and node."));
ui.genButton2->setVisible(true);
ui.adv_checkbox->setVisible(true);
ui.node_label->setVisible(true);
ui.node_input->setVisible(true);
ui.entropy_label->setVisible(true);
ui.entropy_bar->setVisible(true);
ui.genprofileinfo_label->hide(); ui.genprofileinfo_label->hide();
ui.header_label->show(); ui.header_label->show();
//ui.keylength_label->show(); //ui.keylength_label->show();
//ui.keylength_comboBox->show(); //ui.keylength_comboBox->show();
} else { } else {
bool havePGPkeys = (ui.genPGPuser->count() != 0)?true:false;
genNewGPGKey = false; genNewGPGKey = false;
ui.name_label->hide(); ui.name_label->hide();
ui.name_input->hide(); ui.name_input->hide();
@ -289,17 +298,29 @@ void GenCertDialog::newGPGKeyGenUiSetup() {
ui.genPGPuserlabel->show(); ui.genPGPuserlabel->show();
ui.genPGPuser->show(); ui.genPGPuser->show();
ui.importIdentity_PB->setVisible(!mOnlyGenerateIdentity); ui.importIdentity_PB->setVisible(!mOnlyGenerateIdentity);
ui.exportIdentity_PB->setVisible(!mOnlyGenerateIdentity); ui.exportIdentity_PB->setVisible(havePGPkeys);
ui.exportIdentity_PB->setEnabled(ui.genPGPuser->count() != 0); ui.exportIdentity_PB->setEnabled(havePGPkeys);
setWindowTitle(tr("Create new node")); setWindowTitle(tr("Create new node"));
ui.genButton2->setText(tr("Generate new node")); ui.genButton2->setText(tr("Generate new node"));
ui.genButton2->setVisible(ui.genPGPuser->count() != 0);
ui.headerFrame->setHeaderText(tr("Create a new node")); ui.headerFrame->setHeaderText(tr("Create a new node"));
ui.no_gpg_key_label->setText(tr("No valid profile found!\nPlease import one first."));
ui.genButton2->setVisible(havePGPkeys);
ui.adv_checkbox->setVisible(havePGPkeys);
ui.adv_checkbox->setChecked(havePGPkeys && adv_state);
ui.genPGPuser->setVisible(havePGPkeys);
ui.genPGPuserlabel->setVisible(havePGPkeys);
ui.node_label->setVisible(havePGPkeys);
ui.node_input->setVisible(havePGPkeys);
ui.entropy_label->setVisible(havePGPkeys);
ui.entropy_bar->setVisible(havePGPkeys);
ui.genprofileinfo_label->show(); ui.genprofileinfo_label->show();
ui.header_label->hide(); ui.header_label->hide();
ui.keylength_label->hide(); ui.keylength_label->hide();
ui.keylength_comboBox->hide(); ui.keylength_comboBox->hide();
} }
updateUiSetup();
ui.adv_checkbox->setChecked(adv_state);
ui.hidden_checkbox->setChecked(hidden_state);
} }
void GenCertDialog::updateUiSetup() void GenCertDialog::updateUiSetup()
@ -347,7 +368,7 @@ void GenCertDialog::updateUiSetup()
void GenCertDialog::exportIdentity() void GenCertDialog::exportIdentity()
{ {
QString fname = QFileDialog::getSaveFileName(this,tr("Export identity"), "",tr("RetroShare identity files (*.asc)")) ; QString fname = QFileDialog::getSaveFileName(this,tr("Export profile"), "",tr("RetroShare profile files (*.asc)")) ;
if(fname.isNull()) if(fname.isNull())
return ; return ;
@ -356,14 +377,14 @@ void GenCertDialog::exportIdentity()
RsPgpId gpg_id (data.toString().toStdString()) ; RsPgpId gpg_id (data.toString().toStdString()) ;
if(RsAccounts::ExportIdentity(fname.toStdString(),gpg_id)) if(RsAccounts::ExportIdentity(fname.toStdString(),gpg_id))
QMessageBox::information(this,tr("Identity saved"),tr("Your identity was successfully saved\nIt is encrypted\n\nYou can now copy it to another computer\nand use the import button to load it")) ; QMessageBox::information(this,tr("Profile saved"),tr("Your profile was successfully saved\nIt is encrypted\n\nYou can now copy it to another computer\nand use the import button to load it")) ;
else else
QMessageBox::information(this,tr("Identity not saved"),tr("Your identity was not saved. An error occurred.")) ; QMessageBox::information(this,tr("Profile not saved"),tr("Your profile was not saved. An error occurred.")) ;
} }
void GenCertDialog::importIdentity() void GenCertDialog::importIdentity()
{ {
QString fname = QFileDialog::getOpenFileName(this,tr("Import identity"), "",tr("RetroShare identity files (*.asc)")) ; QString fname = QFileDialog::getOpenFileName(this,tr("Import profile"), "",tr("RetroShare profile files (*.asc)")) ;
if(fname.isNull()) if(fname.isNull())
return ; return ;
@ -373,7 +394,7 @@ void GenCertDialog::importIdentity()
if(!RsAccounts::ImportIdentity(fname.toStdString(),gpg_id,err_string)) if(!RsAccounts::ImportIdentity(fname.toStdString(),gpg_id,err_string))
{ {
QMessageBox::information(this,tr("Identity not loaded"),tr("Your identity was not loaded properly:")+" \n "+QString::fromStdString(err_string)) ; QMessageBox::information(this,tr("Profile not loaded"),tr("Your profile was not loaded properly:")+" \n "+QString::fromStdString(err_string)) ;
return ; return ;
} }
else else
@ -383,7 +404,7 @@ void GenCertDialog::importIdentity()
RsAccounts::GetPGPLoginDetails(gpg_id, name, email); RsAccounts::GetPGPLoginDetails(gpg_id, name, email);
std::cerr << "Adding PGPUser: " << name << " id: " << gpg_id << std::endl; std::cerr << "Adding PGPUser: " << name << " id: " << gpg_id << std::endl;
QMessageBox::information(this,tr("New identity imported"),tr("Your identity was imported successfully:")+" \n"+"\nName :"+QString::fromStdString(name)+"\nemail: " + QString::fromStdString(email)+"\nKey ID: "+QString::fromStdString(gpg_id.toStdString())+"\n\n"+tr("You can use it now to create a new node.")) ; QMessageBox::information(this,tr("New profile imported"),tr("Your profile was imported successfully:")+" \n"+"\nName :"+QString::fromStdString(name)+"\nemail: " + QString::fromStdString(email)+"\nKey ID: "+QString::fromStdString(gpg_id.toStdString())+"\n\n"+tr("You can use it now to create a new node.")) ;
} }
init() ; init() ;
@ -416,7 +437,7 @@ void GenCertDialog::genPerson()
if (genLoc.length() < 3) { if (genLoc.length() < 3) {
/* Message Dialog */ /* Message Dialog */
QMessageBox::warning(this, QMessageBox::warning(this,
tr("Generate PGP key failure"), tr("PGP key pair generation failure"),
tr("Node field is required with a minimum of 3 characters"), tr("Node field is required with a minimum of 3 characters"),
QMessageBox::Ok); QMessageBox::Ok);
return; return;
@ -426,8 +447,8 @@ void GenCertDialog::genPerson()
{ {
/* Message Dialog */ /* Message Dialog */
QMessageBox::warning(this, QMessageBox::warning(this,
"Generate ID failure", tr("Profile generation failure"),
"Missing PGP certificate", tr("Missing PGP certificate"),
QMessageBox::Ok); QMessageBox::Ok);
return; return;
} }
@ -437,7 +458,7 @@ void GenCertDialog::genPerson()
if (ui.password_input->text().length() < 3 || ui.name_input->text().length() < 3 || genLoc.length() < 3) { if (ui.password_input->text().length() < 3 || ui.name_input->text().length() < 3 || genLoc.length() < 3) {
/* Message Dialog */ /* Message Dialog */
QMessageBox::warning(this, QMessageBox::warning(this,
tr("Generate PGP key failure"), tr("PGP key pair generation failure"),
tr("All fields are required with a minimum of 3 characters"), tr("All fields are required with a minimum of 3 characters"),
QMessageBox::Ok); QMessageBox::Ok);
return; return;
@ -446,14 +467,14 @@ void GenCertDialog::genPerson()
if(ui.password_input->text() != ui.password_input_2->text()) if(ui.password_input->text() != ui.password_input_2->text())
{ {
QMessageBox::warning(this, QMessageBox::warning(this,
tr("Generate PGP key failure"), tr("PGP key pair generation failure"),
tr("Passwords do not match"), tr("Passwords do not match"),
QMessageBox::Ok); QMessageBox::Ok);
return; return;
} }
//generate a new gpg key //generate a new gpg key
std::string err_string; std::string err_string;
ui.no_gpg_key_label->setText(tr("Generating new PGP key, please be patient: this process needs generating large prime numbers, and can take some minutes on slow computers. \n\nFill in your PGP password when asked, to sign your new key.")); ui.no_gpg_key_label->setText(tr("Generating new PGP key pair, please be patient: this process needs generating large prime numbers, and can take some minutes on slow computers. \n\nFill in your PGP password when asked, to sign your new key."));
ui.no_gpg_key_label->show(); ui.no_gpg_key_label->show();
ui.new_gpg_key_checkbox->hide(); ui.new_gpg_key_checkbox->hide();
ui.name_label->hide(); ui.name_label->hide();
@ -516,7 +537,7 @@ void GenCertDialog::genPerson()
{ {
/* Message Dialog */ /* Message Dialog */
QMessageBox::warning(this, QMessageBox::warning(this,
tr("Generate ID failure"), tr("Profile generation failure"),
tr("Failed to generate your new certificate, maybe PGP password is wrong!"), tr("Failed to generate your new certificate, maybe PGP password is wrong!"),
QMessageBox::Ok); QMessageBox::Ok);
reject(); reject();

24
retroshare-gui/src/gui/GenCertDialog.ui
View file

@ -62,7 +62,7 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>You can create and run Retroshare nodes on different computers using the same identity. To do so just export the selected identity, import it on the other computer and create a new node with it.</string> <string>You can create and run Retroshare nodes on different computers using the same profile. To do so just export the selected profile, import it on the other computer and create a new node with it.</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
@ -72,7 +72,7 @@
<item> <item>
<widget class="QLabel" name="no_gpg_key_label"> <widget class="QLabel" name="no_gpg_key_label">
<property name="text"> <property name="text">
<string>It looks like you don't own any profile (PGP keys). Please fill in the form below to create one, or import an existing profile.</string> <string>It looks like no profile (PGP keys) exists. Please fill in the form below to create one, or import an existing profile.</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
@ -90,10 +90,10 @@
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Your profile is associated with a PGP key</string> <string>Your profile is associated with a PGP key pair</string>
</property> </property>
<property name="text"> <property name="text">
<string>Create a new identity</string> <string>Create a new profile</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="images.qrc"> <iconset resource="images.qrc">
@ -119,7 +119,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Import new identity</string> <string>Import new profile</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -132,7 +132,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Export selected identity</string> <string>Export selected profile</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -145,7 +145,7 @@
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Your profile is associated with a PGP key</string> <string>Your profile is associated with a PGP key pair</string>
</property> </property>
<property name="text"> <property name="text">
<string>Advanced options</string> <string>Advanced options</string>
@ -242,7 +242,7 @@
<item> <item>
<widget class="QLabel" name="genPGPuserlabel"> <widget class="QLabel" name="genPGPuserlabel">
<property name="text"> <property name="text">
<string>Use identity</string> <string>Use profile</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -308,7 +308,7 @@
<item> <item>
<widget class="QComboBox" name="genPGPuser"> <widget class="QComboBox" name="genPGPuser">
<property name="toolTip"> <property name="toolTip">
<string>Your profile is associated with a PGP key. RetroShare currently ignores DSA keys.</string> <string>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -355,7 +355,7 @@ anonymous, you can use a fake email.</string>
<item> <item>
<widget class="QLineEdit" name="password_input"> <widget class="QLineEdit" name="password_input">
<property name="toolTip"> <property name="toolTip">
<string>Put a strong password here. This password protects your PGP key.</string> <string>Put a strong password here. This password protects your private PGP key.</string>
</property> </property>
<property name="inputMask"> <property name="inputMask">
<string/> <string/>
@ -377,7 +377,7 @@ anonymous, you can use a fake email.</string>
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Put a strong password here. This password protects your PGP key.</string> <string>Put a strong password here. This password protects your private PGP key.</string>
</property> </property>
<property name="inputMask"> <property name="inputMask">
<string/> <string/>
@ -500,7 +500,7 @@ anonymous, you can use a fake email.</string>
<string notr="true"/> <string notr="true"/>
</property> </property>
<property name="text"> <property name="text">
<string>Create new identity</string> <string>Create new profile</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="images.qrc"> <iconset resource="images.qrc">