diff --git a/debian/control b/debian/control index a2d2733..6ed4911 100644 --- a/debian/control +++ b/debian/control @@ -26,8 +26,7 @@ Depends: gir1.2-matepanelapplet-4.0, gir1.2-gtk-3.0, gir1.2-mate-desktop, - gir1.2-xapp-1.0, - menulibre | mozo + gir1.2-xapp-1.0 Description: Advanced MATE menu One of the most advanced menus under Linux. MintMenu supports filtering, favorites, easy-uninstallation, autosession, and many other features. diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.py b/usr/lib/linuxmint/mintMenu/mintMenu.py index 1ec3280..aeab6f2 100755 --- a/usr/lib/linuxmint/mintMenu/mintMenu.py +++ b/usr/lib/linuxmint/mintMenu/mintMenu.py @@ -597,7 +597,7 @@ class MenuWin(object): def showMenuEditor(self, action, userdata = None): if os.path.exists("/usr/bin/menulibre"): Execute("menulibre") - else: + elif os.path.exists("/usr/bin/mozo"): Execute("mozo") def showMenu(self, widget=None, event=None): @@ -692,13 +692,16 @@ class MenuWin(object): # this callback is to create a context menu def create_menu(self): + menu_file = "popup-without-edit.xml" action_group = Gtk.ActionGroup(name="context-menu") action = Gtk.Action(name="MintMenuPrefs", label=_("Preferences"), tooltip=None) action.connect("activate", self.showPreferences) action_group.add_action(action) - action = Gtk.Action(name="MintMenuEdit", label=_("Edit menu"), tooltip=None) - action.connect("activate", self.showMenuEditor) - action_group.add_action(action) + if os.path.exists("/usr/bin/menulibre") or os.path.exists("/usr/bin/mozo"): + action = Gtk.Action(name="MintMenuEdit", label=_("Edit menu"), tooltip=None) + action.connect("activate", self.showMenuEditor) + action_group.add_action(action) + menu_file = "popup.xml" action = Gtk.Action(name="MintMenuReload", label=_("Reload plugins"), tooltip=None) action.connect("activate", self.mainwin.RegenPlugins) action_group.add_action(action) @@ -707,7 +710,7 @@ class MenuWin(object): action_group.add_action(action) action_group.set_translation_domain ("mintmenu") - xml = os.path.join(os.path.join(os.path.dirname(__file__)), "popup.xml") + xml = os.path.join(os.path.join(os.path.dirname(__file__)), menu_file) self.applet.setup_menu_from_file(xml, action_group) def detect_desktop_environment (self): diff --git a/usr/lib/linuxmint/mintMenu/popup-without-edit.xml b/usr/lib/linuxmint/mintMenu/popup-without-edit.xml new file mode 100644 index 0000000..d185595 --- /dev/null +++ b/usr/lib/linuxmint/mintMenu/popup-without-edit.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file