diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.py b/usr/lib/linuxmint/mintMenu/mintMenu.py
index daf7b9a..275d885 100755
--- a/usr/lib/linuxmint/mintMenu/mintMenu.py
+++ b/usr/lib/linuxmint/mintMenu/mintMenu.py
@@ -73,9 +73,6 @@ class MainWindow(object):
plugindir = os.path.join(os.path.expanduser("~"), ".linuxmint/mintMenu/plugins")
sys.path.append(plugindir)
- self.panelSettings = Gio.Settings.new("org.mate.panel")
- self.panelSettings.connect("changed::tooltips-enabled", self.toggleTooltipsEnabled)
-
self.settings.connect("changed::plugins-list", self.RegenPlugins)
self.settings.connect("changed::start-with-favorites", self.toggleStartWithFavorites)
self.settings.connect("changed::tooltips-enabled", self.toggleTooltipsEnabled)
@@ -86,12 +83,9 @@ class MainWindow(object):
self.getSetGSettingEntries()
self.tooltipsWidgets = []
- if self.globalEnableTooltips and self.enableTooltips:
- self.tooltipsEnable()
- else:
- self.tooltipsEnable(False)
self.PopulatePlugins()
+ self.toggleTooltipsEnabled(self.settings, "tooltips-enabled")
self.firstTime = True
@classmethod
@@ -105,16 +99,10 @@ class MainWindow(object):
if hasattr(plugin, "wake"):
plugin.wake()
- def toggleTooltipsEnabled(self, settings, key, args = None):
- if key == "tooltips-enabled":
- self.globalEnableTooltips = settings.get_boolean(key)
- else:
- self.enableTooltips = settings.get_boolean(key)
-
- if self.globalEnableTooltips and self.enableTooltips:
- self.tooltipsEnable()
- else:
- self.tooltipsEnable(False)
+ def toggleTooltipsEnabled(self, settings, key, args=None):
+ enableTooltips = settings.get_boolean(key)
+ for widget in self.tooltipsWidgets:
+ widget.set_has_tooltip(enableTooltips)
def toggleStartWithFavorites(self, settings, key):
self.startWithFavorites = settings.get_boolean(key)
@@ -133,7 +121,6 @@ class MainWindow(object):
def getSetGSettingEntries(self):
self.dottedfile = os.path.join(self.path, "dotted.png")
-
self.pluginlist = self.settings.get_strv("plugins-list")
self.usecustomcolor = self.settings.get_boolean("use-custom-color")
self.customcolor = self.settings.get_string("custom-color")
@@ -142,8 +129,6 @@ class MainWindow(object):
self.enableTooltips = self.settings.get_boolean("tooltips-enabled")
self.startWithFavorites = self.settings.get_boolean("start-with-favorites")
- self.globalEnableTooltips = self.panelSettings.get_boolean("tooltips-enabled")
-
def PopulatePlugins(self):
self.panesToColor = []
self.headingsToColor = []
@@ -294,7 +279,6 @@ class MainWindow(object):
self.paneholder.pack_start(ImageBox, False, False, 0)
self.paneholder.pack_start(PluginPane, False, False, 0)
- self.tooltipsEnable(False)
# A little bit hacky but works.
@staticmethod
@@ -342,10 +326,6 @@ class MainWindow(object):
markup = '%s' % (color, text)
item.set_markup(markup)
- def tooltipsEnable(self, enable = True):
- for widget in self.tooltipsWidgets:
- widget.set_has_tooltip(enable)
-
def setTooltip(self, widget, tip):
self.tooltipsWidgets.append(widget)
widget.set_tooltip_text(tip)
@@ -373,6 +353,7 @@ class MainWindow(object):
self.getSetGSettingEntries()
self.PopulatePlugins()
+ self.toggleTooltipsEnabled(self.settings, "tooltips-enabled")
self.loadTheme()
#print NAME+u" reloaded"
diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade b/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
index 271e206..0e1cf81 100644
--- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
+++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
@@ -474,7 +474,7 @@
False
False
- 1
+ 0
@@ -490,7 +490,7 @@
False
False
- 2
+ 1
@@ -506,7 +506,7 @@
False
False
- 3
+ 2
@@ -519,6 +519,21 @@
start
True
+
+ False
+ False
+ 3
+
+
+
+
False
False
diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
index e1ba198..0a3d6cd 100755
--- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
+++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
@@ -47,6 +47,9 @@ class mintMenuConfig(object):
self.showApplicationsPlugin = self.builder.get_object("showApplicationsPlugin")
self.showSystemPlugin = self.builder.get_object("showSystemPlugin")
self.showPlacesPlugin = self.builder.get_object("showPlacesPlugin")
+
+ self.showTooltips = self.builder.get_object("showToolTips")
+
self.swapGeneric = self.builder.get_object("swapGeneric")
self.hover = self.builder.get_object("hover")
self.hoverDelay = self.builder.get_object("hoverDelay")
@@ -153,6 +156,7 @@ class mintMenuConfig(object):
self.showSystemPlugin.connect("toggled", self.setPluginsLayout)
self.showPlacesPlugin.connect("toggled", self.setPluginsLayout)
+ self.bindGSettingsValueToWidget(self.settings, "bool", "tooltips-enabled", self.showTooltips, "toggled", self.showTooltips.set_active, self.showTooltips.get_active)
self.bindGSettingsValueToWidget(self.settingsPlaces, "bool", "show-computer", self.computertoggle, "toggled", self.computertoggle.set_active, self.computertoggle.get_active)
self.bindGSettingsValueToWidget(self.settingsPlaces, "bool", "show-home-folder", self.homefoldertoggle, "toggled", self.homefoldertoggle.set_active, self.homefoldertoggle.get_active)
diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.py b/usr/lib/linuxmint/mintMenu/plugins/applications.py
index 13cc462..e3c5076 100755
--- a/usr/lib/linuxmint/mintMenu/plugins/applications.py
+++ b/usr/lib/linuxmint/mintMenu/plugins/applications.py
@@ -1480,7 +1480,6 @@ class pluginclass(object):
for item in addedCategories:
try:
item["button"] = CategoryButton(item["icon"], categoryIconSize, [item["name"]], item["filter"])
- self.mintMenuWin.setTooltip(item["button"], item["tooltip"])
if self.categories_mouse_over:
startId = item["button"].connect("enter", self.StartFilter, item["filter"])
diff --git a/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml b/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
index 65c00e9..95f078c 100644
--- a/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
+++ b/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
@@ -15,7 +15,7 @@
- true
+ false