Merge branch 'master' of git://gitorious.org/rekonq/mainline into i18n

1 files changed, 27 insertions, 75 deletions

diff --git a/src/settings/settings_general.ui b/src/settings/settings_general.ui
index a4503d4a..00277133 100644
--- a/src/settings/settings_general.ui
+++ b/src/settings/settings_general.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>751</width>
-    <height>523</height>
+    <width>552</width>
+    <height>512</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -150,11 +150,11 @@
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
-      <string>New Tabs Behaviour</string>
+      <string>Search Engine</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_4">
+     <layout class="QHBoxLayout" name="horizontalLayout_4">
+      <item>
+       <widget class="QLabel" name="label_3">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
           <horstretch>0</horstretch>
@@ -169,20 +169,20 @@
         </property>
         <property name="baseSize">
          <size>
-          <width>120</width>
+          <width>0</width>
           <height>0</height>
          </size>
         </property>
+        <property name="layoutDirection">
+         <enum>Qt::LeftToRight</enum>
+        </property>
         <property name="text">
-         <string>New tab opens:</string>
+         <string>Default search engine:</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="KComboBox" name="kcfg_newTabsBehaviour">
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
+      <item>
+       <widget class="KComboBox" name="kcfg_searchEngine">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -191,75 +191,27 @@
         </property>
         <item>
          <property name="text">
-          <string>New Tab Page</string>
+          <string>google</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>Blank Page</string>
+          <string>altavista</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string comment="@item:inlistbox">Home Page</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_5">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>120</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="baseSize">
-         <size>
-          <width>120</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>New tab page starts with:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="KComboBox" name="kcfg_newTabStartPage">
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <item>
-         <property name="text">
-          <string>Favorites</string>
+          <string>lycos</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>Closed Tabs</string>
+          <string>wikipedia</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>Bookmarks</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>History</string>
+          <string>wolfram</string>
          </property>
         </item>
        </widget>
@@ -272,21 +224,21 @@
      <property name="title">
       <string>Download Manager</string>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_5">
+     <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
-       <widget class="QCheckBox" name="kcfg_kgetDownload">
+       <widget class="QCheckBox" name="kcfg_kgetList">
+        <property name="whatsThis">
+         <string>If enabled, rekonq will display an additional context menu entry, which, when selected, lists all available links of the current website in KGet.</string>
+        </property>
         <property name="text">
-         <string>Use KGet for downloading files</string>
+         <string>List links with KGet</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="kcfg_kgetList">
-        <property name="whatsThis">
-         <string>If enabled, rekonq will display an additional context menu entry, which, when selected, lists all available links of the current website in KGet.</string>
-        </property>	
+       <widget class="QCheckBox" name="kcfg_kgetDownload">
         <property name="text">
-         <string>List links with KGet</string>
+         <string>Use KGet for downloading files</string>
         </property>
        </widget>
       </item>
@@ -301,7 +253,7 @@
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>40</height>
+       <height>179</height>
       </size>
      </property>
     </spacer>