Modified rekonq behaviour:

HomePage has 2 choices: usual home page vs new tab page
new tab has 3: new tabp page, home page, blank page

1 files changed, 61 insertions, 101 deletions

diff --git a/src/settings_general.ui b/src/settings_general.ui
index 70accdec..fe1ec457 100644
--- a/src/settings_general.ui
+++ b/src/settings_general.ui
@@ -6,51 +6,42 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>662</width>
-    <height>539</height>
+    <width>442</width>
+    <height>369</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>General</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
-      <string>New Tabs Behaviour</string>
+      <string>Home Page</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label">
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QRadioButton" name="kcfg_useNewTabPage">
         <property name="text">
-         <string>New tabs open </string>
+         <string>Use new tab page</string>
         </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="KComboBox" name="kcfg_newTabsBehaviour">
-        <property name="enabled">
+        <property name="checked">
          <bool>true</bool>
         </property>
-        <item>
-         <property name="text">
-          <string>rekonq home page</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>blank page</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>url</string>
-         </property>
-        </item>
        </widget>
       </item>
-      <item row="1" column="1">
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QRadioButton" name="radioButton">
+          <property name="text">
+           <string>Use this page:</string>
+          </property>
+          <property name="checked">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
         <item>
          <widget class="KLineEdit" name="kcfg_homePage">
           <property name="enabled">
@@ -79,9 +70,47 @@
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
+      <string>New Tabs Behaviour</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>New tabs open </string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="KComboBox" name="kcfg_newTabsBehaviour">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <item>
+         <property name="text">
+          <string>new tab page</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>blank page</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>home page</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_4">
+     <property name="title">
       <string>Tabbed Browsing</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
+     <layout class="QVBoxLayout" name="verticalLayout_4">
       <item>
        <widget class="QCheckBox" name="kcfg_openTabNoWindow">
         <property name="text">
@@ -114,75 +143,6 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="title">
-      <string>General Settings</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <widget class="QCheckBox" name="kcfg_showUrlsPopup">
-        <property name="text">
-         <string>Show URLs of links in a popup</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox_4">
-     <property name="title">
-      <string>History</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>Remove history items:</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="KComboBox" 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>
-     </layout>
-    </widget>
-   </item>
-   <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -190,7 +150,7 @@
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>40</height>
+       <height>43</height>
       </size>
      </property>
     </spacer>