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

Merge pull request #114 from monsta/patch-9

Browse Source 
small fixes
This commit is contained in:
Clement Lefebvre 2015-02-24 13:15:33 +00:00
commit bc98ede28e
5 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr/lib/linuxmint/mintMenu/keybinding.py
View File

@ -178,10 +178,9 @@ class GlobalKeyBinding(GObject.GObject, threading.Thread):
self.display.close() self.display.close()
class KeymapKey(Structure): class KeymapKey(Structure):
_fields_ = [("keycode", c_uint), _fields_ = [("keycode", c_uint),
("group", c_int), ("group", c_int),
("level", c_int)] ("level", c_int)]
class KeybindingWidget(Gtk.HBox): class KeybindingWidget(Gtk.HBox):
__gsignals__ = { __gsignals__ = {

16
usr/lib/linuxmint/mintMenu/mintMenu.py
View File

@ -697,15 +697,15 @@ class MenuWin( object ):
self.button_icon.size_request(bi_req) self.button_icon.size_request(bi_req)
self.systemlabel.size_request(sl_req) self.systemlabel.size_request(sl_req)
if self.applet.get_orient() == MatePanelApplet.AppletOrient.UP or self.applet.get_orient() == MatePanelApplet.AppletOrient.DOWN: if self.applet.get_orient() == MatePanelApplet.AppletOrient.UP or self.applet.get_orient() == MatePanelApplet.AppletOrient.DOWN:
if self.hideIcon: if self.hideIcon:
self.applet.set_size_request( sl_req.width + 2, bi_req.height ) self.applet.set_size_request( sl_req.width + 2, bi_req.height )
else: else:
self.applet.set_size_request( sl_req.width + bi_req.width + 5, bi_req.height ) self.applet.set_size_request( sl_req.width + bi_req.width + 5, bi_req.height )
else: else:
if self.hideIcon: if self.hideIcon:
self.applet.set_size_request( bi_req.width, sl_req.height + 2 ) self.applet.set_size_request( bi_req.width, sl_req.height + 2 )
else: else:
self.applet.set_size_request( bi_req.width, sl_req.height + bi_req.height + 5 ) self.applet.set_size_request( bi_req.width, sl_req.height + bi_req.height + 5 )
def reloadSettings( self, *args ): def reloadSettings( self, *args ):
self.loadSettings() self.loadSettings()

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

@ -205,9 +205,9 @@ class SuggestionButton ( Gtk.Button ):
self.image.set_from_stock( self.iconName, size ) self.image.set_from_stock( self.iconName, size )
class TargetEntry(Structure): class TargetEntry(Structure):
_fields_ = [("target", c_char_p), _fields_ = [("target", c_char_p),
("flags", c_int), ("flags", c_int),
("info", c_int)] ("info", c_int)]
class pluginclass( object ): class pluginclass( object ):
TARGET_TYPE_TEXT = 80 TARGET_TYPE_TEXT = 80
@ -472,7 +472,11 @@ class pluginclass( object ):
# save old config - this is necessary because the app will notified when it sets the default values and you don't want the to reload itself several times # save old config - this is necessary because the app will notified when it sets the default values and you don't want the to reload itself several times
oldcategories_mouse_over = self.categories_mouse_over oldcategories_mouse_over = self.categories_mouse_over
oldtotalrecent = self.totalrecent oldiconsize = self.iconSize
oldfaviconsize = self.faviconsize
oldswapgeneric = self.swapgeneric
oldshowcategoryicons = self.showcategoryicons
oldcategoryhoverdelay = self.categoryhoverdelay
oldsticky = self.sticky oldsticky = self.sticky
oldminimized = self.minimized oldminimized = self.minimized
oldicon = self.icon oldicon = self.icon
@ -482,7 +486,7 @@ class pluginclass( object ):
self.GetGSettingsEntries() self.GetGSettingsEntries()
# if the config hasn't changed return # if the config hasn't changed return
if oldcategories_mouse_over == self.categories_mouse_over and oldiconsize == self.iconSize and oldfaviconsize == self.faviconsize and oldtotalrecent == self.totalrecent and oldswapgeneric == self.swapgeneric and oldshowcategoryicons == self.showcategoryicons and oldcategoryhoverdelay == self.categoryhoverdelay and oldsticky == self.sticky and oldminimized == self.minimized and oldicon == self.icon and oldhideseparator == self.hideseparator and oldshowapplicationcomments == self.showapplicationcomments: if oldcategories_mouse_over == self.categories_mouse_over and oldiconsize == self.iconSize and oldfaviconsize == self.faviconsize and oldswapgeneric == self.swapgeneric and oldshowcategoryicons == self.showcategoryicons and oldcategoryhoverdelay == self.categoryhoverdelay and oldsticky == self.sticky and oldminimized == self.minimized and oldicon == self.icon and oldhideseparator == self.hideseparator and oldshowapplicationcomments == self.showapplicationcomments:
return return
self.Todos() self.Todos()
@ -776,14 +780,14 @@ class pluginclass( object ):
found_packages.append(pkg) found_packages.append(pkg)
if len(found_packages) > 0: if len(found_packages) > 0:
last_separator = Gtk.EventBox() last_separator = Gtk.EventBox()
last_separator.add(Gtk.HSeparator()) last_separator.add(Gtk.HSeparator())
last_separator.set_visible_window(False) last_separator.set_visible_window(False)
last_separator.set_size_request(-1, 20) last_separator.set_size_request(-1, 20)
last_separator.type = "separator" last_separator.type = "separator"
last_separator.show_all() last_separator.show_all()
self.applicationsBox.add(last_separator) self.applicationsBox.add(last_separator)
self.suggestions.append(last_separator) self.suggestions.append(last_separator)
for pkg in found_packages: for pkg in found_packages:
name = pkg.name name = pkg.name
@ -1403,7 +1407,6 @@ class pluginclass( object ):
def buildFavorites( self ): def buildFavorites( self ):
try: try:
from user import home
if (not os.path.exists(home + "/.linuxmint/mintMenu/applications.list")): if (not os.path.exists(home + "/.linuxmint/mintMenu/applications.list")):
os.system("mkdir -p " + home + "/.linuxmint/mintMenu/applications") os.system("mkdir -p " + home + "/.linuxmint/mintMenu/applications")
os.system("cp /usr/lib/linuxmint/mintMenu/applications.list " + home + "/.linuxmint/mintMenu/applications.list") os.system("cp /usr/lib/linuxmint/mintMenu/applications.list " + home + "/.linuxmint/mintMenu/applications.list")

2
usr/lib/linuxmint/mintMenu/plugins/execute.py
View File

@ -1,7 +1,6 @@
#!/usr/bin/python #!/usr/bin/python
import os import os
import subprocess
def RemoveArgs(Execline): def RemoveArgs(Execline):
NewExecline = [] NewExecline = []
@ -40,7 +39,6 @@ def Execute( cmd , commandCwd=None):
os.chdir( cwd ) os.chdir( cwd )
string = ' '.join(cmd) string = ' '.join(cmd)
string = string + " &" string = string + " &"
#subprocess.Popen( cmd ) // use os.system instead of popen so children don't end up in zombie waiting for us to wait() for them
os.system(string) os.system(string)
return True return True
except Exception, detail: except Exception, detail:

10
usr/lib/linuxmint/mintMenu/plugins/system_management.py
View File

@ -167,11 +167,11 @@ class pluginclass( object ):
self.mintMenuWin.setTooltip( Button4, _("Use the command line") ) self.mintMenuWin.setTooltip( Button4, _("Use the command line") )
if self.de == "xfce": if self.de == "xfce":
Button6 = easyButton( "system-log-out", self.iconsize, [_("Logout")], -1, -1 ) Button6 = easyButton( "system-log-out", self.iconsize, [_("Logout")], -1, -1 )
Button6.connect( "clicked", self.ButtonClicked, "xfce4-session-logout" ) Button6.connect( "clicked", self.ButtonClicked, "xfce4-session-logout" )
Button6.show() Button6.show()
self.systemBtnHolder.pack_start( Button6, False, False, 0 ) self.systemBtnHolder.pack_start( Button6, False, False, 0 )
self.mintMenuWin.setTooltip( Button6, _("Log out or switch user") ) self.mintMenuWin.setTooltip( Button6, _("Log out or switch user") )
else: else:
if ( self.showLockScreen == True ): if ( self.showLockScreen == True ):
Button5 = easyButton( "system-lock-screen", self.iconsize, [_("Lock Screen")], -1, -1 ) Button5 = easyButton( "system-lock-screen", self.iconsize, [_("Lock Screen")], -1, -1 )