diff --git a/usr/lib/linuxmint/mintMenu/keybinding.py b/usr/lib/linuxmint/mintMenu/keybinding.py index 783cc86..ae9d96a 100644 --- a/usr/lib/linuxmint/mintMenu/keybinding.py +++ b/usr/lib/linuxmint/mintMenu/keybinding.py @@ -178,10 +178,9 @@ class GlobalKeyBinding(GObject.GObject, threading.Thread): self.display.close() class KeymapKey(Structure): - _fields_ = [("keycode", c_uint), - ("group", c_int), - ("level", c_int)] - + _fields_ = [("keycode", c_uint), + ("group", c_int), + ("level", c_int)] class KeybindingWidget(Gtk.HBox): __gsignals__ = { diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.py b/usr/lib/linuxmint/mintMenu/mintMenu.py index 1b4fd07..3f9e24b 100755 --- a/usr/lib/linuxmint/mintMenu/mintMenu.py +++ b/usr/lib/linuxmint/mintMenu/mintMenu.py @@ -697,15 +697,15 @@ class MenuWin( object ): self.button_icon.size_request(bi_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.hideIcon: - self.applet.set_size_request( sl_req.width + 2, bi_req.height ) - else: - self.applet.set_size_request( sl_req.width + bi_req.width + 5, bi_req.height ) + if self.hideIcon: + self.applet.set_size_request( sl_req.width + 2, bi_req.height ) + else: + self.applet.set_size_request( sl_req.width + bi_req.width + 5, bi_req.height ) else: - if self.hideIcon: - self.applet.set_size_request( bi_req.width, sl_req.height + 2 ) - else: - self.applet.set_size_request( bi_req.width, sl_req.height + bi_req.height + 5 ) + if self.hideIcon: + self.applet.set_size_request( bi_req.width, sl_req.height + 2 ) + else: + self.applet.set_size_request( bi_req.width, sl_req.height + bi_req.height + 5 ) def reloadSettings( self, *args ): self.loadSettings() diff --git a/usr/lib/linuxmint/mintMenu/plugins/system_management.py b/usr/lib/linuxmint/mintMenu/plugins/system_management.py index 617a799..5ec974f 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/system_management.py +++ b/usr/lib/linuxmint/mintMenu/plugins/system_management.py @@ -167,11 +167,11 @@ class pluginclass( object ): self.mintMenuWin.setTooltip( Button4, _("Use the command line") ) if self.de == "xfce": - Button6 = easyButton( "system-log-out", self.iconsize, [_("Logout")], -1, -1 ) - Button6.connect( "clicked", self.ButtonClicked, "xfce4-session-logout" ) - Button6.show() - self.systemBtnHolder.pack_start( Button6, False, False, 0 ) - self.mintMenuWin.setTooltip( Button6, _("Log out or switch user") ) + Button6 = easyButton( "system-log-out", self.iconsize, [_("Logout")], -1, -1 ) + Button6.connect( "clicked", self.ButtonClicked, "xfce4-session-logout" ) + Button6.show() + self.systemBtnHolder.pack_start( Button6, False, False, 0 ) + self.mintMenuWin.setTooltip( Button6, _("Log out or switch user") ) else: if ( self.showLockScreen == True ): Button5 = easyButton( "system-lock-screen", self.iconsize, [_("Lock Screen")], -1, -1 )