From 718f6ae321b507dbb5bca737a1d1d486b2b41dc5 Mon Sep 17 00:00:00 2001
From: Francois Andriot <francois.andriot@free.fr>
Date: Sun, 19 May 2013 16:09:35 +0200
Subject: Add tooltip support in KMenu

---
 kcontrol/kicker/menutab.ui       | 14 ++++++++++++++
 kcontrol/kicker/menutab_impl.cpp | 12 ++++++++++++
 2 files changed, 26 insertions(+)

(limited to 'kcontrol/kicker')

diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui
index 3c06ddfd4..e6b17c492 100644
--- a/kcontrol/kicker/menutab.ui
+++ b/kcontrol/kicker/menutab.ui
@@ -242,6 +242,20 @@
 							<string>Open menu on mouse hover</string>
 						</property>
 					</widget>
+					<widget class="TQCheckBox">
+						<property name="name">
+							<cstring>kcfg_UseTooltip</cstring>
+						</property>
+						<property name="text">
+							<string>Show T&amp;ooltip</string>
+						</property>
+						<property name="checked">
+							<bool>false</bool>
+						</property>
+						<property name="whatsThis" stdset="0">
+							<string>&lt;qt&gt;When this option is selected a tooltip will appear on the KMenu items.</string>
+						</property>
+					</widget>
 					<widget class="TQCheckBox">
 						<property name="name">
 							<cstring>kcfg_UseSidePixmap</cstring>
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index 2c259829f..5ba9dd54f 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -171,10 +171,12 @@ void MenuTab::load( bool useDefaults )
 
 void MenuTab::menuStyleChanged()
 {
+    // Classic K Menu	
     if (m_comboMenuStyle->currentItem()==1) {
        m_openOnHover->setEnabled(false);
        m_subMenus->setEnabled(true);
        kcfg_UseSidePixmap->setEnabled(true);
+       kcfg_UseTooltip->setEnabled(true);
        kcfg_MenuEntryFormat->setEnabled(true);
        kcfg_RecentVsOften->setEnabled(true);
        m_showFrequent->setEnabled(true);
@@ -183,10 +185,13 @@ void MenuTab::menuStyleChanged()
        maxrecentdocs->setEnabled(true);
        kcfg_NumVisibleEntries->setEnabled(true);
     }
+    
+    // Kickoff Menu
     else {
        m_openOnHover->setEnabled(true);
        m_subMenus->setEnabled(false);
        kcfg_UseSidePixmap->setEnabled(false);
+       kcfg_UseTooltip->setEnabled(false);
        kcfg_MenuEntryFormat->setEnabled(false);
        kcfg_RecentVsOften->setEnabled(false);
        m_showFrequent->setEnabled(false);
@@ -261,6 +266,13 @@ void MenuTab::save()
         forceRestart = true;
     }
 
+    bool tooltipsetting = kcfg_UseTooltip->isChecked();
+    bool oldtooltipsetting = c->readBoolEntry("UseTooltip", false);
+
+    if (tooltipsetting != oldtooltipsetting) {
+        forceRestart = true;
+    }
+
     // Save KMenu settings
     c->setGroup("KMenu");
     c->writeEntry("CustomIcon", m_kmenu_icon);
-- 
cgit v1.2.1