Mercurial Repositories > eric / file diff

diff -r 1b7cd7409170 -r bc68f24d5658 Preferences/ConfigurationPages/HelpWebBrowserPage.ui
--- a/Preferences/ConfigurationPages/HelpWebBrowserPage.ui	Tue Feb 21 17:19:21 2012 +0100
+++ b/Preferences/ConfigurationPages/HelpWebBrowserPage.ui	Wed Feb 22 09:20:53 2012 +0100
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>613</width>
-    <height>1049</height>
+    <height>1158</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_4">
@@ -206,7 +206,7 @@
       <string>Privacy</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0" colspan="2">
+      <item row="0" column="0">
        <widget class="QCheckBox" name="javaCheckBox">
         <property name="toolTip">
          <string>Select to enable Java</string>
@@ -216,7 +216,7 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0" colspan="2">
+      <item row="1" column="0">
        <widget class="QCheckBox" name="javaScriptCheckBox">
         <property name="toolTip">
          <string>Select to enable JavaScript</string>
@@ -246,7 +246,7 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="0" colspan="2">
+      <item row="3" column="0">
        <widget class="QCheckBox" name="pluginsCheckBox">
         <property name="toolTip">
          <string>Select to enable plugins in web pages</string>
@@ -257,13 +257,65 @@
        </widget>
       </item>
       <item row="4" column="0" colspan="2">
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <spacer name="horizontalSpacer_4">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Fixed</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>19</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="clickToFlashCheckBox">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>8</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="toolTip">
+           <string>Select to activate the Flash blocker</string>
+          </property>
+          <property name="text">
+           <string>Use ClickToFlash on Flash plugins</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_5">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>308</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item row="5" column="0" colspan="2">
        <widget class="Line" name="line">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="5" column="0" colspan="2">
+      <item row="6" column="0">
        <widget class="QCheckBox" name="doNotTrackCheckBox">
         <property name="toolTip">
          <string>Select to enabled the &quot;Do Not Track&quot; feature</string>
@@ -593,6 +645,7 @@
   <tabstop>jsOpenWindowsCheckBox</tabstop>
   <tabstop>jsClipboardCheckBox</tabstop>
   <tabstop>pluginsCheckBox</tabstop>
+  <tabstop>clickToFlashCheckBox</tabstop>
   <tabstop>doNotTrackCheckBox</tabstop>
   <tabstop>xssAuditingCheckBox</tabstop>
   <tabstop>expireHistory</tabstop>
@@ -608,5 +661,22 @@
   <tabstop>accessKeysCheckBox</tabstop>
  </tabstops>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>pluginsCheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>clickToFlashCheckBox</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>89</x>
+     <y>422</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>89</x>
+     <y>443</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>