Added Trust settings and Signing informations to HelpBrowser

Added Trust info Button to call HelpBrowser for Trust Settings and Signing informations.
Clean up Peer Details Trust TabWidget, removed not needed Labels.

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

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

@@ -50,6 +50,7 @@ ConfCertDialog::ConfCertDialog(QWidget *parent, Qt::WFlags flags)
   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()));
 
 
   ui.applyButton->setToolTip(tr("Apply and Close"));
@@ -176,8 +177,6 @@ void ConfCertDialog::loadDialog()
         }
 
         if (detail.gpg_id == rsPeers->getGPGOwnId()) {
-            ui.gpgSignInfoBrowser->hide();
-            ui.gpgTrustInfoBrowser->hide();
             ui.make_friend_button->hide();
             ui.signGPGKeyCheckBox->hide();
             ui.signKeyButton->hide();
@@ -192,8 +191,6 @@ void ConfCertDialog::loadDialog()
             ui.signersBox->setTitle(tr("Your key is signed by : "));
 
         } else {
-            ui.gpgSignInfoBrowser->show();
-            ui.gpgTrustInfoBrowser->show();
             ui.make_friend_button->show();
             ui.signGPGKeyCheckBox->show();
             ui.signKeyButton->show();
@@ -384,3 +381,19 @@ void ConfCertDialog::signGPGKey() {
     loadDialog();
 }
 
+/** Displays the help browser and displays the most recently viewed help
+ * topic. */
+void ConfCertDialog::showHelpDialog()
+{
+  showHelpDialog(QString("trust"));
+}
+
+/**< Shows the help browser and displays the given help <b>topic</b>. */
+void ConfCertDialog::showHelpDialog(const QString &topic)
+{
+  static HelpBrowser *helpBrowser = 0;
+  if (!helpBrowser)
+    helpBrowser = new HelpBrowser(this);
+  helpBrowser->showWindow(topic);
+}
+

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

@@ -24,6 +24,8 @@
 #define _CONFCERTDIALOG_H
 
 #include <QDialog>
+#include "gui/help/browser/HelpBrowser.h"
+
 
 #include "ui_ConfCertDialog.h"
 
@@ -72,6 +74,10 @@ private slots:
 	void denyFriend();
 	void signGPGKey();
 
+	void showHelpDialog();
+	/** Called when a child window requests the given help <b>topic</b>. */
+	void showHelpDialog(const QString &topic);
+
 private:
 
   /** Loads the saved connectidialog settings */

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

@@ -6,15 +6,15 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>505</width>
+    <width>489</width>
-    <height>613</height>
+    <height>485</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Peer Details</string>
   </property>
   <property name="windowIcon">
-   <iconset>
+   <iconset resource="../images.qrc">
     <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -25,7 +25,7 @@
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="icon">
-       <iconset>
+       <iconset resource="../images.qrc">
         <normaloff>:/images/peerdetails_16x16.png</normaloff>:/images/peerdetails_16x16.png</iconset>
       </attribute>
       <attribute name="title">
@@ -285,15 +285,13 @@
      </widget>
      <widget class="QWidget" name="tab_2">
       <attribute name="icon">
-       <iconset>
+       <iconset resource="../images.qrc">
         <normaloff>:/images/security-high-16.png</normaloff>:/images/security-high-16.png</iconset>
       </attribute>
       <attribute name="title">
        <string>Trust </string>
       </attribute>
       <layout class="QVBoxLayout" name="_9">
-       <item>
-        <layout class="QHBoxLayout" name="wotLayout">
        <item>
         <widget class="QLabel" name="web_of_trust_label">
          <property name="text">
@@ -304,6 +302,8 @@
          </property>
         </widget>
        </item>
+       <item>
+        <layout class="QHBoxLayout" name="wotLayout">
          <item>
           <widget class="QRadioButton" name="radioButton_trust_never">
            <property name="maximumSize">
@@ -316,7 +316,7 @@
             <string>None </string>
            </property>
            <property name="icon">
-            <iconset>
+            <iconset resource="../images.qrc">
              <normaloff>:/images/security-low-48.png</normaloff>:/images/security-low-48.png</iconset>
            </property>
            <property name="iconSize">
@@ -339,7 +339,7 @@
             <string>Marginal </string>
            </property>
            <property name="icon">
-            <iconset>
+            <iconset resource="../images.qrc">
              <normaloff>:/images/security-medium-48.png</normaloff>:/images/security-medium-48.png</iconset>
            </property>
            <property name="iconSize">
@@ -362,7 +362,7 @@
             <string>Full </string>
            </property>
            <property name="icon">
-            <iconset>
+            <iconset resource="../images.qrc">
              <normaloff>:/images/security-high-48.png</normaloff>:/images/security-high-48.png</iconset>
            </property>
            <property name="iconSize">
@@ -375,17 +375,6 @@
          </item>
         </layout>
        </item>
-       <item>
-        <widget class="QTextBrowser" name="gpgTrustInfoBrowser">
-         <property name="html">
-          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The trust settings refers to the gnupg web of trust mecanism. This trust means how you trust your friends when he is signing other gpg keys. If you set your trust to &quot;full&quot;, it means that when your friend sign a key, this key will be shown as validated by the web of trust in the network view.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-        </widget>
-       </item>
        <item>
         <widget class="QGroupBox" name="groupBox_3">
          <property name="font">
@@ -403,8 +392,8 @@ p, li { white-space: pre-wrap; }
          <property name="checkable">
           <bool>false</bool>
          </property>
-         <layout class="QVBoxLayout" name="_10">
+         <layout class="QGridLayout" name="gridLayout_2">
-          <item>
+          <item row="0" column="0">
            <widget class="QLabel" name="is_signing_me">
             <property name="font">
              <font>
@@ -417,7 +406,27 @@ p, li { white-space: pre-wrap; }
             </property>
            </widget>
           </item>
-          <item>
+          <item row="0" column="1">
+           <widget class="QToolButton" name="trusthelpButton">
+            <property name="toolTip">
+             <string>Show Help for Trust Settings and Signing</string>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+            <property name="icon">
+             <iconset resource="../images.qrc">
+              <normaloff>:/images/informations_24x24.png</normaloff>:/images/informations_24x24.png</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>24</width>
+              <height>24</height>
+             </size>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" colspan="2">
            <widget class="QGroupBox" name="signersBox">
             <property name="title">
              <string>Peer key is signed by :</string>
@@ -429,17 +438,6 @@ p, li { white-space: pre-wrap; }
             </layout>
            </widget>
           </item>
-          <item>
-           <widget class="QTextBrowser" name="gpgSignInfoBrowser">
-            <property name="html">
-             <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;You should sign a key when you are sure that the person who claims ownership on this key is the real owner of the key.  When you are sure that the name of the key owner is the real name of the emmitter of this key, you may sign it to confirm it. Signing the key will be public unless public discovery is not setted. This means you friends can check if you did sign someone's key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-           </widget>
-          </item>
          </layout>
         </widget>
        </item>
@@ -454,7 +452,7 @@ p, li { white-space: pre-wrap; }
             <string>Sign GPG key</string>
            </property>
            <property name="icon">
-            <iconset>
+            <iconset resource="../images.qrc">
              <normaloff>:/images/view-certificate-sign-32.png</normaloff>:/images/view-certificate-sign-32.png</iconset>
            </property>
            <property name="iconSize">
@@ -474,7 +472,7 @@ p, li { white-space: pre-wrap; }
             <string>SignGPG Key</string>
            </property>
            <property name="icon">
-            <iconset>
+            <iconset resource="../images.qrc">
              <normaloff>:/images/view-certificate-sign-48.png</normaloff>:/images/view-certificate-sign-48.png</iconset>
            </property>
            <property name="iconSize">
@@ -507,7 +505,7 @@ p, li { white-space: pre-wrap; }
             <string>Deny Friend</string>
            </property>
            <property name="icon">
-            <iconset>
+            <iconset resource="../images.qrc">
              <normaloff>:/images/user/deny_user48.png</normaloff>:/images/user/deny_user48.png</iconset>
            </property>
            <property name="iconSize">
@@ -527,7 +525,7 @@ p, li { white-space: pre-wrap; }
             <string>Make Friend</string>
            </property>
            <property name="icon">
-            <iconset>
+            <iconset resource="../images.qrc">
              <normaloff>:/images/user/add_user48.png</normaloff>:/images/user/add_user48.png</iconset>
            </property>
            <property name="iconSize">
@@ -598,6 +596,8 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../images.qrc"/>
+ </resources>
  <connections/>
 </ui>

retroshare-gui/src/gui/help/content/content.qrc

@@ -6,11 +6,13 @@
     <file>en/config.html</file>
     <file>en/links.html</file>
     <file>en/commandline.html</file>
+    <file>en/peerdetails.html</file>
     <!-- German -->
     <file>de/contents.xml</file>
     <file>de/index.html</file>
     <file>de/links.html</file>
     <file>de/commandline.html</file>
+    <file>de/peerdetails.html</file>
   </qresource>
 </RCC>
 

retroshare-gui/src/gui/help/content/de/contents.xml

@@ -12,6 +12,7 @@
 
 <Contents name="RetroShare Hilfe" html="index.html">
   <Topic id="commands" name="Kommandozeilen-Optionen" html="commandline.html"/>
+  <Topic id="trust" name="Vertrauen Einstellungen" html="peerdetails.html"/>
   <Topic id="links" name="N&#252;tzliche Links" html="links.html"/>
 </Contents>
 

retroshare-gui/src/gui/help/content/de/peerdetails.html

@@ -0,0 +1,63 @@
+<!--/****************************************************************
+ * This file is distributed under the following license:
+ *
+ * Copyright (c) 2008, defnax
+ * Copyright (c) 2008, edmanm
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ *  Boston, MA  02110-1301, USA.
+ ****************************************************************
+-->
+
+<html>
+<body>
+
+<h1>Peer Details</h1>
+<hr />
+
+<p>
+Peer Details Trust settings and Signing
+</p>
+
+<a name="trust"/>
+<h3>Trust Settings</h3>
+    <td><img src="qrc:/images/trustsettings.png"/></td>
+<p>
+The trust settings refers to the gnupg web of trust mecanism. <br>
+This trust means how you trust your friends when he is signing other gpg keys. <br>
+If you set your trust to "full", it means that when your friend sign a key, this key will be shown as validated by the web of trust in the network view.</p>
+
+
+<a name="signing"/>
+<h3>Signing</h3>
+<p>
+
+You should sign a key when you are sure that the person who claims ownership on this key is the real owner of the key.  <br>
+When you are sure that the name of the key owner is the real name of the emmitter of this key, you may sign it to confirm it. <br>
+Signing the key will be public unless public discovery is not setted. This means you friends can check if you did sign someone's key.</i>
+</p>
+
+
+
+
+
+
+
+
+
+
+</body>
+</html>
+

retroshare-gui/src/gui/help/content/en/contents.xml

@@ -29,6 +29,7 @@
     <Topic id="appearance" name="Appearance Settings" html="config.html" section="appearance"/>
   </Topic>
   <Topic id="commands" name="Commandline Options" html="commandline.html"/>
+  <Topic id="trust" name="Trust Settings" html="peerdetails.html"/>
   <Topic id="links" name="Helpful Links" html="links.html"/>
 </Contents>
 

retroshare-gui/src/gui/help/content/en/peerdetails.html

@@ -0,0 +1,63 @@
+<!--/****************************************************************
+ * This file is distributed under the following license:
+ *
+ * Copyright (c) 2008, defnax
+ * Copyright (c) 2008, edmanm
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ *  Boston, MA  02110-1301, USA.
+ ****************************************************************
+-->
+
+<html>
+<body>
+
+<h1>Peer Details</h1>
+<hr />
+
+<p>
+Trust settings and Signing
+</p>
+
+<a name="trust"/>
+<h3>Trust Settings</h3>
+    <td><img src="qrc:/images/trustsettings.png"/></td>
+<p>
+The trust settings refers to the gnupg web of trust mecanism. <br>
+This trust means how you trust your friends when he is signing other gpg keys. <br>
+If you set your trust to "full", it means that when your friend sign a key, this key will be shown as validated by the web of trust in the network view.</p>
+
+
+<a name="signing"/>
+<h3>Signing</h3>
+<p>
+
+You should sign a key when you are sure that the person who claims ownership on this key is the real owner of the key.  <br>
+When you are sure that the name of the key owner is the real name of the emmitter of this key, you may sign it to confirm it. <br>
+Signing the key will be public unless public discovery is not setted. This means you friends can check if you did sign someone's key.</i>
+</p>
+
+
+
+
+
+
+
+
+
+
+</body>
+</html>
+

retroshare-gui/src/gui/images.qrc

@@ -352,6 +352,7 @@
         <file>images/transferupdown.png</file>
         <file>images/tools_wizard.png</file>
         <file>images/typing.png</file>
+        <file>images/trustsettings.png</file>
         <file>images/uploads.png</file>
         <file>images/loader/16-loader.gif</file>
         <file>images/loader/32-loader.gif</file>