Merge branch 'HomePage'

1 files changed, 68 insertions, 106 deletions

diff --git a/src/settings_general.ui b/src/settings_general.ui
index 6c18e8cc..fe1ec457 100644
--- a/src/settings_general.ui
+++ b/src/settings_general.ui
@@ -6,80 +6,111 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>515</width>
-    <height>415</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>Home Page</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_3">
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QRadioButton" name="kcfg_useNewTabPage">
         <property name="text">
-         <string>Home page:</string>
+         <string>Use new tab page</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="KLineEdit" name="kcfg_homePage">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
+      <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
-         <widget class="QPushButton" name="setHomeToCurrentPageButton">
+         <widget class="QRadioButton" name="radioButton">
           <property name="text">
-           <string>Set to Current Page</string>
+           <string>Use this page:</string>
+          </property>
+          <property name="checked">
+           <bool>false</bool>
           </property>
          </widget>
         </item>
         <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+         <widget class="KLineEdit" name="kcfg_homePage">
+          <property name="enabled">
+           <bool>true</bool>
           </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
           </property>
-         </spacer>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="setHomeToCurrentPageButton">
+          <property name="text">
+           <string>Set to Current Page</string>
+          </property>
+         </widget>
         </item>
        </layout>
       </item>
-      <item row="0" column="1">
-       <widget class="QCheckBox" name="kcfg_newTabsOpenHomePage">
+     </layout>
+    </widget>
+   </item>
+   <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 home page</string>
+         <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_3">
+    <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">
@@ -112,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>
@@ -188,7 +150,7 @@
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>40</height>
+       <height>43</height>
       </size>
      </property>
     </spacer>