merged peer detail dialogs from network and friends tab

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

retroshare-gui/src/gui/NetworkDialog.cpp

@@ -43,6 +43,8 @@
 #include <QPixmap>
 #include <QHeaderView>
 
+#include "connect/ConfCertDialog.h"
+
 /* Images for context menu icons */
 #define IMAGE_LOADCERT       ":/images/loadcert16.png"
 #define IMAGE_PEERDETAILS    ":/images/peerdetails_16x16.png"
@@ -247,11 +249,12 @@ void NetworkDialog::makeFriend()
 /** Shows Peer Information/Auth Dialog */
 void NetworkDialog::peerdetails()
 {
+#if 0
 #ifdef NET_DEBUG 
     std::cerr << "ConnectionsDialog::peerdetails()" << std::endl;
 #endif
 
-    QTreeWidgetItem *wi = getCurrentNeighbour();
+    QTreeWidgetItem *wi = 
     if (!wi)
     	return;
 
@@ -260,6 +263,8 @@ void NetworkDialog::peerdetails()
     out << id;
 
     showpeerdetails(out.str());
+#endif
+	 ConfCertDialog::show(getCurrentNeighbour()->text(9).toStdString());
 }
 
 /** Shows Peer Information/Auth Dialog */

retroshare-gui/src/gui/PeersDialog.cpp

@@ -637,24 +637,7 @@ void PeersDialog::trustfriend()
 /* GUI stuff -> don't do anything directly with Control */
 void PeersDialog::configurefriend()
 {
-	/* display Dialog */
+	ConfCertDialog::show(getPeerRsCertId(getCurrentPeer()));
-#ifdef PEERS_DEBUG 
-	std::cerr << "PeersDialog::configurefriend()" << std::endl;
-#endif
-	QTreeWidgetItem *c = getCurrentPeer();
-
-
-	static ConfCertDialog *confdialog = new ConfCertDialog();
-
-
-	if (!c)
-		return;
-
-	/* set the Id */
-	std::string id = getPeerRsCertId(c);
-
-	confdialog -> loadId(id);
-	confdialog -> show();
 }
 
 void PeersDialog::updatePeerStatusString(const QString& peer_id,const QString& status_string)

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

@@ -25,6 +25,12 @@
 
 #include <QTime>
 
+ConfCertDialog *ConfCertDialog::instance()
+{
+	static ConfCertDialog *confdialog = new ConfCertDialog ;
+
+	return confdialog ;
+}
 
 /* Define the format used for displaying the date and time */
 #define DATETIME_FMT  "MMM dd hh:mm:ss"
@@ -39,11 +45,19 @@ ConfCertDialog::ConfCertDialog(QWidget *parent, Qt::WFlags flags)
 
   connect(ui.applyButton, SIGNAL(clicked()), this, SLOT(applyDialog()));
   connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(closeinfodlg()));
+  connect(ui._makeFriendPB, SIGNAL(clicked()), this, SLOT(makeFriend()));
 
  
   //setFixedSize(QSize(434, 462));
 }
 
+void ConfCertDialog::show(const std::string& peer_id)
+{
+	/* set the Id */
+
+	instance()->loadId(peer_id);
+	instance()->show();
+}
 
 
 /** 
@@ -103,7 +117,7 @@ void ConfCertDialog::loadDialog()
 	ui.extPort -> setValue(detail.extPort);
 
 	/* set the url for DNS access (OLD) */
-	ui.extName->setText(QString::fromStdString(""));
+	//ui.extName->setText(QString::fromStdString(""));
 
 	/**** TODO ****/
 	//ui.chkFirewall  ->setChecked(ni->firewalled);
@@ -113,44 +127,29 @@ void ConfCertDialog::loadDialog()
 	
 	//ui.indivRate->setValue(0);
 
-	ui.trustLvl->setText(QString::fromStdString(RsPeerTrustString(detail.trustLvl)));
+	//ui.trustLvl->setText(QString::fromStdString(RsPeerTrustString(detail.trustLvl)));
 
-	if(rsPeers->isOnline(detail.id) || rsPeers->isTrustingMe(detail.id))
+	ui._peerTrustsMeCB->setChecked(rsPeers->isOnline(detail.id) || rsPeers->isTrustingMe(detail.id)) ;
-		ui._isTrustingMeTF->setText("Yes");
+	ui._peerTrustsMeCB->setEnabled(false);
-	else
+	ui.signBox->setChecked(detail.ownsign) ;
-		ui._isTrustingMeTF->setText("No");
+	ui.signBox->setEnabled(!detail.ownsign) ;
 
-	if (detail.ownsign)
+	ui._peerAcceptedCB->setChecked(detail.state & RS_PEER_STATE_FRIEND) ;
-	{
+	ui._peerAcceptedCB->setEnabled(detail.ownsign) ;
-		ui.signBox -> setCheckState(Qt::Checked);
-		ui.signBox -> setEnabled(false);
-		if (detail.trusted)
-		{
-			ui.trustBox -> setCheckState(Qt::Checked);
-		}
-		else
-		{
-			ui.trustBox -> setCheckState(Qt::Unchecked);
-		}
-		ui.trustBox -> setCheckable(true);
-	}
-	else
-	{
-		ui.signBox -> setCheckState(Qt::Unchecked);
-		ui.signBox -> setEnabled(true);
-
-		ui.trustBox -> setCheckState(Qt::Unchecked);
-		ui.trustBox -> setEnabled(false);
-	}
 
+	ui.signers->clear() ;
+	for(std::list<std::string>::const_iterator it(detail.signers.begin());it!=detail.signers.end();++it)
+		ui.signers->append(QString::fromStdString(*it)) ;
 }
 
 
 void ConfCertDialog::applyDialog()
 {
+	std::cerr << "In apply dialog" << std::endl ;
 	RsPeerDetails detail;
 	if (!rsPeers->getPeerDetails(mId, detail))
 	{
+		std::cerr << "Could not get details from " << mId << std::endl ;
 		/* fail */
 		return;
 	}
@@ -163,57 +162,26 @@ void ConfCertDialog::applyDialog()
 	bool trustChanged = false;
 
 	/* set local address */
-	if ((detail.localAddr != ui.localAddress->text().toStdString())
+	if ((detail.localAddr != ui.localAddress->text().toStdString()) || (detail.localPort != ui.localPort -> value()))
-		|| (detail.localPort != ui.localPort -> value()))
-	{
-		/* changed ... set it */
 		localChanged = true;
-	}
 
-	if ((detail.extAddr != ui.extAddress->text().toStdString())
+	if ((detail.extAddr != ui.extAddress->text().toStdString()) || (detail.extPort != ui.extPort -> value()))
-		|| (detail.extPort != ui.extPort -> value()))
-	{
-		/* changed ... set it */
 		extChanged = true;
-	}
-
-#if 0
-	if ((detail.firewalled != ui.chkFirewall  ->isChecked()) ||
-		(detail.forwardPort != ui.chkForwarded ->isChecked()))
-	{
-		/* changed ... set it */
-		fwChanged = true;
-	}
-	
-	if (ni -> maxRate != ui.indivRate->value())
-	{
-		/* nada */
-	}
-#endif
 
 	if (detail.ownsign)
 	{
-		if (detail.trusted != ui.trustBox->isChecked())
+		if (ui._peerAcceptedCB->isChecked() != ((detail.state & RS_PEER_STATE_FRIEND) > 0)) 
-		{
 			trustChanged = true;
 	}
-	}
+	else if (ui.signBox->isChecked())
-	else
-	{
-		if (ui.signBox->isChecked())
-		{
 		signChanged = true;
-		}
-	}
 
 	/* now we can action the changes */
 	if (localChanged)
-		rsPeers->setLocalAddress(mId, 
+		rsPeers->setLocalAddress(mId, ui.localAddress->text().toStdString(), ui.localPort->value());
-			ui.localAddress->text().toStdString(), ui.localPort->value());
 
 	if (extChanged)
-		rsPeers->setExtAddress(mId, 
+		rsPeers->setExtAddress(mId,ui.extAddress->text().toStdString(), ui.extPort->value());
-			ui.extAddress->text().toStdString(), ui.extPort->value());
 
 #if 0
 	if (fwChanged)
@@ -221,20 +189,41 @@ void ConfCertDialog::applyDialog()
 						ui.chkForwarded->isChecked());
 #endif
 
-	if (trustChanged)
-		rsPeers->TrustCertificate(mId, ui.trustBox->isChecked());
-
 	if (signChanged)
+	{
+		std::cerr << "Signature changed. Signing certificate" << mId << std::endl ;
 		rsPeers->SignCertificate(mId);
+	}
+
+	if (trustChanged)
+	{
+		std::cerr << "Acceptance changed. Authing ceAuthrtificate" << mId << std::endl ;
+		if(ui._peerAcceptedCB->isChecked())
+			rsPeers->AuthCertificate(mId, "");
+		else
+			rsPeers->removeFriend(mId);
+	}
 
 	/* reload now */
 	loadDialog();
 	
 	/* close the Dialog after the Changes applied */
 	closeinfodlg();
+
+	if(trustChanged || signChanged)
+		emit configChanged() ;
 }
 
+void ConfCertDialog::makeFriend()
+{
+	ui.signBox->setChecked(true) ;
+	ui._peerAcceptedCB->setChecked(true) ;
 
+//	rsPeers->TrustCertificate(mId, ui.trustBox->isChecked());
+//	rsPeers->SignCertificate(mId);
+}
+
+#if 0
 void ConfCertDialog::setInfo(std::string name, 
 				std::string trust,
 				std::string org,
@@ -249,5 +238,6 @@ void ConfCertDialog::setInfo(std::string name,
 	//ui.country->setText(QString::fromStdString(country));
 	//ui.signers->setText(QString::fromStdString(signers));
 }
+#endif
 
 		     

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

@@ -32,6 +32,13 @@ class ConfCertDialog : public QDialog
   Q_OBJECT
 
 	public:
+	  static void show(const std::string& id) ;
+
+	  static ConfCertDialog *instance() ;
+signals:
+	  void configChanged() ;
+private:
+
   /** Default constructor */
   ConfCertDialog(QWidget *parent = 0, Qt::WFlags flags = 0);
   /** Default destructor */
@@ -39,14 +46,16 @@ public:
 
 void 	loadId(std::string id);
 
+#if 0
 void setInfo(std::string name, 
 		std::string trust, 
 		std::string org,
 		std::string loc,
 		std::string country,
 		std::string signers);
+#endif
 
-public slots:
+private slots:
   /** Overloaded QWidget.show */
   void show();
 
@@ -57,6 +66,7 @@ private slots:
 
 	void closeinfodlg();
 	void applyDialog();
+	void makeFriend();
   
 private:
 
@@ -68,6 +78,7 @@ void 	loadDialog();
 std::string mId;
   /** Qt Designer generated object */
   Ui::ConfCertDialog ui;
+
 };
 
 #endif

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

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ConfCertDialog</class>
  <widget class="QDialog" name="ConfCertDialog">
@@ -5,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>491</width>
+    <width>598</width>
-    <height>427</height>
+    <height>428</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -505,28 +506,20 @@
    <iconset resource="../images.qrc">
     <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
   </property>
-  <layout class="QGridLayout" >
+  <layout class="QVBoxLayout" name="verticalLayout_8">
-   <item row="0" column="0" >
+   <item>
     <widget class="QTabWidget" name="stabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="tab">
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>469</width>
-        <height>335</height>
-       </rect>
-      </property>
-      <attribute name="title" >
-       <string>Details</string>
-      </attribute>
       <attribute name="icon">
        <iconset resource="../images.qrc">
         <normaloff>:/images/peerdetails_16x16.png</normaloff>:/images/peerdetails_16x16.png</iconset>
       </attribute>
+      <attribute name="title">
+       <string>Details</string>
+      </attribute>
       <layout class="QGridLayout">
        <item row="0" column="0">
         <widget class="QGroupBox" name="groupBox_2">
@@ -612,31 +605,64 @@
          <property name="title">
           <string>Peer Address</string>
          </property>
-         <layout class="QGridLayout" >
+         <layout class="QVBoxLayout" name="verticalLayout_7">
-          <item row="0" column="0" >
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout">
+            <item>
+             <layout class="QVBoxLayout" name="verticalLayout_6">
+              <item>
                <widget class="QLabel" name="label">
+                <property name="layoutDirection">
+                 <enum>Qt::LeftToRight</enum>
+                </property>
                 <property name="text">
                  <string>Local Address:</string>
                 </property>
+                <property name="alignment">
+                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                </property>
                </widget>
               </item>
-          <item rowspan="3" row="0" column="1" >
-           <layout class="QVBoxLayout" >
-            <property name="spacing" >
-             <number>6</number>
-            </property>
-            <property name="margin" >
-             <number>0</number>
-            </property>
               <item>
-             <layout class="QGridLayout" >
+               <widget class="QLabel" name="label_2">
-              <property name="margin" >
+                <property name="text">
-               <number>0</number>
+                 <string>External Address:</string>
                 </property>
-              <property name="spacing" >
+               </widget>
-               <number>6</number>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QVBoxLayout" name="verticalLayout_5">
+              <item>
+               <widget class="QLineEdit" name="localAddress"/>
+              </item>
+              <item>
+               <widget class="QLineEdit" name="extAddress"/>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QVBoxLayout" name="verticalLayout_4">
+              <item>
+               <widget class="QLabel" name="label_5">
+                <property name="text">
+                 <string>Port:</string>
                 </property>
-              <item row="0" column="2" >
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="label_4">
+                <property name="text">
+                 <string>Port:</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QVBoxLayout" name="verticalLayout_3">
+              <item>
                <widget class="QSpinBox" name="localPort">
                 <property name="minimum">
                  <number>0</number>
@@ -649,30 +675,7 @@
                 </property>
                </widget>
               </item>
-              <item row="0" column="1" >
-               <widget class="QLabel" name="label_5" >
-                <property name="text" >
-                 <string>Port:</string>
-                </property>
-               </widget>
-              </item>
-              <item row="0" column="0" >
-               <widget class="QLineEdit" name="localAddress" />
-              </item>
-             </layout>
-            </item>
               <item>
-             <layout class="QGridLayout" >
-              <property name="margin" >
-               <number>0</number>
-              </property>
-              <property name="spacing" >
-               <number>6</number>
-              </property>
-              <item row="0" column="0" >
-               <widget class="QLineEdit" name="extAddress" />
-              </item>
-              <item row="0" column="2" >
                <widget class="QSpinBox" name="extPort">
                 <property name="minimum">
                  <number>0</number>
@@ -685,37 +688,22 @@
                 </property>
                </widget>
               </item>
-              <item row="0" column="1" >
+             </layout>
-               <widget class="QLabel" name="label_4" >
-                <property name="text" >
-                 <string>Port:</string>
-                </property>
-               </widget>
             </item>
            </layout>
           </item>
           <item>
-             <widget class="QLineEdit" name="extName" >
+           <spacer name="verticalSpacer">
-              <property name="enabled" >
+            <property name="orientation">
-               <bool>false</bool>
+             <enum>Qt::Vertical</enum>
             </property>
-             </widget>
+            <property name="sizeHint" stdset="0">
-            </item>
+             <size>
-           </layout>
+              <width>20</width>
-          </item>
+              <height>47</height>
-          <item row="1" column="0" >
+             </size>
-           <widget class="QLabel" name="label_2" >
-            <property name="text" >
-             <string>External Address:</string>
             </property>
-           </widget>
+           </spacer>
-          </item>
-          <item row="2" column="0" >
-           <widget class="QLabel" name="label_3" >
-            <property name="text" >
-             <string>External Name</string>
-            </property>
-           </widget>
           </item>
          </layout>
         </widget>
@@ -723,14 +711,6 @@
       </layout>
      </widget>
      <widget class="QWidget" name="tab">
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>469</width>
-        <height>335</height>
-       </rect>
-      </property>
       <attribute name="title">
        <string>Trust Settings</string>
       </attribute>
@@ -740,56 +720,56 @@
          <property name="title">
           <string>Trust Settings</string>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout" >
+         <layout class="QVBoxLayout" name="verticalLayout_9">
-          <item>
-           <layout class="QGridLayout" name="gridLayout" >
-            <item row="0" column="0" >
-             <widget class="QLabel" name="label_9" >
-              <property name="text" >
-               <string>Trust Level</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1" >
-             <widget class="QLineEdit" name="trustLvl" >
-              <property name="readOnly" >
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0" >
-             <widget class="QLabel" name="label_12" >
-              <property name="text" >
-               <string>Trusting me</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1" >
-             <widget class="QLineEdit" name="_isTrustingMeTF" >
-              <property name="readOnly" >
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
           <item>
            <widget class="QCheckBox" name="signBox">
+            <property name="toolTip">
+             <string comment="Once signed, you cannot unsign a certificate, only deny connexions." extracomment="Once signed, you cannot unsign a certificate, only deny connexions."/>
+            </property>
             <property name="text">
-             <string>Sign The Certificate</string>
+             <string>Sign this certificate</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="trustBox" >
+           <widget class="QCheckBox" name="_peerAcceptedCB">
             <property name="text">
-             <string>Trust Their Signature</string>
+             <string>Accept connexions from this peer</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="_peerTrustsMeCB">
+            <property name="toolTip">
+             <string extracomment="This info is obtained through your other friends, so it is only reliable when checked."/>
+            </property>
+            <property name="text">
+             <string>Peer has signed my certficate</string>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_4">
+         <property name="title">
+          <string>Certificate signers</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <item>
+           <widget class="QTextBrowser" name="signers"/>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="_makeFriendPB">
+         <property name="text">
+          <string>Make friend (Sign certificate and accept)</string>
+         </property>
+        </widget>
+       </item>
        <item>
         <spacer>
          <property name="orientation">
@@ -807,7 +787,7 @@
      </widget>
     </widget>
    </item>
-   <item row="1" column="0" >
+   <item>
     <layout class="QGridLayout">
      <item row="0" column="0">
       <spacer>
@@ -832,7 +812,7 @@
      <item row="0" column="2">
       <widget class="QPushButton" name="applyButton">
        <property name="text">
-        <string>OK</string>
+        <string>Apply and close</string>
        </property>
        <property name="autoDefault">
         <bool>false</bool>
@@ -854,7 +834,6 @@
   <tabstop>localPort</tabstop>
   <tabstop>extAddress</tabstop>
   <tabstop>extPort</tabstop>
-  <tabstop>extName</tabstop>
   <tabstop>cancelButton</tabstop>
   <tabstop>applyButton</tabstop>
  </tabstops>

retroshare-gui/src/main.cpp

@@ -26,6 +26,7 @@
 #include <gui/StartDialog.h>
 #include <gui/GenCertDialog.h>
 #include <gui/Preferences/rsharesettings.h>
+#include <gui/connect/ConfCertDialog.h>
 
 /*** WINDOWS DON'T LIKE THIS - REDEFINES VER numbers.
 #include <gui/qskinobject/qskinobject.h>
@@ -172,6 +173,8 @@ int main(int argc, char *argv[])
 	QObject::connect(notify,SIGNAL(chatStatusChanged(const QString&,const QString&)),w->peersDialog,SLOT(updatePeerStatusString(const QString&,const QString&)));
 	QObject::connect(notify,SIGNAL(logInfoChanged(const QString&)),w->networkDialog,SLOT(setLogInfo(QString))) ;
 
+	QObject::connect(ConfCertDialog::instance(),SIGNAL(configChanged()),w->networkDialog,SLOT(insertConnect())) ;
+
 	/* only show window, if not startMinimized */
 	if (!startMinimised)
 	{