diff --git a/usr/lib/linuxmint/mintMenu/compile.py b/usr/lib/linuxmint/mintMenu/compile.py index 16aede6..33e5cfe 100755 --- a/usr/lib/linuxmint/mintMenu/compile.py +++ b/usr/lib/linuxmint/mintMenu/compile.py @@ -3,4 +3,3 @@ import compileall compileall.compile_dir(".", force=1) - diff --git a/usr/lib/linuxmint/mintMenu/keybinding.py b/usr/lib/linuxmint/mintMenu/keybinding.py index f9e6b83..d6dd6d9 100644 --- a/usr/lib/linuxmint/mintMenu/keybinding.py +++ b/usr/lib/linuxmint/mintMenu/keybinding.py @@ -5,23 +5,23 @@ # Copyright (C) 2008 Luca Bruno # # This a slightly modified version of the globalkeybinding.py file which is part of FreeSpeak. -# +# # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: -# +# # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. -# +# # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. import gi @@ -62,8 +62,8 @@ class GlobalKeyBinding(GObject.GObject, threading.Thread): def map_modifiers(self): gdk_modifiers =(Gdk.ModifierType.CONTROL_MASK, Gdk.ModifierType.SHIFT_MASK, Gdk.ModifierType.MOD1_MASK, - Gdk.ModifierType.MOD2_MASK, Gdk.ModifierType.MOD3_MASK, Gdk.ModifierType.MOD4_MASK, Gdk.ModifierType.MOD5_MASK, - Gdk.ModifierType.SUPER_MASK, Gdk.ModifierType.HYPER_MASK) + Gdk.ModifierType.MOD2_MASK, Gdk.ModifierType.MOD3_MASK, Gdk.ModifierType.MOD4_MASK, Gdk.ModifierType.MOD5_MASK, + Gdk.ModifierType.SUPER_MASK, Gdk.ModifierType.HYPER_MASK) self.known_modifiers_mask = 0 for modifier in gdk_modifiers: if "Mod" not in Gtk.accelerator_name(0, modifier) or "Mod4" in Gtk.accelerator_name(0, modifier): @@ -100,14 +100,14 @@ class GlobalKeyBinding(GObject.GObject, threading.Thread): def ungrab(self): if self.keycode: self.window.ungrab_key(self.keycode, X.AnyModifier, self.window) - + def rebind(self, key): self.ungrab() if key != "": self.grab(key) else: self.keytext = "" - + def set_focus_window(self, window = None): self.ungrab() if window is None: diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.py b/usr/lib/linuxmint/mintMenu/mintMenu.py index 7ba4bfb..893d169 100755 --- a/usr/lib/linuxmint/mintMenu/mintMenu.py +++ b/usr/lib/linuxmint/mintMenu/mintMenu.py @@ -702,7 +702,7 @@ class MenuWin( object ): def showPreferences( self, action, userdata = None ): -# Execute( "mateconf-editor /apps/mintMenu" ) + # Execute( "mateconf-editor /apps/mintMenu" ) Execute( os.path.join( PATH, "mintMenuConfig.py" ) ) def showMenuEditor( self, action, userdata = None ): @@ -751,7 +751,7 @@ class MenuWin( object ): screenWidth = Gdk.Screen.width() if self.applet.get_orient() == MatePanelApplet.AppletOrient.UP or self.applet.get_orient() == MatePanelApplet.AppletOrient.DOWN: if entryX + ourWidth < screenWidth or entryX + entryWidth / 2 < screenWidth / 2: - # Align to the left of the entry + # Align to the left of the entry newX = entryX else: # Align to the right of the entry @@ -805,7 +805,7 @@ class MenuWin( object ): if de in ["gnome", "gnome-shell", "mate", "kde", "xfce"]: self.de = de elif de in ['cinnamon', 'x-cinnamon']: - self.de = 'cinnamon' + self.de = 'cinnamon' else: if os.path.exists("/usr/bin/caja"): self.de = "mate" @@ -826,4 +826,3 @@ def quit_all(widget): MatePanelApplet.Applet.factory_main("MintMenuAppletFactory", True, MatePanelApplet.Applet.__gtype__, applet_factory, None) - diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py index 2d29950..2b9b01c 100755 --- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py +++ b/usr/lib/linuxmint/mintMenu/mintMenuConfig.py @@ -515,7 +515,7 @@ class mintMenuConfig( object ): self.systemHeightButton.set_sensitive(False) def updatePlacesGSettings(self, treemodel, path, iter = None, new_order = None): -# Do only if not partway though an append operation; Append = insert+change+change and each creates a signal + # Do only if not partway though an append operation; Append = insert+change+change and each creates a signal if ((iter == None) or (self.customplacestreemodel.get_value(iter, 1) != None)): treeiter = self.customplacestreemodel.get_iter_first() customplacenames = [ ] diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.py b/usr/lib/linuxmint/mintMenu/plugins/applications.py index 15adca9..5fe4a8f 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/applications.py +++ b/usr/lib/linuxmint/mintMenu/plugins/applications.py @@ -222,7 +222,7 @@ class pluginclass( object ): # self.searchButton.connect( "button_release_event", self.SearchWithButton ) try: - # GSettings stuff + # GSettings stuff self.settings = EasyGSettings( "com.linuxmint.mintmenu.plugins.applications" ) self.GetGSettingsEntries() self.settings.notifyAdd( "icon-size", self.changeIconSize ) @@ -792,7 +792,7 @@ class pluginclass( object ): # We're restricting our search... self.add_search_suggestions(text) #if (len(self.current_results) > 0): - #self.add_apt_filter_results_sync(self.current_results, text) + #self.add_apt_filter_results_sync(self.current_results, text) #else: GLib.timeout_add (300, self.add_apt_filter_results, text) else: diff --git a/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py b/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py index 275b128..0d732f8 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py +++ b/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py @@ -17,7 +17,7 @@ from filemonitor import monitor as filemonitor class IconManager(GObject.GObject): __gsignals__ = { - "changed" : (GObject.SignalFlags.RUN_LAST, None, () ) + "changed" : (GObject.SignalFlags.RUN_LAST, None, () ) } def __init__( self ): diff --git a/usr/lib/linuxmint/mintMenu/plugins/easygsettings.py b/usr/lib/linuxmint/mintMenu/plugins/easygsettings.py index af2097b..c101823 100644 --- a/usr/lib/linuxmint/mintMenu/plugins/easygsettings.py +++ b/usr/lib/linuxmint/mintMenu/plugins/easygsettings.py @@ -90,5 +90,3 @@ class EasyGSettings: setattr( obj, varName, settings.get_boolean(key) ) else: setattr( obj, varName, settings.get_value(key) ) - - diff --git a/usr/lib/linuxmint/mintMenu/plugins/execute.py b/usr/lib/linuxmint/mintMenu/plugins/execute.py index 9e1f0e9..4e058de 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/execute.py +++ b/usr/lib/linuxmint/mintMenu/plugins/execute.py @@ -44,4 +44,3 @@ def Execute( cmd , commandCwd=None): except Exception, detail: print detail return False - diff --git a/usr/lib/linuxmint/mintMenu/plugins/filemonitor.py b/usr/lib/linuxmint/mintMenu/plugins/filemonitor.py index fd6799f..d711c66 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/filemonitor.py +++ b/usr/lib/linuxmint/mintMenu/plugins/filemonitor.py @@ -41,7 +41,7 @@ if hasInotify: def fileChanged(self, event ): if event.wd in self.callbacks: - # print event.path + # print event.path callback = self.callbacks[event.wd] if callback[1]: GLib.idle_add( callback[0], callback[1] ) diff --git a/usr/lib/linuxmint/mintMenu/plugins/recent.py b/usr/lib/linuxmint/mintMenu/plugins/recent.py index 933266c..7dce3eb 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/recent.py +++ b/usr/lib/linuxmint/mintMenu/plugins/recent.py @@ -199,9 +199,9 @@ class pluginclass: if ev.button == 1: if not hasattr( self, "press_x" ) or \ not w.drag_check_threshold( int( self.press_x ), - int( self.press_y ), - int( ev.x ), - int( ev.y ) ): + int( self.press_y ), + int( ev.x ), + int( ev.y ) ): if self.Win.pinmenu == False: self.Win.wTree.get_widget( "window1" ).hide() if "applications" in self.Win.plugins: diff --git a/usr/lib/linuxmint/mintMenu/plugins/system_management.py b/usr/lib/linuxmint/mintMenu/plugins/system_management.py index 70deea7..9fd9aba 100755 --- a/usr/lib/linuxmint/mintMenu/plugins/system_management.py +++ b/usr/lib/linuxmint/mintMenu/plugins/system_management.py @@ -182,7 +182,7 @@ class pluginclass( object ): Button4.show() self.systemBtnHolder.pack_start( Button4, False, False, 0 ) self.mintMenuWin.setTooltip( Button4, _("Use the command line") ) - + if ( self.showLockScreen == True ): Button5 = easyButton( "system-lock-screen", self.iconsize, [_("Lock Screen")], -1, -1 ) Button5.connect( "clicked", self.ButtonClicked, self.lock_cmd ) diff --git a/usr/lib/linuxmint/mintMenu/pointerMonitor.py b/usr/lib/linuxmint/mintMenu/pointerMonitor.py index 67c2410..8b31db2 100644 --- a/usr/lib/linuxmint/mintMenu/pointerMonitor.py +++ b/usr/lib/linuxmint/mintMenu/pointerMonitor.py @@ -55,7 +55,7 @@ class PointerMonitor(GObject.GObject, threading.Thread): p = self.get_window().get_device_position(pdevice) g = self.get_size() - if p.x >= 0 and p.y >= 0 and p.x <= g.width and p.y <= g.height: + if p.x >= 0 and p.y >= 0 and p.x <= g.width and p.y <= g.height: break else: # Is outside, so activate @@ -70,4 +70,3 @@ class PointerMonitor(GObject.GObject, threading.Thread): self.running = False self.root.ungrab_button(X.AnyButton, X.AnyModifier) self.display.close() -