From b7cf05009a66b24944f3e26f2d6b19e01905d20b Mon Sep 17 00:00:00 2001 From: Clement Lefebvre Date: Fri, 18 Nov 2011 18:00:10 +0000 Subject: [PATCH 1/3] Adjusted dependencies for MATE --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d8c0f5a..7028c05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mintmenu (5.2.6) lisa; urgency=low + + * Adjusted dependencies for MATE + + -- Clement Lefebvre Fri, 18 Nov 2011 17:58:00 +0000 + mintmenu (5.2.5) lisa; urgency=low * Switched support from Gnome/Bonobo to Mate/MateComponent diff --git a/debian/control b/debian/control index 833c8cd..c780fa1 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,6 @@ Standards-Version: 3.7.2 Package: mintmenu Architecture: all -Depends: python (>= 2.4), python (<< 3), python-gtk2, python-glade2, deskbar-applet, mint-common, python-gmenu, python-gnomeapplet +Depends: python (>= 2.4), python (<< 3), python-gtk2, python-glade2, mint-common, python-mate-menu, python-mate-desktop, python-corba, python-mate Description: Advanced Gnome menu One of the most advanced menus under Linux. MintMenu supports filtering, favorites, easy-uninstallation, autosession, and many other features. From bc7266ae852ff1b1c8e7bde05a551bcb1cccb1d5 Mon Sep 17 00:00:00 2001 From: Clement Lefebvre Date: Mon, 28 Nov 2011 12:44:49 +0000 Subject: [PATCH 2/3] Caja replaces Nautilus and mate-terminal replaces xdg terminal in MATE --- debian/changelog | 6 ++++ usr/lib/linuxmint/mintMenu/plugins/places.py | 29 +++++++++++++++---- .../mintMenu/plugins/system_management.py | 5 +++- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7028c05..a750664 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mintmenu (5.2.7) lisa; urgency=low + + * Replaced system and places shortcut in MATE to use caja and mate-terminal + + -- Clement Lefebvre Mon, 28 Nov 2011 12:43:49 +0000 + mintmenu (5.2.6) lisa; urgency=low * Adjusted dependencies for MATE diff --git a/usr/lib/linuxmint/mintMenu/plugins/places.py b/usr/lib/linuxmint/mintMenu/plugins/places.py index e44d2e4..6fee8c1 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/places.py +++ b/usr/lib/linuxmint/mintMenu/plugins/places.py @@ -147,7 +147,7 @@ class pluginclass( object ): if ( self.showcomputer == True ): Button1 = easyButton( "computer", self.iconsize, [_("Computer")], -1, -1 ) if self.de == "mate": - Button1.connect( "clicked", self.ButtonClicked, "nautilus computer:" ) + Button1.connect( "clicked", self.ButtonClicked, "caja computer:" ) else: Button1.connect( "clicked", self.ButtonClicked, "xdg-open /" ) Button1.show() @@ -156,7 +156,10 @@ class pluginclass( object ): if ( self.showhomefolder == True ): Button2 = easyButton( "user-home", self.iconsize, [_("Home Folder")], -1, -1 ) - Button2.connect( "clicked", self.ButtonClicked, "xdg-open %s " % home ) + if self.de == "mate": + Button2.connect( "clicked", self.ButtonClicked, "caja %s " % home ) + else: + Button2.connect( "clicked", self.ButtonClicked, "xdg-open %s " % home ) Button2.show() self.placesBtnHolder.pack_start( Button2, False, False ) self.mintMenuWin.setTooltip( Button2, _("Open your personal folder") ) @@ -168,7 +171,10 @@ class pluginclass( object ): Button3 = easyButton( "notification-network-ethernet-connected", self.iconsize, [_("Network")], -1, -1) else: Button3 = easyButton( "network-workgroup", self.iconsize, [_("Network")], -1, -1) - Button3.connect( "clicked", self.ButtonClicked, "nautilus network:" ) + if self.de == "mate": + Button3.connect( "clicked", self.ButtonClicked, "caja network:" ) + else: + Button3.connect( "clicked", self.ButtonClicked, "xdg-open network:" ) Button3.show() self.placesBtnHolder.pack_start( Button3, False, False ) self.mintMenuWin.setTooltip( Button3, _("Browse bookmarked and local network locations") ) @@ -188,7 +194,10 @@ class pluginclass( object ): except Exception, detail: print detail Button4 = easyButton( "mate-fs-desktop", self.iconsize, [_("Desktop")], -1, -1 ) - Button4.connect( "clicked", self.ButtonClicked, "xdg-open \"" + desktopDir + "\"") + if self.de == "mate": + Button4.connect( "clicked", self.ButtonClicked, "caja \"" + desktopDir + "\"") + else: + Button4.connect( "clicked", self.ButtonClicked, "xdg-open \"" + desktopDir + "\"") Button4.show() self.placesBtnHolder.pack_start( Button4, False, False ) self.mintMenuWin.setTooltip( Button4, _("Browse items placed on the desktop") ) @@ -197,6 +206,8 @@ class pluginclass( object ): self.trashButton = easyButton( "user-trash", self.iconsize, [_("Trash")], -1, -1 ) if self.de == "xfce": self.trashButton.connect( "clicked", self.ButtonClicked, "thunar trash:" ) + elif self.de == "mate": + self.trashButton.connect( "clicked", self.ButtonClicked, "caja trash:" ) else: self.trashButton.connect( "clicked", self.ButtonClicked, "xdg-open trash:" ) self.trashButton.show() @@ -209,7 +220,10 @@ class pluginclass( object ): for index in range( len(self.custompaths) ): path = self.custompaths[index] path = path.replace("~", home) - command = ( "xdg-open \"" + path + "\"") + if self.de == "mate": + command = ( "caja \"" + path + "\"") + else: + command = ( "xdg-open \"" + path + "\"") currentbutton = easyButton( "folder", self.iconsize, [self.customnames[index]], -1, -1 ) currentbutton.connect( "clicked", self.ButtonClicked, command ) currentbutton.show() @@ -239,7 +253,10 @@ class pluginclass( object ): def launch_gtk_bookmark (self, widget, path): self.mintMenuWin.hide() - os.system("xdg-open %s &" % path) + if self.de == "mate": + os.system("caja %s &" % path) + else: + os.system("xdg-open %s &" % path) def trashPopup( self, widget, event ): if event.button == 3: diff --git a/usr/lib/linuxmint/mintMenu/plugins/system_management.py b/usr/lib/linuxmint/mintMenu/plugins/system_management.py index 39c9dc8..ed7fef2 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/system_management.py +++ b/usr/lib/linuxmint/mintMenu/plugins/system_management.py @@ -155,7 +155,10 @@ class pluginclass( object ): if ( self.showTerminal == True ): Button4 = easyButton( "mate-terminal", self.iconsize, [_("Terminal")], -1, -1 ) - Button4.connect( "clicked", self.ButtonClicked, "x-terminal-emulator" ) + if os.path.exists("/usr/bin/mate-terminal"): + Button4.connect( "clicked", self.ButtonClicked, "mate-terminal" ) + else: + Button4.connect( "clicked", self.ButtonClicked, "x-terminal-emulator" ) Button4.show() self.systemBtnHolder.pack_start( Button4, False, False ) self.mintMenuWin.setTooltip( Button4, _("Use the command line") ) From d53fb8382f8428e434d869005585ce265f23d85c Mon Sep 17 00:00:00 2001 From: Clement Lefebvre Date: Thu, 1 Dec 2011 20:06:10 +0000 Subject: [PATCH 3/3] Fixed "Add to panel" in applications plugin --- debian/changelog | 6 ++++++ usr/lib/linuxmint/mintMenu/plugins/applications.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a750664..a2ccc34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mintmenu (5.2.8) lisa; urgency=low + + * Fixed "Add to panel" in applications plugin + + -- Clement Lefebvre Thu, 01 Dec 2011 20:05:40 +0000 + mintmenu (5.2.7) lisa; urgency=low * Replaced system and places shortcut in MATE to use caja and mate-terminal diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.py b/usr/lib/linuxmint/mintMenu/plugins/applications.py index 1af681e..8088b36 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/applications.py +++ b/usr/lib/linuxmint/mintMenu/plugins/applications.py @@ -333,7 +333,7 @@ class pluginclass( object ): self.panel_position = 0 appletidlist = mateconf.client_get_default().get_list("/apps/panel/general/applet_id_list", "string") for applet in appletidlist: - bonobo_id = mateconf.client_get_default().get_string("/apps/panel/applets/" + applet + "/bonobo_iid") + bonobo_id = mateconf.client_get_default().get_string("/apps/panel/applets/" + applet + "/applet_iid") if bonobo_id == "OAFIID:MATE_mintMenu": self.panel = mateconf.client_get_default().get_string("/apps/panel/applets/" + applet + "/toplevel_id") self.panel_position = mateconf.client_get_default().get_int("/apps/panel/applets/" + applet + "/position") + 1