From 44de13c94f903aa26f2817fe0071df7ff4f9d575 Mon Sep 17 00:00:00 2001
From: csoler <retroshare.project@gmail.com>
Date: Thu, 11 Jun 2015 20:59:41 +0000
Subject: [PATCH] added explanation to IP change security item in a tooltip

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8417 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 .../src/gui/feeds/SecurityIpItem.ui           | 34 ++++++-------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/retroshare-gui/src/gui/feeds/SecurityIpItem.ui b/retroshare-gui/src/gui/feeds/SecurityIpItem.ui
index 068f599fc..a0ee5a55f 100644
--- a/retroshare-gui/src/gui/feeds/SecurityIpItem.ui
+++ b/retroshare-gui/src/gui/feeds/SecurityIpItem.ui
@@ -7,20 +7,11 @@
     <x>0</x>
     <y>0</y>
     <width>763</width>
-    <height>161</height>
+    <height>185</height>
    </rect>
   </property>
   <layout class="QGridLayout">
-   <property name="leftMargin">
-    <number>1</number>
-   </property>
-   <property name="topMargin">
-    <number>1</number>
-   </property>
-   <property name="rightMargin">
-    <number>1</number>
-   </property>
-   <property name="bottomMargin">
+   <property name="margin">
     <number>1</number>
    </property>
    <item row="0" column="0">
@@ -95,6 +86,9 @@
        </disabled>
       </palette>
      </property>
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you're connected to will not see your external IP, but the attacker's IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing's wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
      <property name="autoFillBackground">
       <bool>true</bool>
      </property>
@@ -111,21 +105,12 @@
       <item row="0" column="0">
        <widget class="QFrame" name="headFrame">
         <layout class="QGridLayout">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
          <property name="verticalSpacing">
           <number>0</number>
          </property>
+         <property name="margin">
+          <number>0</number>
+         </property>
          <item row="0" column="0" rowspan="2">
           <widget class="AvatarWidget" name="avatar">
            <property name="minimumSize">
@@ -306,6 +291,9 @@
            </item>
            <item row="2" column="1">
             <widget class="QLabel" name="ipAddr">
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you're connected to will not see your external IP, but the attacker's IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing's wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
              <property name="text">
               <string notr="true">IP Address</string>
              </property>