Add tooltip support in KMenu

(cherry picked from commit 718f6ae321b507dbb5bca737a1d1d486b2b41dc5)

1 files changed, 12 insertions, 0 deletions

diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index 3b5edc11f..b7356ea13 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -170,10 +170,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);
@@ -182,10 +184,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);
@@ -244,6 +249,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);