Refine coding style.

diff --git a/panel/toolitem.py b/panel/toolitem.py
index 8771882..86acf4d 100644 (file)
--- a/panel/toolitem.py
+++ b/panel/toolitem.py
@@ -27,7 +27,7 @@ from propitem import PropItem
 from menu import *
 
 
-class ToolButton (gtk.ToolButton, PropItem):
+class ToolButton(gtk.ToolButton, PropItem):
     __gsignals__ = {
         "property-activate" : (
             gobject.SIGNAL_RUN_FIRST,
@@ -35,57 +35,57 @@ class ToolButton (gtk.ToolButton, PropItem):
             (gobject.TYPE_STRING, gobject.TYPE_INT)),
         }
 
-    def __init__ (self, prop):
+    def __init__(self, prop):
         gtk.ToolButton.__init__ (self, label = prop._label)
         PropItem.__init__ (self, prop)
 
-        self.set_icon_name (prop._icon)
-        self.set_tooltip_text (prop._tooltip)
-        self.set_sensitive (prop._sensitive)
+        self.set_icon_name(prop._icon)
+        self.set_tooltip_text(prop._tooltip)
+        self.set_sensitive(prop._sensitive)
 
         if prop._visible:
-            self.set_no_show_all (False)
-            self.show_all ()
+            self.set_no_show_all(False)
+            self.show_all()
         else:
-            self.set_no_show_all (True)
-            self.hide_all ()
+            self.set_no_show_all(True)
+            self.hide_all()
 
 
-    def set_icon_name (self, icon_name):
+    def set_icon_name(self, icon_name):
         if icon_name:
-            gtk.ToolButton.set_icon_name (self, icon_name)
-            self.set_is_important (False)
+            gtk.ToolButton.set_icon_name(self, icon_name)
+            self.set_is_important(False)
         else:
-            gtk.ToolButton.set_icon_name (self, None)
-            self.set_is_important (True)
+            gtk.ToolButton.set_icon_name(self, None)
+            self.set_is_important(True)
 
         self._prop._icon = icon_name
 
-    def set_tooltip_text (self, text):
+    def set_tooltip_text(self, text):
         if text:
-            gtk.ToolButton.set_tooltip_text (self, text)
+            gtk.ToolButton.set_tooltip_text(self, text)
         else:
-            gtk.ToolButton.set_tooltip_text (self, None)
+            gtk.ToolButton.set_tooltip_text(self, None)
 
         self._prop._tooltip = text
 
-    def property_changed (self):
-        self.set_icon_name (self._prop._icon)
-        self.set_tooltip_text (self._prop._tooltip)
-        self.set_label (self._prop._label)
-        self.set_sensitive (self._prop._sensitive)
+    def property_changed(self):
+        self.set_icon_name(self._prop._icon)
+        self.set_tooltip_text(self._prop._tooltip)
+        self.set_label(self._prop._label)
+        self.set_sensitive(self._prop._sensitive)
         if self._prop._visible:
-            self.set_no_show_all (False)
-            self.show_all ()
+            self.set_no_show_all(False)
+            self.show_all()
         else:
-            self.set_no_show_all (True)
-            self.hide_all ()
+            self.set_no_show_all(True)
+            self.hide_all()
 
-    def do_clicked (self):
-        self.emit ("property-activate", self._prop._name, self._prop._state)
+    def do_clicked(self):
+        self.emit("property-activate", self._prop._name, self._prop._state)
 
 
-class ToggleToolButton (gtk.ToggleToolButton, PropItem):
+class ToggleToolButton(gtk.ToggleToolButton, PropItem):
     __gsignals__ = {
         "property-activate" : (
             gobject.SIGNAL_RUN_FIRST,
@@ -97,62 +97,62 @@ class ToggleToolButton (gtk.ToggleToolButton, PropItem):
         gtk.ToggleToolButton.__init__ (self)
         PropItem.__init__ (self, prop)
 
-        self.set_label (prop._label)
-        self.set_icon_name (prop._icon)
-        self.set_tooltip_text (prop._tooltip)
-        self.set_active (prop._state == ibus.PROP_STATE_CHECKED)
-        self.set_sensitive (prop._sensitive)
+        self.set_label(prop._label)
+        self.set_icon_name(prop._icon)
+        self.set_tooltip_text(prop._tooltip)
+        self.set_active(prop._state == ibus.PROP_STATE_CHECKED)
+        self.set_sensitive(prop._sensitive)
         if prop._visible:
-            self.set_no_show_all (False)
-            self.show_all ()
+            self.set_no_show_all(False)
+            self.show_all()
         else:
-            self.set_no_show_all (True)
-            self.hide_all ()
+            self.set_no_show_all(True)
+            self.hide_all()
 
-    def set_icon_name (self, icon_name):
+    def set_icon_name(self, icon_name):
         if icon_name:
-            gtk.ToggleToolButton.set_icon_name (self, icon_name)
-            self.set_is_important (False)
+            gtk.ToggleToolButton.set_icon_name(self, icon_name)
+            self.set_is_important(False)
         else:
-            gtk.ToggleToolButton.set_icon_name (self, None)
-            self.set_is_important (True)
+            gtk.ToggleToolButton.set_icon_name(self, None)
+            self.set_is_important(True)
 
         self._prop._icon = icon_name
 
-    def set_tooltip_text (self, text):
+    def set_tooltip_text(self, text):
         if text:
-            gtk.ToggleToolButton.set_tooltip_text (self, text)
+            gtk.ToggleToolButton.set_tooltip_text(self, text)
         else:
-            gtk.ToggleToolButton.set_tooltip_text (self, None)
+            gtk.ToggleToolButton.set_tooltip_text(self, None)
 
         self._prop._tooltip = text
 
-    def property_changed (self):
-        self.set_icon_name (self._prop._icon)
-        self.set_tooltip_text (self._prop._tooltip)
-        self.set_label (self._prop._label)
-        self.set_active (self._prop._state == ibus.PROP_STATE_CHECKED)
-        self.set_sensitive (self._prop._sensitive)
+    def property_changed(self):
+        self.set_icon_name(self._prop._icon)
+        self.set_tooltip_text(self._prop._tooltip)
+        self.set_label(self._prop._label)
+        self.set_active(self._prop._state == ibus.PROP_STATE_CHECKED)
+        self.set_sensitive(self._prop._sensitive)
         if self._prop._visible:
-            self.set_no_show_all (False)
-            self.show_all ()
+            self.set_no_show_all(False)
+            self.show_all()
         else:
-            self.set_no_show_all (True)
-            self.hide_all ()
+            self.set_no_show_all(True)
+            self.hide_all()
 
-    def do_toggled (self):
-        if self.get_active ():
+    def do_toggled(self):
+        if self.get_active():
             self._prop._state = ibus.PROP_STATE_CHECKED
         else:
             self._prop._state = ibus.PROP_STATE_UNCHECKED
-        self.emit ("property-activate", self._prop._name, self._prop._state)
+        self.emit("property-activate", self._prop._name, self._prop._state)
 
-class SeparatorToolItem (gtk.SeparatorToolItem, PropItem):
+class SeparatorToolItem(gtk.SeparatorToolItem, PropItem):
     def __init__ (self, prop):
         gtk.SeparatorToolItem.__init__ (self)
         PropItem.__init__ (self, prop)
 
-class MenuToolButton (ToggleToolButton):
+class MenuToolButton(ToggleToolButton):
     # __gsignals__ = {
     #        "property-activate" : (
     #            gobject.SIGNAL_RUN_FIRST,
@@ -161,20 +161,20 @@ class MenuToolButton (ToggleToolButton):
     #        }
 
     def __init__ (self, prop):
-        ToggleToolButton.__init__ (self, prop)
-        self._menu = Menu (prop)
-        self._menu.connect ("deactivate", lambda m: self.set_active (False))
-        self._menu.connect ("property-activate", lambda w,n,s: self.emit ("property-activate", n, s))
-
-    def update_property (self, prop):
-        PropItem.update_property (self, prop)
-        self._menu.update_property (prop)
-
-    def do_toggled (self):
-        if self.get_active ():
-            self._menu.popup (0, gtk.get_current_event_time (), self)
-
-gobject.type_register (ToolButton, "ToolButton")
-gobject.type_register (ToggleToolButton, "IBusToggleToolButton")
-gobject.type_register (MenuToolButton, "MenuToolButton")
+        super(MenuToolButton, self).__init__(prop)
+        self._menu = Menu(prop)
+        self._menu.connect("deactivate", lambda m: self.set_active(False))
+        self._menu.connect("property-activate", lambda w,n,s: self.emit("property-activate", n, s))
+
+    def update_property(self, prop):
+        PropItem.update_property(self, prop)
+        self._menu.update_property(prop)
+
+    def do_toggled(self):
+        if self.get_active():
+            self._menu.popup(0, gtk.get_current_event_time(), self)
+
+gobject.type_register(ToolButton, "ToolButton")
+gobject.type_register(ToggleToolButton, "IBusToggleToolButton")
+gobject.type_register(MenuToolButton, "MenuToolButton")