Merge remote-tracking branch 'qubesos/pr/49'

* qubesos/pr/49:
  Added tooltip to better explain firewall settings
This commit is contained in:
Marek Marczykowski-Górecki 2017-11-20 03:24:09 +01:00
commit b7f40c1135
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724

View File

@ -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>