From f61c48d0e6058ebec3ff1d60ba800192d8bc1a4d Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 23 Oct 2011 16:11:52 +0200
Subject: Improve rekonq WebKit settings

This patch changes WebKit Settings window removing the "unuseful"
stuffs and adding some news like WebGL or Frame Flattening
(probably useful also on netbook).
It also redesign/clean up the settings widget

Let us require QtWebKit 2.2.x, hence Qt 4.8.0 at least until someone
will explain me how I can check QtWebKit version number with cmake...

REVIEW:102920
---
 src/settings/settings_webkit.ui | 185 +++++++++++++++++++++-------------------
 1 file changed, 95 insertions(+), 90 deletions(-)

(limited to 'src/settings/settings_webkit.ui')

diff --git a/src/settings/settings_webkit.ui b/src/settings/settings_webkit.ui
index 58fbe459..46913f63 100644
--- a/src/settings/settings_webkit.ui
+++ b/src/settings/settings_webkit.ui
@@ -6,59 +6,18 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>480</width>
-    <height>377</height>
+    <width>503</width>
+    <height>514</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_4">
    <item>
-    <widget class="QGroupBox" name="groupBox">
+    <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
-      <string>WebKit Settings</string>
+      <string>Javascript</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QCheckBox" name="kcfg_autoLoadImages">
-        <property name="text">
-         <string>Autoload images</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" rowspan="7">
-       <widget class="Line" name="line">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QCheckBox" name="kcfg_linksIncludedInFocusChain">
-        <property name="text">
-         <string>Links included in focus chain</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="kcfg_dnsPrefetch">
-        <property name="text">
-         <string>Prefetch DNS entries</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QCheckBox" name="kcfg_zoomTextOnly">
-        <property name="text">
-         <string>Zoom text only</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
        <widget class="QCheckBox" name="kcfg_javascriptEnabled">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -67,56 +26,21 @@
          </sizepolicy>
         </property>
         <property name="text">
-         <string>JavaScript support</string>
+         <string>Enable JavaScript</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="2">
-       <widget class="QCheckBox" name="kcfg_printElementBackgrounds">
-        <property name="text">
-         <string>Print element backgrounds</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="2">
-       <widget class="QCheckBox" name="kcfg_offlineStorageDatabaseEnabled">
-        <property name="text">
-         <string>Offline storage database</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" rowspan="2">
-       <widget class="QCheckBox" name="kcfg_javaEnabled">
-        <property name="text">
-         <string>Java support</string>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="0">
+      <item>
        <widget class="QCheckBox" name="kcfg_javascriptCanOpenWindows">
         <property name="text">
-         <string>JavaScript can open windows</string>
+         <string>Let Javascipt open new windows</string>
         </property>
        </widget>
       </item>
-      <item row="5" column="2">
-       <widget class="QCheckBox" name="kcfg_offlineWebApplicationCacheEnabled">
-        <property name="text">
-         <string>Offline web application cache</string>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0">
+      <item>
        <widget class="QCheckBox" name="kcfg_javascriptCanAccessClipboard">
         <property name="text">
-         <string>JavaScript can access clipboard</string>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="2">
-       <widget class="QCheckBox" name="kcfg_localStorageEnabled">
-        <property name="text">
-         <string>Local Storage</string>
+         <string>Let Javascript access clipboard</string>
         </property>
        </widget>
       </item>
@@ -135,7 +59,7 @@
       </sizepolicy>
      </property>
      <property name="title">
-      <string>Plugin Settings</string>
+      <string>Plugins</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <item row="0" column="0">
@@ -192,7 +116,88 @@
     </widget>
    </item>
    <item>
-    <spacer name="verticalSpacer">
+    <widget class="QGroupBox" name="groupBox_4">
+     <property name="title">
+      <string>HTML 5</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
+       <widget class="QCheckBox" name="kcfg_offlineStorageDatabaseEnabled">
+        <property name="text">
+         <string>Offline storage database</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="kcfg_offlineWebApplicationCacheEnabled">
+        <property name="text">
+         <string>Offline web application cache</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="kcfg_localStorageEnabled">
+        <property name="text">
+         <string>Local Storage</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Misc</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QCheckBox" name="kcfg_javaEnabled">
+        <property name="text">
+         <string>load java applets</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="kcfg_webGL">
+        <property name="text">
+         <string>WebGL</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="kcfg_spatialNavigation">
+        <property name="text">
+         <string>Spatial Navigation</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="kcfg_frameFlattening">
+        <property name="text">
+         <string>Frame Flattening</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="kcfg_dnsPrefetch">
+        <property name="text">
+         <string>Prefetch DNS entries</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="kcfg_printElementBackgrounds">
+        <property name="text">
+         <string>Print element backgrounds</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-- 
cgit v1.2.1