1 files changed, 77 insertions, 47 deletions
diff --git a/src/settings/settings_webkit.ui b/src/settings/settings_webkit.ui
index 5074522b..e87e3fec 100644
--- a/src/settings/settings_webkit.ui
+++ b/src/settings/settings_webkit.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>437</width>
-    <height>346</height>
+    <width>643</width>
+    <height>560</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -17,99 +17,106 @@
       <string>WebKit Settings</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0" colspan="2">
+      <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="3">
+      <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" colspan="2">
-       <widget class="QCheckBox" name="kcfg_javascriptEnabled">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="kcfg_dnsPrefetch">
         <property name="text">
-         <string>JavaScript support</string>
+         <string>Prefetch DNS entries</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="3">
+      <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" colspan="2">
-       <widget class="QCheckBox" name="kcfg_javaEnabled">
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="kcfg_javascriptEnabled">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="text">
-         <string>Java support</string>
+         <string>JavaScript support</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="3">
+      <item row="2" column="2">
        <widget class="QCheckBox" name="kcfg_printElementBackgrounds">
         <property name="text">
          <string>Print element backgrounds</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="3">
+      <item row="4" column="2">
        <widget class="QCheckBox" name="kcfg_offlineStorageDatabaseEnabled">
         <property name="text">
          <string>Offline storage database</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="3">
-       <widget class="QCheckBox" name="kcfg_offlineWebApplicationCacheEnabled">
+      <item row="3" column="0" rowspan="2">
+       <widget class="QCheckBox" name="kcfg_javaEnabled">
         <property name="text">
-         <string>Offline web application cache</string>
+         <string>Java support</string>
         </property>
        </widget>
       </item>
-      <item row="5" column="3">
-       <widget class="QCheckBox" name="kcfg_localStorageDatabaseEnabled">
+      <item row="5" column="0">
+       <widget class="QCheckBox" name="kcfg_javascriptCanOpenWindows">
         <property name="text">
-         <string>Local storage database</string>
+         <string>JavaScript can open windows</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="0">
-       <widget class="QCheckBox" name="kcfg_javascriptCanOpenWindows">
+      <item row="5" column="2">
+       <widget class="QCheckBox" name="kcfg_offlineWebApplicationCacheEnabled">
         <property name="text">
-         <string>JavaScript can open windows</string>
+         <string>Offline web application cache</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="0">
+      <item row="6" column="0">
        <widget class="QCheckBox" name="kcfg_javascriptCanAccessClipboard">
         <property name="text">
          <string>JavaScript can access clipboard</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="2" rowspan="6">
-       <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>
+      <item row="6" column="2">
+       <widget class="QCheckBox" name="kcfg_localStorageEnabled">
+        <property name="text">
+         <string>Local Storage</string>
         </property>
        </widget>
       </item>
@@ -130,8 +137,8 @@
      <property name="title">
       <string>Plugin Settings</string>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
-      <item>
+     <layout class="QFormLayout" name="formLayout">
+      <item row="0" column="0">
        <widget class="QLabel" name="label_2">
         <property name="enabled">
          <bool>true</bool>
@@ -142,15 +149,24 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="minimumSize">
+         <size>
+          <width>150</width>
+          <height>0</height>
+         </size>
+        </property>
         <property name="text">
          <string>When loading web pages:</string>
         </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
        </widget>
       </item>
-      <item>
-       <widget class="QComboBox" name="kcfg_pluginsEnabled">
+      <item row="0" column="1">
+       <widget class="KComboBox" name="kcfg_pluginsEnabled">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -180,15 +196,24 @@
      <property name="title">
       <string>User Style Sheet</string>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
+     <layout class="QFormLayout" name="formLayout_2">
+      <item row="0" column="0">
        <widget class="QLabel" name="label">
+        <property name="minimumSize">
+         <size>
+          <width>150</width>
+          <height>0</height>
+         </size>
+        </property>
         <property name="text">
          <string>User CSS path:</string>
         </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
        </widget>
       </item>
-      <item>
+      <item row="0" column="1">
        <widget class="KUrlRequester" name="kcfg_userCSS">
         <property name="filter">
          <string>*.css</string>
@@ -219,6 +244,11 @@
    <extends>QFrame</extends>
    <header>kurlrequester.h</header>
   </customwidget>
+  <customwidget>
+   <class>KComboBox</class>
+   <extends>QComboBox</extends>
+   <header>kcombobox.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>