From cb84ae8badcab5bfe095e71cf4c0e33175e60817 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 7 Jan 2011 17:49:24 +0100
Subject: This GCI task adds a combobox with different settings to choice when
 hovering tabs: * tab preview (default one) * show title as tooltip * show url
 as tooltip * show nothing

Patch by Furkan Uzumcu, reviewed (and merged) by adjam

BUG:260343
RB:100282
---
 src/settings/settings_tabs.ui | 75 ++++++++++++++++++++++++++++++++-----------
 src/settings/tabswidget.cpp   |  1 -
 2 files changed, 57 insertions(+), 19 deletions(-)

(limited to 'src/settings')

diff --git a/src/settings/settings_tabs.ui b/src/settings/settings_tabs.ui
index 2e2ee103..290c6274 100644
--- a/src/settings/settings_tabs.ui
+++ b/src/settings/settings_tabs.ui
@@ -20,6 +20,9 @@
       <string>New Tab Behavior</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
+      <property name="fieldGrowthPolicy">
+       <enum>QFormLayout::ExpandingFieldsGrow</enum>
+      </property>
       <item row="0" column="0">
        <widget class="QLabel" name="label_4">
         <property name="minimumSize">
@@ -126,18 +129,64 @@
      <property name="title">
       <string>Tabbed Browsing</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
+     <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
-       <widget class="QCheckBox" name="kcfg_openTabNoWindow">
-        <property name="text">
-         <string>Open links in new tab instead of in new window</string>
-        </property>
-       </widget>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QLabel" name="label_6">
+          <property name="minimumSize">
+           <size>
+            <width>150</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>When hovering tab show:</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="KComboBox" name="kcfg_hoveringTabOption">
+          <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>Tab Previews</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Title Tooltip</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Url Tooltip</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string comment="@item:inlistbox">Nothing</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+       </layout>
       </item>
       <item>
-       <widget class="QCheckBox" name="kcfg_alwaysShowTabBar">
+       <widget class="QCheckBox" name="kcfg_openTabNoWindow">
         <property name="text">
-         <string>Always show tab bar</string>
+         <string>Open links in new tab instead of in new window</string>
         </property>
        </widget>
       </item>
@@ -155,16 +204,6 @@
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QCheckBox" name="kcfg_alwaysShowTabPreviews">
-        <property name="text">
-         <string>Show preview when hovering tab</string>
-        </property>
-        <property name="checked">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="QCheckBox" name="kcfg_closeTabSelectPrevious">
         <property name="text">
diff --git a/src/settings/tabswidget.cpp b/src/settings/tabswidget.cpp
index aa555339..d9b741be 100644
--- a/src/settings/tabswidget.cpp
+++ b/src/settings/tabswidget.cpp
@@ -41,7 +41,6 @@ void TabsWidget::save()
 {
 }
 
-
 bool TabsWidget::changed()
 {
     return _changed;
-- 
cgit v1.2.1