added tooltip for certificates in Home

retroshare-gui/src/gui/HomePage.cpp

@@ -25,6 +25,7 @@
 #include "gui/notifyqt.h"
 #include "gui/msgs/MessageComposer.h"
 #include "gui/connect/ConnectFriendWizard.h"
+#include "gui/connect/ConfCertDialog.h"
 #include <gui/QuickStartWizard.h>
 #include "gui/connect/FriendRecommendDialog.h"
 
@@ -106,9 +107,23 @@ HomePage::~HomePage()
 
 void HomePage::updateOwnCert()
 {
-	std::string invite = rsPeers->GetRetroshareInvite(false);
+    bool include_extra_locators = false;
+
+    RsPeerDetails detail;
+
+    if (!rsPeers->getPeerDetails(rsPeers->getOwnId(), detail))
+    {
+        std::cerr << "(EE) Cannot retrieve information about own certificate. That is a real problem!!" << std::endl;
+        return ;
+    }
+
+	std::string invite = rsPeers->GetRetroshareInvite(detail.id,false,include_extra_locators);
 
 	ui->userCertEdit->setPlainText(QString::fromUtf8(invite.c_str()));
+
+    QString description = ConfCertDialog::getCertificateDescription(detail,false,include_extra_locators);
+
+	ui->userCertEdit->setToolTip(description);
 }
 
 static void sendMail(QString sAddress, QString sSubject, QString sBody)

retroshare-gui/src/gui/connect/ConfCertDialog.cpp

@@ -270,34 +270,9 @@ void ConfCertDialog::loadInvitePage()
 //	ui.userCertificateText_2->setFont(font);
 //	ui.userCertificateText_2->setText(QString::fromUtf8(pgp_key.c_str()));
 
-        std::string invite = rsPeers->GetRetroshareInvite(detail.id,ui._shouldAddSignatures_CB->isChecked()) ; // this needs to be a SSL id
+	std::string invite = rsPeers->GetRetroshareInvite(detail.id,ui._shouldAddSignatures_CB->isChecked()) ; // this needs to be a SSL id
 
-    QString infotext ;
+    QString infotext = getCertificateDescription(detail,ui._shouldAddSignatures_CB->isChecked(),true);	// true, because default parameter in GetRetroshareInvite is true
-
-    //infotext += tr("<p>Use this certificate to make new friends. Send it by email, or give it hand to hand.</p>") ;
-    infotext += tr("<p>This certificate contains:") ;
-    infotext += "<UL>" ;
-    infotext += "<li> a <b>Profile key</b>";
-    infotext += " (" + QString::fromUtf8(detail.name.c_str())  + "@" + detail.gpg_id.toStdString().c_str()+") " ;
-    if(ui._shouldAddSignatures_CB->isChecked())
-        infotext += tr("with")+" "+QString::number(detail.gpgSigners.size()-1)+" "+tr("external signatures</li>") ;
-    else
-        infotext += "</li>" ;
-
-    infotext += tr("<li>a <b>node ID</b> and <b>name</b>") +" (" + detail.id.toStdString().c_str() + ", " + QString::fromUtf8(detail.location.c_str()) +")" ;
-    infotext += "</li>" ;
-
-    infotext += "<li>" ;
-    if(detail.isHiddenNode)
-        infotext += tr("an <b>onion address</b> and <b>port</b>") +" (" + detail.hiddenNodeAddress.c_str() + ":" + QString::number(detail.hiddenNodePort)+ ")";
-    else
-        infotext += tr("an <b>IP address</b> and <b>port</b>") +" (" + detail.connectAddr.c_str() + ":" + QString::number(detail.connectPort)+ ")";
-    infotext += "</li>" ;
-
-    infotext += QString("</p>") ;
-
-    if(rsPeers->getOwnId() == detail.id)
-        infotext += tr("<p>You can use this certificate to make new friends. Send it by email, or give it hand to hand.</p>") ;
 
     ui.userCertificateText->setToolTip(infotext) ;
 
@@ -311,6 +286,45 @@ void ConfCertDialog::loadInvitePage()
         ui.userCertificateText->setText(QString::fromUtf8(invite.c_str()));
 }
 
+QString ConfCertDialog::getCertificateDescription(const RsPeerDetails& detail,bool signatures_included,bool include_additional_locators)
+{
+    //infotext += tr("<p>Use this certificate to make new friends. Send it by email, or give it hand to hand.</p>") ;
+    QString infotext = QObject::tr("<p>This certificate contains:") ;
+    infotext += "<UL>" ;
+    infotext += "<li> a <b>Profile key</b>";
+    infotext += " (" + QString::fromUtf8(detail.name.c_str())  + "@" + detail.gpg_id.toStdString().c_str()+") " ;
+
+    if(signatures_included)
+        infotext += tr("with")+" "+QString::number(detail.gpgSigners.size()-1)+" "+tr("external signatures</li>") ;
+    else
+        infotext += "</li>" ;
+
+    infotext += tr("<li>a <b>node ID</b> and <b>name</b>") +" (" + detail.id.toStdString().c_str() + ", " + QString::fromUtf8(detail.location.c_str()) +")" ;
+    infotext += "</li>" ;
+
+    infotext += "<li>" ;
+    if(detail.isHiddenNode)
+        infotext += tr("an <b>onion address</b> and <b>port</b>") +" (" + detail.hiddenNodeAddress.c_str() + ":" + QString::number(detail.hiddenNodePort)+ ")";
+    else if(!detail.connectAddr.empty())
+        infotext += tr("an <b>IP address</b> and <b>port</b>") +" (" + detail.connectAddr.c_str() + ":" + QString::number(detail.connectPort)+ ")";
+    infotext += "</li>" ;
+
+    if(include_additional_locators)
+        for(auto it(detail.ipAddressList.begin());it!=detail.ipAddressList.end();++it)
+        {
+    		infotext += "<li>" ;
+            infotext += tr("Extra <b>IP</b>: ") + QString::fromStdString(*it) ;
+	        infotext += "</li>" ;
+        }
+
+    infotext += QString("</p>") ;
+
+    if(rsPeers->getOwnId() == detail.id)
+        infotext += tr("<p>You can use this certificate to make new friends. Send it by email, or give it hand to hand.</p>") ;
+
+    return infotext;
+}
+
 
 void ConfCertDialog::applyDialog()
 {

retroshare-gui/src/gui/connect/ConfCertDialog.h

@@ -27,6 +27,7 @@
 
 #include "ui_ConfCertDialog.h"
 #include <retroshare/rstypes.h>
+#include <retroshare/rspeers.h>
 
 class ConfCertDialog : public QDialog
 {
@@ -59,6 +60,7 @@ public:
         /* window will destroy itself! */
     }
     static void loadAll();
+	static QString getCertificateDescription(const RsPeerDetails& det,bool signatures_included,bool extra_locators_included);
 
 signals:
     void configChanged();