From 865fc381d2210ed095bb156acdba1a6dc0fc6709 Mon Sep 17 00:00:00 2001 From: Huang Peng Date: Tue, 19 Aug 2008 08:54:37 +0800 Subject: [PATCH] Refine code. --- panel/languagebar.py | 14 +++++++------- panel/propitem.py | 10 +++++----- panel/toolitem.py | 48 ++++++++++++++++++++++++------------------------ 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/panel/languagebar.py b/panel/languagebar.py index d880e49..d9053f7 100644 --- a/panel/languagebar.py +++ b/panel/languagebar.py @@ -111,25 +111,25 @@ class LanguageBar(gtk.Toolbar): self.__remove_properties() # create new properties for prop in props: - if prop._type == ibus.PROP_TYPE_NORMAL: + if prop.type == ibus.PROP_TYPE_NORMAL: item = ToolButton(prop = prop) - elif prop._type == ibus.PROP_TYPE_TOGGLE: + elif prop.type == ibus.PROP_TYPE_TOGGLE: item = ToggleToolButton(prop = prop) - elif prop._type == ibus.PROP_TYPE_MENU: + elif prop.type == ibus.PROP_TYPE_MENU: item = MenuToolButton(prop = prop) - elif prop._type == PROP_TYPE_SEPARATOR: + elif prop.type == PROP_TYPE_SEPARATOR: item = SeparatorToolItem() else: - raise IBusException("Unknown property type = %d" % prop._type) + raise IBusException("Unknown property type = %d" % prop.type) item.connect("property-activate", lambda w, n, s: self.emit("property-activate", n, s)) - item.set_sensitive(prop._sensitive) + item.set_sensitive(prop.sensitive) item.set_no_show_all(True) - if prop._visible: + if prop.visible: item.show() else: item.hide() diff --git a/panel/propitem.py b/panel/propitem.py index 6a7db8f..3d363ed 100644 --- a/panel/propitem.py +++ b/panel/propitem.py @@ -30,7 +30,7 @@ class PropItem: retval = False - if self._prop._name == prop._name and self._prop._type == prop._type: + if self._prop.name == prop.name and self._prop.type == prop.type: self._prop = prop self.property_changed () retval = True @@ -41,19 +41,19 @@ class PropItem: return retval def set_prop_label (self, label): - self._prop._label = label + self._prop.label = label self.property_changed () def set_icon (self, icon): - self._prop._icon = icon + self._prop.icon = icon self.property_changed () def set_tooltip (self, tooltip): - self._prop._tooltip = tooltip + self._prop.tooltip = tooltip self.property_changed () def set_state (self, state): - self._prop._state = state + self._prop.state = state self.property_changed () def property_changed (self): diff --git a/panel/toolitem.py b/panel/toolitem.py index bc8d68e..6c89b05 100644 --- a/panel/toolitem.py +++ b/panel/toolitem.py @@ -36,7 +36,7 @@ class ToolButton(gtk.ToolButton, PropItem): } def __init__(self, prop): - gtk.ToolButton.__init__ (self, label = prop._label) + gtk.ToolButton.__init__ (self, label = prop.label) self.set_homogeneous(False) PropItem.__init__ (self, prop) self.property_changed() @@ -46,7 +46,7 @@ class ToolButton(gtk.ToolButton, PropItem): widget = icon.IconWidget(icon_name, 18) gtk.ToolButton.set_icon_widget(self, widget) self.set_is_important(False) - elif self._prop._label: + elif self._prop.label: gtk.ToolButton.set_icon_widget(self, None) self.set_is_important(True) else: @@ -54,7 +54,7 @@ class ToolButton(gtk.ToolButton, PropItem): gtk.ToolButton.set_icon_widget(self, widget) self.set_is_important(False) - self._prop._icon = icon_name + self._prop.icon = icon_name def set_tooltip_text(self, text): if text: @@ -62,15 +62,15 @@ class ToolButton(gtk.ToolButton, PropItem): else: gtk.ToolButton.set_tooltip_text(self, None) - self._prop._tooltip = text + self._prop.tooltip = text def property_changed(self): - self.set_label(self._prop._label) - self.set_tooltip_text(self._prop._tooltip) - self.set_sensitive(self._prop._sensitive) - self.set_icon_name(self._prop._icon) + self.set_label(self._prop.label) + self.set_tooltip_text(self._prop.tooltip) + self.set_sensitive(self._prop.sensitive) + self.set_icon_name(self._prop.icon) - if self._prop._visible: + if self._prop.visible: self.set_no_show_all(False) self.show_all() else: @@ -78,7 +78,7 @@ class ToolButton(gtk.ToolButton, PropItem): self.hide_all() def do_clicked(self): - self.emit("property-activate", self._prop._name, self._prop._state) + self.emit("property-activate", self._prop.name, self._prop._state) class ToggleToolButton(gtk.ToggleToolButton, PropItem): @@ -100,7 +100,7 @@ class ToggleToolButton(gtk.ToggleToolButton, PropItem): widget = icon.IconWidget(icon_name, 18) gtk.ToggleToolButton.set_icon_widget(self, widget) self.set_is_important(False) - elif self._prop._label: + elif self._prop.label: gtk.ToggleToolButton.set_icon_widget(self, None) self.set_is_important(True) else: @@ -108,7 +108,7 @@ class ToggleToolButton(gtk.ToggleToolButton, PropItem): gtk.ToggleToolButton.set_icon_widget(self, widget) self.set_is_important(False) - self._prop._icon = icon_name + self._prop.icon = icon_name def set_tooltip_text(self, text): if text: @@ -116,15 +116,15 @@ class ToggleToolButton(gtk.ToggleToolButton, PropItem): else: gtk.ToggleToolButton.set_tooltip_text(self, None) - self._prop._tooltip = text + self._prop.tooltip = text def property_changed(self): - self.set_tooltip_text(self._prop._tooltip) - self.set_label(self._prop._label) - self.set_icon_name(self._prop._icon) - self.set_active(self._prop._state == ibus.PROP_STATE_CHECKED) - self.set_sensitive(self._prop._sensitive) - if self._prop._visible: + self.set_tooltip_text(self._prop.tooltip) + self.set_label(self._prop.label) + self.set_icon_name(self._prop.icon) + 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() else: @@ -133,16 +133,16 @@ class ToggleToolButton(gtk.ToggleToolButton, PropItem): def do_toggled(self): if self.get_active(): - self._prop._state = ibus.PROP_STATE_CHECKED + 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._prop.state = ibus.PROP_STATE_UNCHECKED + self.emit("property-activate", self._prop.name, self._prop.state) class SeparatorToolItem(gtk.SeparatorToolItem, PropItem): def __init__ (self, prop): - gtk.SeparatorToolItem.__init__ (self) + gtk.SeparatorToolItem.__init__(self) self.set_homogeneous(False) - PropItem.__init__ (self, prop) + PropItem.__init__(self, prop) class MenuToolButton(ToggleToolButton): # __gsignals__ = { -- 2.7.4