Huge update. Fixed quite all of the settings troubles..

From now on, we (mainly) go on WebView bugfixing..

1 files changed, 46 insertions, 61 deletions

diff --git a/src/settings_general.ui b/src/settings_general.ui
index 9b963f89..3f07eaa5 100644
--- a/src/settings_general.ui
+++ b/src/settings_general.ui
@@ -6,18 +6,18 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>392</width>
-    <height>269</height>
+    <width>515</width>
+    <height>415</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>General</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
-      <string>HomePage</string>
+      <string>Places</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="0">
@@ -64,76 +64,61 @@
         </item>
        </layout>
       </item>
+      <item row="2" column="1">
+       <widget class="KUrlRequester" name="downloadDirUrlRequester"/>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_7">
+        <property name="text">
+         <string>Save downloads to:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox_2">
+    <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
-      <string>misc</string>
+      <string>Appearance</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_4">
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QCheckBox" name="kcfg_alwaysShowTabBar">
         <property name="text">
-         <string>Remove history items:</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         <string>Always show TabBar</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="kcfg_expireHistory">
-        <item>
-         <property name="text">
-          <string>After one day</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>After one week</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>After two weeks</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>After one month</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>After one year</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Manually</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_7">
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Web Content</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QCheckBox" name="kcfg_enablePlugins">
         <property name="text">
-         <string>Save downloads to:</string>
+         <string>Enable Plugins</string>
         </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <property name="checked">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="KUrlRequester" name="downloadDirUrlRequester"/>
-      </item>
-      <item row="2" column="1">
-       <widget class="QCheckBox" name="kcfg_alwaysShowTabBar">
+      <item>
+       <widget class="QCheckBox" name="kcfg_enableJavascript">
         <property name="text">
-         <string>Always show TabBar</string>
+         <string>Enable Javascript</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
@@ -141,14 +126,14 @@
     </widget>
    </item>
    <item>
-    <spacer name="spacer">
+    <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>384</width>
-       <height>36</height>
+       <width>20</width>
+       <height>40</height>
       </size>
      </property>
     </spacer>