jbah.skp/mintmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed merge conflicts

Browse Source
This commit is contained in:
Clement Lefebvre 2014-03-18 11:32:06 +00:00
parent b013fa83ae
commit 524d7c7408
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr/lib/linuxmint/mintMenu/plugins/applications.py
View File

@ -1045,13 +1045,8 @@ class pluginclass( object ):
startupMenuItem.set_active( False ) startupMenuItem.set_active( False )
startupMenuItem.connect( "toggled", self.onAddToStartup, widget ) startupMenuItem.connect( "toggled", self.onAddToStartup, widget )
<<<<<<< HEAD
mTree.connect( 'deactivate', self.onMenuPopupDeactivate)
gtk.gtk_menu_popup(hash(mTree), None, None, None, None, event.button, event.time)
=======
self.mintMenuWin.stopHiding() self.mintMenuWin.stopHiding()
gtk.gtk_menu_popup(hash(mTree), None, None, None, None, 0, 0) gtk.gtk_menu_popup(hash(mTree), None, None, None, None, event.button, event.time)
>>>>>>> b14e2e04503d8451b679e3f1f9e43b6a9758047f
def searchPopup( self, widget=None, event=None ): def searchPopup( self, widget=None, event=None ):
@ -1127,24 +1122,15 @@ class pluginclass( object ):
menu.append(menuItem) menu.append(menuItem)
menu.show_all() menu.show_all()
<<<<<<< HEAD
gtk.gtk_menu_popup(hash(menu), None, None, None, None, event.button, event.time)
=======
self.mintMenuWin.stopHiding() self.mintMenuWin.stopHiding()
gtk.gtk_menu_popup(hash(menu), None, None, None, None, 3, 0) gtk.gtk_menu_popup(hash(menu), None, None, None, None, event.button, event.time)
>>>>>>> b14e2e04503d8451b679e3f1f9e43b6a9758047f
#menu.attach_to_widget(self.searchButton, None) #menu.attach_to_widget(self.searchButton, None)
#menu.reposition() #menu.reposition()
#menu.reposition() #menu.reposition()
#self.mintMenuWin.grab() #self.mintMenuWin.grab()
<<<<<<< HEAD
menu.connect( 'deactivate', self.onMenuPopupDeactivate)
=======
self.focusSearchEntry() self.focusSearchEntry()
>>>>>>> b14e2e04503d8451b679e3f1f9e43b6a9758047f
return True return True
def pos_func(self, menu=None): def pos_func(self, menu=None):