diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.py b/usr/lib/linuxmint/mintMenu/mintMenu.py index 834c441..8379a64 100755 --- a/usr/lib/linuxmint/mintMenu/mintMenu.py +++ b/usr/lib/linuxmint/mintMenu/mintMenu.py @@ -201,10 +201,10 @@ class MainWindow( object ): self.globalEnableTooltips = mate_settings.get_boolean( "tooltips-enabled" ) def SetupMintMenuBorder( self ): - if self.usecustomcolor: - self.window.modify_bg( Gtk.StateType.NORMAL, Gdk.color_parse( self.custombordercolor ) ) - else: - self.window.modify_bg( Gtk.StateType.NORMAL, self.window.rc_get_style().bg[ Gtk.StateType.SELECTED ] ) + # if self.usecustomcolor: + # self.window.modify_bg( Gtk.StateType.NORMAL, Gdk.color_parse( self.custombordercolor ) ) + # else: + # self.window.modify_bg( Gtk.StateType.NORMAL, self.window.rc_get_style().bg[ Gtk.StateType.SELECTED ] ) self.border.set_padding( self.borderwidth, self.borderwidth, self.borderwidth, self.borderwidth ) def SetupMintMenuOpacity( self ): @@ -384,16 +384,16 @@ class MainWindow( object ): #print u"Loading", (time.time() - start), "s" def SetPaneColors( self, items ): - for item in items: - if item not in self.panesToColor: - self.panesToColor.append( item ) - if self.usecustomcolor: - for item in items: - item.modify_bg( Gtk.StateType.NORMAL, Gdk.color_parse( self.customcolor ) ) - else: - for item in items: - item.modify_bg( Gtk.StateType.NORMAL, self.paneholder.rc_get_style().bg[ Gtk.StateType.NORMAL ] ) - + # for item in items: + # if item not in self.panesToColor: + # self.panesToColor.append( item ) + # if self.usecustomcolor: + # for item in items: + # item.modify_bg( Gtk.StateType.NORMAL, Gdk.color_parse( self.customcolor ) ) + # else: + # for item in items: + # item.modify_bg( Gtk.StateType.NORMAL, self.paneholder.rc_get_style().bg[ Gtk.StateType.NORMAL ] ) + pass def SetHeadingStyle( self, items ): return @@ -460,15 +460,16 @@ class MainWindow( object ): def grab( self ): gdk.gdk_pointer_grab (hash(self.window.window), True, Gdk.EventMask.BUTTON_PRESS_MASK, None, None, 0) Gdk.keyboard_grab( self.window.window, False, Gdk.CURRENT_TIME ) - Gtk.grab_add(self.window) + # Gtk.grab_add(self.window) def ungrab( self ): - Gtk.grab_remove(self.window) + # Gtk.grab_remove(self.window) self.window.hide() Gdk.pointer_ungrab(Gdk.CURRENT_TIME) Gdk.keyboard_ungrab(Gdk.CURRENT_TIME) def onMap( self, widget, event ): + return self.grab() def onShow( self, widget ): diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.py b/usr/lib/linuxmint/mintMenu/plugins/applications.py index 855b83f..b3a4b86 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/applications.py +++ b/usr/lib/linuxmint/mintMenu/plugins/applications.py @@ -6,7 +6,7 @@ gi.require_version("Gtk", "2.0") from gi.repository import Gtk, GObject, Pango, Gdk import os -import mateconf +#import mateconf import fnmatch import time import string @@ -335,14 +335,15 @@ class pluginclass( object ): os.system("/usr/lib/linuxmint/mintMenu/plugins/get_apt_cache.py > %s/.linuxmint/mintMenu/apt.cache &" % home) def get_panel(self): - self.panel = None - 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 + "/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 + pass + # self.panel = None +#FIX # 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 + "/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 def apturl_install(self, widget, pkg_name): if os.path.exists("/usr/bin/apturl"): @@ -920,7 +921,7 @@ class pluginclass( object ): #mTree.popup( None, None, None, ev.button, ev.time ) gtk.gtk_menu_popup(hash(mTree), None, None, None, None, None) - self.mintMenuWin.grab() + # self.mintMenuWin.grab() else: mTree = self.builder.get_object( "favoritesMenuExtra" ) @@ -938,7 +939,7 @@ class pluginclass( object ): insertSeparatorMenuItem.connect( "activate", self.onFavoritesInsertSeparator, widget, insertBefore ) #mTree.popup( None, None, None, ev.button, ev.time ) gtk.gtk_menu_popup(hash(mTree), None, None, None, ev.button, ev.time) - self.mintMenuWin.grab() + # self.mintMenuWin.grab() return True def menuPopup( self, widget, event ): @@ -1083,14 +1084,13 @@ class pluginclass( object ): menu.append(menuItem) menu.show_all() - print "show" #menu.popup( None, None, self.pos_func, 3, 0) - gtk.gtk_menu_popup(hash(menu), None, None, None, 3, 0) + gtk.gtk_menu_popup(hash(menu), None, None, None, None, 3, 0) #menu.popup( None, None, None, 3, 0) #menu.attach_to_widget(self.searchButton, None) #menu.reposition() #menu.reposition() - self.mintMenuWin.grab() + # self.mintMenuWin.grab() self.focusSearchEntry() return True @@ -1177,28 +1177,28 @@ class pluginclass( object ): os.system("cp \"%s\" \"%s\"" % (desktopEntry.desktopFile, new_file)) os.system("chmod a+rx %s" % (new_file)) - # Add to Gnome/GConf - object_dir = "/apps/panel/objects/" - object_client = mateconf.client_get_default() + #FIX # Add to Gnome/GConf + # object_dir = "/apps/panel/objects/" + # object_client = mateconf.client_get_default() - object_client.set_string(object_dir + object_name +"/"+ "menu_path", "applications:/") - object_client.set_bool(object_dir + object_name +"/"+ "locked", False) - object_client.set_int(object_dir + object_name +"/"+ "position", self.panel_position) - object_client.set_string(object_dir + object_name +"/"+ "object_type", "launcher-object") - object_client.set_bool(object_dir + object_name +"/"+ "panel_right_stick", False) - object_client.set_bool(object_dir + object_name +"/"+ "use_menu_path", False) - object_client.set_string(object_dir + object_name +"/"+ "launcher_location", new_file) - object_client.set_string(object_dir + object_name +"/"+ "custom_icon", "") - object_client.set_string(object_dir + object_name +"/"+ "tooltip", "") - object_client.set_string(object_dir + object_name +"/"+ "action_type", "lock") - object_client.set_bool(object_dir + object_name +"/"+ "use_custom_icon", False) - object_client.set_string(object_dir + object_name +"/"+ "attached_toplevel_id", "") - object_client.set_string(object_dir + object_name +"/"+ "bonobo_iid", "") - object_client.set_string(object_dir + object_name +"/"+ "toplevel_id", self.panel) + # object_client.set_string(object_dir + object_name +"/"+ "menu_path", "applications:/") + # object_client.set_bool(object_dir + object_name +"/"+ "locked", False) + # object_client.set_int(object_dir + object_name +"/"+ "position", self.panel_position) + # object_client.set_string(object_dir + object_name +"/"+ "object_type", "launcher-object") + # object_client.set_bool(object_dir + object_name +"/"+ "panel_right_stick", False) + # object_client.set_bool(object_dir + object_name +"/"+ "use_menu_path", False) + # object_client.set_string(object_dir + object_name +"/"+ "launcher_location", new_file) + # object_client.set_string(object_dir + object_name +"/"+ "custom_icon", "") + # object_client.set_string(object_dir + object_name +"/"+ "tooltip", "") + # object_client.set_string(object_dir + object_name +"/"+ "action_type", "lock") + # object_client.set_bool(object_dir + object_name +"/"+ "use_custom_icon", False) + # object_client.set_string(object_dir + object_name +"/"+ "attached_toplevel_id", "") + # object_client.set_string(object_dir + object_name +"/"+ "bonobo_iid", "") + # object_client.set_string(object_dir + object_name +"/"+ "toplevel_id", self.panel) - launchers_list = object_client.get_list("/apps/panel/general/object_id_list", "string") - launchers_list.append(object_name) - object_client.set_list("/apps/panel/general/object_id_list", mateconf.VALUE_STRING, launchers_list) + # launchers_list = object_client.get_list("/apps/panel/general/object_id_list", "string") + # launchers_list.append(object_name) + # object_client.set_list("/apps/panel/general/object_id_list", mateconf.VALUE_STRING, launchers_list) def delete_from_menu(self, widget, desktopEntry): try: diff --git a/usr/lib/linuxmint/mintMenu/plugins/easygsettings.py b/usr/lib/linuxmint/mintMenu/plugins/easygsettings.py index 99f3e48..ca93f7e 100644 --- a/usr/lib/linuxmint/mintMenu/plugins/easygsettings.py +++ b/usr/lib/linuxmint/mintMenu/plugins/easygsettings.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -import mateconf + from gi.repository import Gio class EasyGSettings: diff --git a/usr/lib/linuxmint/mintMenu/plugins/places.py b/usr/lib/linuxmint/mintMenu/plugins/places.py index 24ca1af..c625589 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/places.py +++ b/usr/lib/linuxmint/mintMenu/plugins/places.py @@ -258,9 +258,9 @@ class pluginclass( object ): trashMenu.append(emptyTrashMenuItem) trashMenu.show_all() emptyTrashMenuItem.connect ( "activate", self.emptyTrash, widget ) - gtk.gtk_menu_popup(trashMenu, None, None, None, None, 3, 0) + gtk.gtk_menu_popup(hash(trashMenu), None, None, None, None, 3, 0) #trashMenu.popup( None, None, None, event.button, event.time ) - # self.mintMenuWin.grab() + #self.mintMenuWin.grab() return True