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

fixed key list not properly updating when importing new key in GenCertDialog, and improved tooltips

Browse Source
This commit is contained in:
csoler 2019-12-24 11:48:50 +01:00
parent dc3624945f
commit f45a04b3d5
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
retroshare-gui/src/gui/GenCertDialog.cpp
View File

@ -242,7 +242,7 @@ void GenCertDialog::initKeyList()
RsAccounts::GetPGPLoginDetails(*it, name, email); RsAccounts::GetPGPLoginDetails(*it, name, email);
std::cerr << "Adding PGPUser: " << name << " id: " << *it << std::endl; std::cerr << "Adding PGPUser: " << name << " id: " << *it << std::endl;
QString gid = QString::fromStdString( (*it).toStdString()).right(8) ; QString gid = QString::fromStdString( (*it).toStdString()).right(8) ;
ui.genPGPuser->addItem(QString::fromUtf8(name.c_str()) + " <" + QString::fromUtf8(email.c_str()) + "> (" + gid + ")", userData); ui.genPGPuser->addItem(QString::fromUtf8(name.c_str()) + " (" + gid + ")", userData);
haveGPGKeys = true; haveGPGKeys = true;
} }
} }
@ -294,7 +294,8 @@ void GenCertDialog::setupState()
ui.reuse_existing_node_CB->setEnabled(adv_state) ; ui.reuse_existing_node_CB->setEnabled(adv_state) ;
ui.importIdentity_PB->setVisible(adv_state && !generate_new) ; ui.importIdentity_PB->setVisible(adv_state && !generate_new) ;
ui.exportIdentity_PB->setVisible(adv_state && !generate_new) ; //ui.exportIdentity_PB->setVisible(adv_state && !generate_new) ;
ui.exportIdentity_PB->setVisible(false); // not useful, and probably confusing
ui.genPGPuser->setVisible(adv_state && haveGPGKeys && !generate_new) ; ui.genPGPuser->setVisible(adv_state && haveGPGKeys && !generate_new) ;
@ -317,6 +318,11 @@ void GenCertDialog::setupState()
ui.password_input->setVisible(true); ui.password_input->setVisible(true);
ui.password_label->setVisible(true); ui.password_label->setVisible(true);
if(generate_new)
ui.password_input->setToolTip(tr("<html><p>Put a strong password here. This password will be required to start your Retroshare node and protects all your data.</p></html>"));
else
ui.password_input->setToolTip(tr("<html><p>Please supply the existing password for the selected profile above.</p></html>"));
ui.password2_check_LB->setVisible(generate_new); ui.password2_check_LB->setVisible(generate_new);
ui.password2_input->setVisible(generate_new); ui.password2_input->setVisible(generate_new);
ui.password2_label->setVisible(generate_new); ui.password2_label->setVisible(generate_new);
@ -468,7 +474,10 @@ bool 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 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.")) ; QMessageBox::information(this,tr("New profile imported"),tr("Your profile was imported successfully:")+" \n"+"\nName :"+QString::fromStdString(name)+"\nKey ID: "+QString::fromStdString(gpg_id.toStdString())+"\n\n"+tr("You can use it now to create a new node.")) ;
initKeyList();
setupState();
return true ; return true ;
} }

10
retroshare-gui/src/gui/connect/ConfCertDialog.cpp
View File

@ -306,11 +306,15 @@ QString ConfCertDialog::getCertificateDescription(const RsPeerDetails& detail,bo
infotext += "<UL>" ; infotext += "<UL>" ;
if(use_short_format) if(use_short_format)
{
infotext += "<li> a <b>Profile fingerprint</b>"; infotext += "<li> a <b>Profile fingerprint</b>";
infotext += " (" + QString::fromUtf8(detail.name.c_str()) + "@" + detail.fpr.toStdString().c_str()+") " ;
}
else else
infotext += "<li> a <b>Profile key</b>"; {
infotext += "<li> a <b>Profile public key</b>";
infotext += " (" + QString::fromUtf8(detail.name.c_str()) + "@" + detail.gpg_id.toStdString().c_str()+") " ; infotext += " (" + QString::fromUtf8(detail.name.c_str()) + "@" + detail.gpg_id.toStdString().c_str()+") " ;
}
if(signatures_included && !use_short_format) if(signatures_included && !use_short_format)
infotext += tr("with")+" "+QString::number(detail.gpgSigners.size()-1)+" "+tr("external signatures</li>") ; infotext += tr("with")+" "+QString::number(detail.gpgSigners.size()-1)+" "+tr("external signatures</li>") ;

12
retroshare-gui/src/gui/settings/CryptoPage.ui
View File

@ -14,7 +14,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="title"> <attribute name="title">
@ -541,7 +541,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QPlainTextEdit" name="certplainTextEdit"> <widget class="QPlainTextEdit" name="certplainTextEdit">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum"> <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -569,6 +569,9 @@
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <item>
<widget class="QCheckBox" name="_includeSignatures_CB"> <widget class="QCheckBox" name="_includeSignatures_CB">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text"> <property name="text">
<string>Include signatures</string> <string>Include signatures</string>
</property> </property>
@ -576,6 +579,9 @@
</item> </item>
<item> <item>
<widget class="QCheckBox" name="_shortFormat_CB"> <widget class="QCheckBox" name="_shortFormat_CB">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text"> <property name="text">
<string>Short format</string> <string>Short format</string>
</property> </property>
@ -601,7 +607,7 @@
<item> <item>
<widget class="QPushButton" name="saveButton"> <widget class="QPushButton" name="saveButton">
<property name="toolTip"> <property name="toolTip">
<string>Save Key into a file</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Saves your profile key pair into a file. This allows you to create a new node for the same profile, by importing this key pair on a different computer. Friends who already accept connections from you will automatically accept connections from that new node after you add them yourself. Your key is exported encrypted and you will need your login password to create a new profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>Save certificate to file</string> <string>Save certificate to file</string>