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

Merge branch 'button-focus' of https://github.com/hordepfo/mintmenu into hordepfo-button-focus

Browse Source 
Conflicts:
	usr/lib/linuxmint/mintMenu/plugins/applications.py
This commit is contained in:
Clement Lefebvre 2014-03-18 11:15:33 +00:00
commit c93ffb2ffe
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -879,12 +879,13 @@ class pluginclass( object ):
i.released() i.released()
i.set_relief( Gtk.ReliefStyle.NONE ) i.set_relief( Gtk.ReliefStyle.NONE )
widget.set_relief( Gtk.ReliefStyle.HALF ) widget.set_relief( Gtk.ReliefStyle.HALF )
widget.grab_focus()
self.searchEntry.set_text( "" )
self.applicationsScrolledWindow.get_vadjustment().set_value( 0 ) self.applicationsScrolledWindow.get_vadjustment().set_value( 0 )
def FilterAndClear( self, widget, category = None ):
self.searchEntry.set_text( "" )
self.Filter( widget, category )
# Forward all text to the search box # Forward all text to the search box
def keyPress( self, widget, event ): def keyPress( self, widget, event ):
if event.string.strip() != "" or event.keyval == Gdk.KEY_BackSpace: if event.string.strip() != "" or event.keyval == Gdk.KEY_BackSpace:
@ -1124,7 +1125,7 @@ class pluginclass( object ):
#menu.reposition() #menu.reposition()
#self.mintMenuWin.grab() #self.mintMenuWin.grab()
menu.connect( 'deactivate', self.onMenuPopupDeactivate) menu.connect( 'deactivate', self.onMenuPopupDeactivate)
#self.focusSearchEntry()
return True return True
def pos_func(self, menu=None): def pos_func(self, menu=None):
@ -1680,7 +1681,7 @@ class pluginclass( object ):
else: else:
item["button"].mouseOverHandlerIds = None item["button"].mouseOverHandlerIds = None
item["button"].connect( "clicked", self.Filter, item["filter"] ) item["button"].connect( "clicked", self.FilterAndClear, item["filter"] )
item["button"].connect( "focus-in-event", self.categoryBtnFocus, item["filter"] ) item["button"].connect( "focus-in-event", self.categoryBtnFocus, item["filter"] )
item["button"].show() item["button"].show()

4
usr/lib/linuxmint/mintMenu/plugins/easybuttons.py
View File

@ -283,7 +283,6 @@ class ApplicationLauncher( easyButton ):
self.connectSelf( "focus-in-event", self.onFocusIn ) self.connectSelf( "focus-in-event", self.onFocusIn )
self.connectSelf( "focus-out-event", self.onFocusOut ) self.connectSelf( "focus-out-event", self.onFocusOut )
self.connectSelf( "enter-notify-event", self.onEnterNotify )
self.connectSelf( "clicked", self.execute ) self.connectSelf( "clicked", self.execute )
@ -332,9 +331,6 @@ class ApplicationLauncher( easyButton ):
def onFocusOut( self, widget, event ): def onFocusOut( self, widget, event ):
self.set_relief( Gtk.ReliefStyle.NONE ) self.set_relief( Gtk.ReliefStyle.NONE )
def onEnterNotify( self, widget, event ):
self.grab_focus()
def setupLabels( self ): def setupLabels( self ):
self.addLabel( self.appName ) self.addLabel( self.appName )