From d7660113a9797262c157e5f12b24af7a2042beef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?=
 <marta.maria.gorecka@gmail.com>
Date: Fri, 17 Nov 2017 21:48:07 +0100
Subject: [PATCH] Added tooltip to better explain firewall settings

Added a tooltip clarifying that changing firewall settings does not
affect existing connections.

fixes QubesOS/qubes-issues#2731
---
 ui/settingsdlg.ui | 58 ++++++++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/ui/settingsdlg.ui b/ui/settingsdlg.ui
index d3f1225..eda8864 100644
--- a/ui/settingsdlg.ui
+++ b/ui/settingsdlg.ui
@@ -29,7 +29,7 @@
         <locale language="English" country="UnitedStates"/>
        </property>
        <property name="currentIndex">
-        <number>1</number>
+        <number>2</number>
        </property>
        <widget class="QWidget" name="basic_tab">
         <property name="locale">
@@ -675,31 +675,6 @@ border-width: 1px;</string>
          <string>Firewall rules</string>
         </attribute>
         <layout class="QGridLayout" name="gridLayout_8">
-         <item row="1" column="0">
-          <layout class="QHBoxLayout" name="horizontalLayout_5">
-           <item>
-            <widget class="QRadioButton" name="policy_allow_radio_button">
-             <property name="text">
-              <string>Allow all outgoing Internet connections</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QRadioButton" name="policy_deny_radio_button">
-             <property name="text">
-              <string>Limit outgoing Internet connections to ...</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item row="3" column="0" colspan="2">
-          <widget class="Line" name="line">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-          </widget>
-         </item>
          <item row="7" column="0" colspan="2">
           <widget class="QLabel" name="label_22">
            <property name="text">
@@ -720,6 +695,13 @@ border-width: 1px;</string>
            </property>
           </widget>
          </item>
+         <item row="3" column="0" colspan="2">
+          <widget class="Line" name="line">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+          </widget>
+         </item>
          <item row="6" column="0">
           <widget class="QWidget" name="tempFullAccessWidget" native="true">
            <property name="enabled">
@@ -768,6 +750,27 @@ border-width: 1px;</string>
            </layout>
           </widget>
          </item>
+         <item row="1" column="0">
+          <layout class="QHBoxLayout" name="horizontalLayout_5">
+           <item>
+            <widget class="QRadioButton" name="policy_allow_radio_button">
+             <property name="text">
+              <string>Allow all outgoing Internet connections</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QRadioButton" name="policy_deny_radio_button">
+             <property name="toolTip">
+              <string>Changing firewall settings does NOT affect existing connections.</string>
+             </property>
+             <property name="text">
+              <string>Limit outgoing Internet connections to ...</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
          <item row="5" column="0" colspan="2">
           <layout class="QHBoxLayout" name="firewallRulesLayout">
            <property name="sizeConstraint">
@@ -846,6 +849,9 @@ border-width: 1px;</string>
              </item>
              <item>
               <widget class="QPushButton" name="delete_rule_button">
+               <property name="toolTip">
+                <string>Changing firewall settings does NOT affect existing connections.</string>
+               </property>
                <property name="text">
                 <string/>
                </property>