Reworked ConfCertDialog to show more dialogs at once.

Fixed german language.

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

retroshare-gui/src/gui/MessengerWindow.cpp

@@ -1014,7 +1014,7 @@ void MessengerWindow::connectfriend()
 /* GUI stuff -> don't do anything directly with Control */
 void MessengerWindow::configurefriend()
 {
-	ConfCertDialog::show(getPeersRsCertId(getCurrentPeer()));
+    ConfCertDialog::showIt(getPeersRsCertId(getCurrentPeer()), ConfCertDialog::PageDetails);
 }
 
 void MessengerWindow::recommendfriend()

retroshare-gui/src/gui/NetworkDialog.cpp

@@ -283,13 +283,13 @@ void NetworkDialog::deleteCert()
 
 void NetworkDialog::makeFriend()
 {
-    ConfCertDialog::showTrust(getCurrentNeighbour()->text(4).toStdString());
+    ConfCertDialog::showIt(getCurrentNeighbour()->text(4).toStdString(), ConfCertDialog::PageTrust);
 }
 
 /** Shows Peer Information/Auth Dialog */
 void NetworkDialog::peerdetails()
 {
-    ConfCertDialog::show(getCurrentNeighbour()->text(4).toStdString());
+    ConfCertDialog::showIt(getCurrentNeighbour()->text(4).toStdString(), ConfCertDialog::PageDetails);
 }
 
 /** Open a QFileDialog to browse for a pem/pqi file. */

retroshare-gui/src/gui/PeersDialog.cpp

@@ -1260,7 +1260,7 @@ void PeersDialog::connectfriend()
 /* GUI stuff -> don't do anything directly with Control */
 void PeersDialog::configurefriend()
 {
-	ConfCertDialog::show(getPeerRsCertId(getCurrentPeer()));
+    ConfCertDialog::showIt(getPeerRsCertId(getCurrentPeer()), ConfCertDialog::PageDetails);
 }
 
 void PeersDialog::addFriend()

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

@@ -24,6 +24,7 @@
 #include <QDateTime>
 #include <QMenu>
 #include <QClipboard>
+#include <QMap>
 
 #include <iostream>
 
@@ -32,96 +33,90 @@
 
 #include "gui/help/browser/helpbrowser.h"
 #include "gui/common/PeerDefs.h"
+#include "gui/MainWindow.h"
 
-ConfCertDialog *ConfCertDialog::instance()
+static QMap<std::string, ConfCertDialog*> instances;
+
+ConfCertDialog *ConfCertDialog::instance(const std::string& peer_id)
 {
-	static ConfCertDialog *confdialog = new ConfCertDialog ;
+    ConfCertDialog *d = instances[peer_id];
+    if (d) {
+        return d;
+    }
 
-	return confdialog ;
+    d = new ConfCertDialog(peer_id);
+    instances[peer_id] = d;
+
+    return d;
 }
 
 /* Define the format used for displaying the date and time */
 #define DATETIME_FMT  "MMM dd hh:mm:ss"
 
 /** Default constructor */
-ConfCertDialog::ConfCertDialog(QWidget *parent, Qt::WFlags flags)
+ConfCertDialog::ConfCertDialog(const std::string& id, QWidget *parent, Qt::WFlags flags)
-  : QDialog(parent, flags)
+  : QDialog(parent, flags), mId(id)
 {
     /* Invoke Qt Designer generated QObject setup routine */
     ui.setupUi(this);
 
+    setAttribute(Qt::WA_DeleteOnClose, true);
 
     connect(ui.applyButton, SIGNAL(clicked()), this, SLOT(applyDialog()));
-  connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(closeinfodlg()));
+    connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(close()));
     connect(ui.make_friend_button, SIGNAL(clicked()), this, SLOT(makeFriend()));
     connect(ui.denyFriendButton, SIGNAL(clicked()), this, SLOT(denyFriend()));
     connect(ui.signKeyButton, SIGNAL(clicked()), this, SLOT(signGPGKey()));
     connect(ui.trusthelpButton, SIGNAL(clicked()), this, SLOT(showHelpDialog()));
     connect(ui.signers_listWidget, SIGNAL(customContextMenuRequested( QPoint ) ), this, SLOT( listWidgetContextMenuPopup( QPoint ) ) );
 
-  ui.applyButton->setToolTip(tr("Apply and Close"));
+    MainWindow *w = MainWindow::getInstance();
+    if (w) {
+        connect(this, SIGNAL(configChanged()), w->getPage(MainWindow::Network), SLOT(insertConnect()));
+    }
 }
 
-void ConfCertDialog::show(const std::string& peer_id)
+ConfCertDialog::~ConfCertDialog()
 {
-	/* set the Id */
+    QMap<std::string, ConfCertDialog*>::iterator it = instances.find(mId);
-
+    if (it != instances.end()) {
-	instance()->loadId(peer_id);
+        instances.erase(it);
-        instance()->show();
+    }
 }
 
-void ConfCertDialog::showTrust(const std::string& peer_id)
+void ConfCertDialog::showIt(const std::string& peer_id, enumPage page)
 {
-        /* set the Id */
+    ConfCertDialog *confdialog = instance(peer_id);
 
-        instance()->loadId(peer_id);
+    switch (page) {
-        instance()->showTrust();
+    case PageDetails:
+        confdialog->ui.stabWidget->setCurrentIndex(0);
+        break;
+    case PageTrust:
+        confdialog->ui.stabWidget->setCurrentIndex(1);
+        break;
+    case PageCertificate:
+        confdialog->ui.stabWidget->setCurrentIndex(2);
+        break;
     }
 
+    confdialog->load();
+    confdialog->show();
+    confdialog->raise();
+    confdialog->activateWindow();
 
-/**
+    /* window will destroy itself! */
- Overloads the default show() slot so we can set opacity*/
+}
 
-void
+void ConfCertDialog::loadAll()
-ConfCertDialog::show()
 {
-  //loadSettings();
+    QMap<std::string, ConfCertDialog*>::iterator it;
-  ui.stabWidget->setCurrentIndex(0);
+    for (it = instances.begin(); it != instances.end(); it++) {
-  if(!this->isVisible()) {
+        it.value()->load();
-    QDialog::show();
-
     }
 }
 
-void
+void ConfCertDialog::load()
-ConfCertDialog::showTrust()
-{
-  //loadSettings();
-  ui.stabWidget->setCurrentIndex(1);
-  if(!this->isVisible()) {
-    QDialog::show();
-
-  }
-}
-
-void ConfCertDialog::closeEvent (QCloseEvent * event)
-{
- QWidget::closeEvent(event);
-}
-
-void ConfCertDialog::closeinfodlg()
-{
-	close();
-}
-
-void ConfCertDialog::loadId(std::string id)
-{
-	mId = id;
-	loadDialog();
-}
-
-
-void ConfCertDialog::loadDialog()
 {
     RsPeerDetails detail;
     if (!rsPeers->getPeerDetails(mId, detail))
@@ -129,7 +124,8 @@ void ConfCertDialog::loadDialog()
         QMessageBox::information(this,
                                  tr("RetroShare"),
                                  tr("Error : cannot get peer details."));
-            closeinfodlg();
+        close();
+        return;
     }
 
     ui.name->setText(QString::fromStdString(detail.name));
@@ -204,11 +200,6 @@ void ConfCertDialog::loadDialog()
         ui.signersBox->setTitle(tr("Your key is signed by : "));
 
     } else {
-            ui.make_friend_button->show();
-            ui.signGPGKeyCheckBox->show();
-            ui.signKeyButton->show();
-            ui.denyFriendButton->show();
-
         ui.web_of_trust_label->show();
         ui.radioButton_trust_fully->show();
         ui.radioButton_trust_marginnaly->show();
@@ -223,10 +214,8 @@ void ConfCertDialog::loadDialog()
             ui.signGPGKeyCheckBox->hide();
             //connection already accepted, propose to sign gpg key
             if (!detail.ownsign) {
-                    ui.signGPGKeyCheckBox->hide();
                 ui.signKeyButton->show();
             } else {
-                    ui.signGPGKeyCheckBox->hide();
                 ui.signKeyButton->hide();
             }
         } else {
@@ -330,7 +319,8 @@ void ConfCertDialog::applyDialog()
             QMessageBox::information(this,
                                      tr("RetroShare"),
                                      tr("Error : cannot get peer details."));
-                closeinfodlg();
+            close();
+            return;
         }
     }
 
@@ -374,10 +364,12 @@ void ConfCertDialog::applyDialog()
             emit configChanged();
     }
 
-        closeinfodlg();
+    loadAll();
+    close();
 }
 
-void ConfCertDialog::makeFriend() {
+void ConfCertDialog::makeFriend()
+{
     std::string gpg_id = rsPeers->getGPGId(mId);
     if (ui.signGPGKeyCheckBox->isChecked()) {
         rsPeers->signGPGCertificate(gpg_id);
@@ -385,16 +377,22 @@ void ConfCertDialog::makeFriend() {
         rsPeers->setAcceptToConnectGPGCertificate(gpg_id, true);
     }
     rsPeers->addFriend(mId, gpg_id);
-    loadDialog();
+    loadAll();
+
+    emit configChanged();
 }
 
-void ConfCertDialog::denyFriend() {
+void ConfCertDialog::denyFriend()
+{
     std::string gpg_id = rsPeers->getGPGId(mId);
     rsPeers->setAcceptToConnectGPGCertificate(gpg_id, false);
-    loadDialog();
+    loadAll();
+
+    emit configChanged();
 }
 
-void ConfCertDialog::signGPGKey() {
+void ConfCertDialog::signGPGKey()
+{
     std::string gpg_id = rsPeers->getGPGId(mId);
     if (!rsPeers->signGPGCertificate(gpg_id)) {
                  QMessageBox::warning ( NULL,
@@ -402,14 +400,16 @@ void ConfCertDialog::signGPGKey() {
                                 tr("Maybe password is wrong"),
                                 QMessageBox::Ok);
     }
-    loadDialog();
+    loadAll();
+
+    emit configChanged();
 }
 
 /** Displays the help browser and displays the most recently viewed help
  * topic. */
 void ConfCertDialog::showHelpDialog()
 {
-    showHelpDialog(QString("trust"));
+    showHelpDialog("trust");
 }
 
 /**< Shows the help browser and displays the given help <b>topic</b>. */
@@ -428,11 +428,8 @@ void ConfCertDialog::listWidgetContextMenuPopup( const QPoint &pos)
         return; 
 
     QMenu menu(this);
-    QAction *copyPeer = new QAction(tr("Copy Peer"), this );
+    menu.addAction(tr("Copy Peer"), this, SLOT(copyToClipboard()));
-    connect( copyPeer , SIGNAL( triggered() ), this, SLOT( copyToClipboard() ) );
-    menu.addAction(copyPeer );
     menu.exec(QCursor::pos());
- 
 }
 
 void ConfCertDialog::copyToClipboard( )

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

@@ -32,42 +32,27 @@ class ConfCertDialog : public QDialog
     Q_OBJECT
 
 public:
-        static void show(const std::string& id) ;
+    enum enumPage { PageDetails, PageTrust, PageCertificate };
-        static void showTrust(const std::string& id) ;
+
+    static void showIt(const std::string& id, enumPage page);
 
-	  static ConfCertDialog *instance() ;
 signals:
     void configChanged();
+
 private:
-
     /** Default constructor */
-  ConfCertDialog(QWidget *parent = 0, Qt::WFlags flags = 0);
+    ConfCertDialog(const std::string& id, QWidget *parent = 0, Qt::WFlags flags = 0);
     /** Default destructor */
+    ~ConfCertDialog();
 
+    static ConfCertDialog *instance(const std::string& peer_id);
 
-    void loadId(std::string id);
+    static void loadAll();
-
+    void load();
-#if 0
-    void setInfo(std::string name, 
-		std::string trust, 
-		std::string org,
-		std::string loc,
-		std::string country,
-		std::string signers);
-#endif
-
-protected:
-    void closeEvent (QCloseEvent * event);
 
 private slots:
-
-    /** Overloaded QWidget.show */
-    void show();
-    void showTrust();    
-
     void listWidgetContextMenuPopup(const QPoint &pos);
 
-	void closeinfodlg();
     void applyDialog();
     void makeFriend();
     void denyFriend();
@@ -80,16 +65,10 @@ private slots:
     void copyToClipboard();
 
 private:
- 
-    void loadDialog();
-
     std::string mId;
-    bool isPGPId;
     
     /** Qt Designer generated object */
     Ui::ConfCertDialog ui;
-
 };
 
 #endif
-

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>2</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="icon">
@@ -494,7 +494,7 @@
          <item>
           <widget class="QToolButton" name="signKeyButton">
            <property name="text">
-            <string>SignGPG Key</string>
+            <string>Sign GPG key</string>
            </property>
            <property name="icon">
             <iconset resource="../images.qrc">
@@ -581,6 +581,10 @@
       </layout>
      </widget>
      <widget class="QWidget" name="tab_3">
+      <attribute name="icon">
+       <iconset resource="../images.qrc">
+        <normaloff>:/images/view-certificate-sign-32.png</normaloff>:/images/view-certificate-sign-32.png</iconset>
+      </attribute>
       <attribute name="title">
        <string>Certificate</string>
       </attribute>
@@ -609,6 +613,9 @@
      </item>
      <item row="0" column="2">
       <widget class="QPushButton" name="applyButton">
+       <property name="toolTip">
+        <string>Apply and Close</string>
+       </property>
        <property name="text">
         <string>OK</string>
        </property>

retroshare-gui/src/lang/retroshare_de.ts

@@ -1396,7 +1396,7 @@ Verfügbar: %3</translation>
 <context>
     <name>ConfCertDialog</name>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.ui" line="+626"/>
+        <location filename="../gui/connect/ConfCertDialog.ui" line="+629"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
@@ -1406,9 +1406,9 @@ Verfügbar: %3</translation>
         <translation>OK</translation>
     </message>
     <message>
-        <location line="-575"/>
+        <location line="-578"/>
         <source>Peer Info</source>
-        <translation>Peer Info</translation>
+        <translation>Nachbar Info</translation>
     </message>
     <message>
         <location line="-6"/>
@@ -1428,7 +1428,7 @@ Verfügbar: %3</translation>
     <message>
         <location line="+73"/>
         <source>Peer Address</source>
-        <translation>Adresse des Peers</translation>
+        <translation>Adresse des Nachbarn</translation>
     </message>
     <message>
         <location line="+399"/>
@@ -1442,13 +1442,14 @@ Verfügbar: %3</translation>
     </message>
     <message>
         <location line="-73"/>
+        <location line="+20"/>
         <source>Sign GPG key</source>
         <translation>Unterzeichne GPG Schlüssel</translation>
     </message>
     <message>
-        <location line="-158"/>
+        <location line="-178"/>
         <source>Your trust in this peer is:</source>
-        <translation>Ihr Vertrauen zu diesem Peer ist:</translation>
+        <translation>Ihr Vertrauen zu diesem Nachbar ist:</translation>
     </message>
     <message>
         <location line="+89"/>
@@ -1458,20 +1459,15 @@ Verfügbar: %3</translation>
     <message>
         <location line="+18"/>
         <source>Peer has signed my GPG key</source>
-        <translation>Peer hat meinen GPG Schlüssel unterzeichnet</translation>
+        <translation>Nachbar hat meinen GPG Schlüssel unterzeichnet</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Peer key is signed by :</source>
-        <translation>Peer Schlüssel ist unterzeichnet von:</translation>
+        <translation>Nachbar Schlüssel ist unterzeichnet von:</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="-381"/>
-        <source>SignGPG Key</source>
-        <translation>Unterzeichne GPG Key</translation>
-    </message>
-    <message>
-        <location line="-425"/>
         <source>Last Contact</source>
         <translation>Letzter Kontakt</translation>
     </message>
@@ -1514,7 +1510,7 @@ Verfügbar: %3</translation>
     <message>
         <location line="+75"/>
         <source>None </source>
-        <translation>Keine </translation>
+        <translation>Nicht </translation>
     </message>
     <message>
         <location line="+23"/>
@@ -1527,12 +1523,12 @@ Verfügbar: %3</translation>
         <translation>Voll </translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="+62"/>
+        <location line="+230"/>
         <source>Apply and Close</source>
         <translation>Übernehmen und Schliessen</translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="+125"/>
         <location line="+201"/>
         <source>RetroShare</source>
         <translation></translation>
@@ -1541,57 +1537,57 @@ Verfügbar: %3</translation>
         <location line="-200"/>
         <location line="+201"/>
         <source>Error : cannot get peer details.</source>
-        <translation>Fehler:  Kann Peer Details nicht bekommen.</translation>
+        <translation>Fehler:  Kann Peer Details nicht ermitteln.</translation>
     </message>
     <message>
-        <location line="-128"/>
+        <location line="-127"/>
         <source>Your key is signed by : </source>
         <translation>Ihr Schlüssel ist unterzeichnet von: </translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Peer key is signed by : </source>
-        <translation>Peer Schlüssel ist unterzeichnet von: </translation>
+        <translation>Nachbar Schlüssel ist unterzeichnet von: </translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+28"/>
         <source>Your trust in this peer is ultimate, it&apos;s probably a key you own.</source>
-        <translation>Sie haben das höchste Vertrauen in diesen Peer. Es ist wahrscheinlich ein Schlüssel von Ihnen.</translation>
+        <translation>Sie haben das höchste Vertrauen in diesen Nachbarn. Es ist wahrscheinlich ein Schlüssel von Ihnen.</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Your trust in this peer is full.</source>
-        <translation>Sie vertrauen diesem Peer voll.</translation>
+        <translation>Sie vertrauen diesem Nachbarn voll.</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Your trust in this peer is marginal.</source>
-        <translation>Sie vertrauen diesem Peer geringfügig.</translation>
+        <translation>Sie vertrauen diesem Nachbarn geringfügig.</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Your trust in this peer is none.</source>
-        <translation>Sie vertrauen diesem Peer nicht.</translation>
+        <translation>Sie vertrauen diesem Nachbarn nicht.</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Your trust in this peer is not set.</source>
-        <translation>Ihr Vertrauen in diesen Peer ist nicht festgelegt.</translation>
+        <translation>Ihr Vertrauen in diesen Nachbarn ist nicht festgelegt.</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Peer has authenticated me as a friend and did sign my GPG key</source>
-        <translation>Peer hat mich als Freund authentifiziert
+        <translation>Nachbar hat mich als Freund authentifiziert
 und meinen GPG Schlüssel unterzeichnet</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Peer has not authenticated me as a friend and did not sign my GPG key</source>
-        <translation>Peer hat mich nicht als Freund authentifiziert
+        <translation>Nachbar hat mich nicht als Freund authentifiziert
 und meinen GPG Schlüssel nicht unterzeichnet</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+112"/>
         <source>Signature Failure</source>
         <translation>Signatur Fehler</translation>
     </message>
@@ -1601,7 +1597,7 @@ und meinen GPG Schlüssel nicht unterzeichnet</translation>
         <translation>Vielleicht ist das Passwort falsch</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.ui" line="-70"/>
+        <location filename="../gui/connect/ConfCertDialog.ui" line="-300"/>
         <source>Trust </source>
         <translation>Vertrauen </translation>
     </message>
@@ -1621,9 +1617,9 @@ und meinen GPG Schlüssel nicht unterzeichnet</translation>
         <translation></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="+29"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="+31"/>
         <source>Copy Peer</source>
-        <translation>Kopiere Peer</translation>
+        <translation>Kopiere Nachbar</translation>
     </message>
     <message>
         <location filename="../gui/connect/ConfCertDialog.ui" line="+471"/>
@@ -5170,7 +5166,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+513"/>
         <source>Do you really want to exit RetroShare ?</source>
-        <translation>Wollen Sie RetroShare wirklich beenden?</translation>
+        <translation>Wollst Du RetroShare wirklich beenden?</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -6564,7 +6560,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+5"/>
         <source>Peer details...</source>
-        <translation>Peer-Dateils...</translation>
+        <translation>Nachbar-Details...</translation>
     </message>
     <message>
         <location line="+187"/>

retroshare-gui/src/main.cpp

@@ -226,7 +226,6 @@ int main(int argc, char *argv[])
 	QObject::connect(notify,SIGNAL(logInfoChanged(const QString&)),w->networkDialog,SLOT(setLogInfo(QString))) ;
 	QObject::connect(notify,SIGNAL(errorOccurred(int,int,const QString&)),w,SLOT(displayErrorMessage(int,int,const QString&))) ;
 
-	QObject::connect(ConfCertDialog::instance(),SIGNAL(configChanged()),w->networkDialog,SLOT(insertConnect())) ;
 	QObject::connect(w->peersDialog,SIGNAL(friendsUpdated()),w->networkDialog,SLOT(insertConnect())) ;
 
 	w->installGroupChatNotifier();