implement the remove friend for gpg key, and improve the tranfer of ip address from a dummy peer to a normal peer

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2024 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/gui/NetworkDialog.cpp

@@ -257,13 +257,7 @@ void NetworkDialog::deleteCert()
 
 void NetworkDialog::makeFriend()
 {
-	QTreeWidgetItem *wi = getCurrentNeighbour();
-        std::string authId = wi->text(4).toStdString() ;
-
-        rsPeers->signGPGCertificate(authId);
-        rsPeers->addDummyFriend(authId);
-
-	insertConnect() ;
+        ConfCertDialog::showTrust(getCurrentNeighbour()->text(4).toStdString());
 }
 
 /** Shows Peer Information/Auth Dialog */

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

@@ -58,7 +58,15 @@ void ConfCertDialog::show(const std::string& peer_id)
 	/* set the Id */
 
 	instance()->loadId(peer_id);
-	instance()->show();
+        instance()->show();
+}
+
+void ConfCertDialog::showTrust(const std::string& peer_id)
+{
+        /* set the Id */
+
+        instance()->loadId(peer_id);
+        instance()->showTrust();
 }
 
 
@@ -69,6 +77,18 @@ void
 ConfCertDialog::show()
 {
   //loadSettings();
+  ui.stabWidget->setCurrentIndex(0);
+  if(!this->isVisible()) {
+    QDialog::show();
+
+  }
+}
+
+void
+ConfCertDialog::showTrust()
+{
+  //loadSettings();
+  ui.stabWidget->setCurrentIndex(1);
   if(!this->isVisible()) {
     QDialog::show();
 

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

@@ -33,6 +33,7 @@ class ConfCertDialog : public QDialog
 
 	public:
 	  static void show(const std::string& id) ;
+          static void showTrust(const std::string& id) ;
 
 	  static ConfCertDialog *instance() ;
 signals:
@@ -58,6 +59,7 @@ void setInfo(std::string name,
 private slots:
   /** Overloaded QWidget.show */
   void show();
+  void showTrust();
 
 protected:
   void closeEvent (QCloseEvent * event);

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

@@ -21,7 +21,7 @@
    <item row="0" column="0">
     <widget class="QTabWidget" name="stabWidget">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="icon">