From a5c552594fec65a234e8da5ea2bfbcf8fd9e1819 Mon Sep 17 00:00:00 2001 From: Huang Peng Date: Sun, 20 Jul 2008 09:23:15 +0800 Subject: [PATCH] Refine coding style. --- panel/handle.py | 90 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/panel/handle.py b/panel/handle.py index 0e8a2ec..ccd1890 100644 --- a/panel/handle.py +++ b/panel/handle.py @@ -2,12 +2,12 @@ # # ibus - The Input Bus # -# Copyright (c) 2007-2008 Huang Peng +# Copyright(c) 2007-2008 Huang Peng # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. +# version 2 of the License, or(at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,70 +23,70 @@ import gtk import gtk.gdk as gdk import gobject -class Handle (gtk.EventBox): +class Handle(gtk.EventBox): def __init__ (self): - gtk.EventBox.__init__ (self) - self.set_visible_window (False) - self.set_size_request (10, -1) - self.set_events ( + super(Handle, self).__init__() + self.set_visible_window(False) + self.set_size_request(10, -1) + self.set_events( gdk.EXPOSURE_MASK | \ gdk.BUTTON_PRESS_MASK | \ gdk.BUTTON_RELEASE_MASK | \ gdk.BUTTON1_MOTION_MASK) - self._move_begined = False + self.__move_begined = False - root = gdk.get_default_root_window () - workarea = root.property_get ("_NET_WORKAREA")[2] + root = gdk.get_default_root_window() + workarea = root.property_get("_NET_WORKAREA")[2] - def do_button_press_event (self, event): + def do_button_press_event(self, event): if event.button == 1: - root = gdk.get_default_root_window () - desktop = root.property_get ("_NET_CURRENT_DESKTOP")[2][0] - self._workarea = root.property_get ("_NET_WORKAREA")[2][desktop * 4: (desktop + 1) * 4] - self._move_begined = True - toplevel = self.get_toplevel () - x, y = toplevel.get_position () - self._press_pos = event.x_root - x, event.y_root - y - self.window.set_cursor (gdk.Cursor (gdk.FLEUR)) + root = gdk.get_default_root_window() + desktop = root.property_get("_NET_CURRENT_DESKTOP")[2][0] + self.__workarea = root.property_get("_NET_WORKAREA")[2][desktop * 4: (desktop + 1) * 4] + self.__move_begined = True + toplevel = self.get_toplevel() + x, y = toplevel.get_position() + self.__press_pos = event.x_root - x, event.y_root - y + self.window.set_cursor(gdk.Cursor(gdk.FLEUR)) return True return False - def do_button_release_event (self, event): + def do_button_release_event(self, event): if event.button == 1: - self._move_begined = False - del self._press_pos - del self._workarea - self.window.set_cursor (gdk.Cursor (gdk.LEFT_PTR)) + self.__move_begined = False + del self.__press_pos + del self.__workarea + self.window.set_cursor(gdk.Cursor(gdk.LEFT_PTR)) return True return False - def do_motion_notify_event (self, event): - if not self._move_begined: + def do_motion_notify_event(self, event): + if not self.__move_begined: return - toplevel = self.get_toplevel () - x, y = toplevel.get_position () - x = int (event.x_root - self._press_pos[0]) - y = int (event.y_root - self._press_pos[1]) + toplevel = self.get_toplevel() + x, y = toplevel.get_position() + x = int(event.x_root - self.__press_pos[0]) + y = int(event.y_root - self.__press_pos[1]) - if x < self._workarea[0] and x > self._workarea[0] - 16: - x = self._workarea[0] - if y < self._workarea[1] and y > self._workarea[1] - 16: - y = self._workarea[1] + if x < self.__workarea[0] and x > self.__workarea[0] - 16: + x = self.__workarea[0] + if y < self.__workarea[1] and y > self.__workarea[1] - 16: + y = self.__workarea[1] - w, h = toplevel.get_size () - if x + w > self._workarea[0] + self._workarea[2] and \ - x + w < self._workarea[0] + self._workarea[2] + 16: - x = self._workarea[0] + self._workarea[2] - w - if y + h > self._workarea[1] + self._workarea[3] and \ - y + h < self._workarea[1] + self._workarea[3] + 16: - y = self._workarea[1] + self._workarea[3] - h + w, h = toplevel.get_size() + if x + w > self.__workarea[0] + self.__workarea[2] and \ + x + w < self.__workarea[0] + self.__workarea[2] + 16: + x = self.__workarea[0] + self.__workarea[2] - w + if y + h > self.__workarea[1] + self.__workarea[3] and \ + y + h < self.__workarea[1] + self.__workarea[3] + 16: + y = self.__workarea[1] + self.__workarea[3] - h - toplevel.move (x, y) + toplevel.move(x, y) - def do_expose_event (self, event): - self.style.paint_handle ( + def do_expose_event(self, event): + self.style.paint_handle( self.window, gtk.STATE_NORMAL, gtk.SHADOW_OUT, @@ -98,6 +98,6 @@ class Handle (gtk.EventBox): gtk.ORIENTATION_VERTICAL) return True -gobject.type_register (Handle, "IBusHandle") +gobject.type_register(Handle, "IBusHandle") -- 2.7.4