From 376aa61375077b4d85bbecf64c8dc81eb731e864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 16 Sep 2015 18:02:37 +0200 Subject: [PATCH] Remove custom support of visible on CellRenderer gtk.CellRenderer supports this property since pygtk 2.22 issue4953 review22411002 --- tryton/common/cellrenderercombo.py | 30 ++--------------------------- tryton/common/cellrenderertext.py | 30 ++--------------------------- tryton/common/cellrenderertoggle.py | 30 ++--------------------------- 3 files changed, 6 insertions(+), 84 deletions(-) diff --git a/tryton/common/cellrenderercombo.py b/tryton/common/cellrenderercombo.py index bf583578f1..0d81655091 100644 --- a/tryton/common/cellrenderercombo.py +++ b/tryton/common/cellrenderercombo.py @@ -7,46 +7,20 @@ from tryton.common.selection import selection_shortcuts class CellRendererCombo(gtk.CellRendererCombo): - __gproperties__ = { - 'visible': (gobject.TYPE_INT, 'Visible', - 'Visible', 0, 10, 0, gobject.PARAM_READWRITE), - } - - def __init__(self): - gtk.CellRendererCombo.__init__(self) - self.__visible = True def set_sensitive(self, value): self.set_property('sensitive', value) - def do_set_property(self, prop, value): - if prop.name == 'visible': - self.__visible = value - return - gtk.CellRendererCombo.do_set_property(self, prop, value) - - def do_get_property(self, prop): - if prop.name == 'visible': - return self.__visible - return gtk.CellRendererCombo.do_get_property(self, prop) - - def do_render(self, window, widget, background_area, cell_area, - expose_area, flags): - if not self.__visible: - return - gtk.CellRendererCombo.do_render(self, window, widget, - background_area, cell_area, expose_area, flags) - def do_activate(self, event, widget, path, background_area, cell_area, flags): - if not self.__visible: + if not self.props.visible: return return gtk.CellRendererCombo.do_activate(self, event, widget, path, background_area, cell_area, flags) def do_start_editing(self, event, widget, path, background_area, cell_area, flags): - if not self.__visible: + if not self.props.visible: return if not event: event = gtk.gdk.Event(gtk.keysyms.Tab) diff --git a/tryton/common/cellrenderertext.py b/tryton/common/cellrenderertext.py index 6c042e700a..b4bc9b754c 100644 --- a/tryton/common/cellrenderertext.py +++ b/tryton/common/cellrenderertext.py @@ -5,46 +5,20 @@ import gobject class CellRendererText(gtk.CellRendererText): - __gproperties__ = { - 'visible': (gobject.TYPE_INT, 'Visible', - 'Visible', 0, 10, 0, gobject.PARAM_READWRITE), - } - - def __init__(self): - gtk.CellRendererText.__init__(self) - self.__visible = True def set_sensitive(self, value): self.set_property('sensitive', value) - def do_set_property(self, prop, value): - if prop.name == 'visible': - self.__visible = value - return - gtk.CellRendererText.do_set_property(self, prop, value) - - def do_get_property(self, prop): - if prop.name == 'visible': - return self.__visible - return gtk.CellRendererText.do_get_property(self, prop) - - def do_render(self, window, widget, background_area, cell_area, - expose_area, flags): - if not self.__visible: - return - gtk.CellRendererText.do_render(self, window, widget, - background_area, cell_area, expose_area, flags) - def do_activate(self, event, widget, path, background_area, cell_area, flags): - if not self.__visible: + if not self.props.visible: return return gtk.CellRendererText.activate(self, event, widget, path, background_area, cell_area, flags) def do_start_editing(self, event, widget, path, background_area, cell_area, flags): - if not self.__visible: + if not self.props.visible: return if not event: event = gtk.gdk.Event(gtk.keysyms.Tab) diff --git a/tryton/common/cellrenderertoggle.py b/tryton/common/cellrenderertoggle.py index fa89fedbff..04e6dd3bdc 100644 --- a/tryton/common/cellrenderertoggle.py +++ b/tryton/common/cellrenderertoggle.py @@ -5,39 +5,13 @@ import gobject class CellRendererToggle(gtk.CellRendererToggle): - __gproperties__ = { - 'visible': (gobject.TYPE_INT, 'Visible', - 'Visible', 0, 10, 0, gobject.PARAM_READWRITE), - } - - def __init__(self): - gtk.CellRendererToggle.__init__(self) - self.__visible = True def set_sensitive(self, value): self.set_property('sensitive', value) - def do_set_property(self, prop, value): - if prop.name == 'visible': - self.__visible = value - return - gtk.CellRendererToggle.do_set_property(self, prop, value) - - def do_get_property(self, prop): - if prop.name == 'visible': - return self.__visible - return gtk.CellRendererToggle.do_get_property(self, prop) - - def do_render(self, window, widget, background_area, cell_area, - expose_area, flags): - if not self.__visible: - return - gtk.CellRendererToggle.do_render(self, window, widget, - background_area, cell_area, expose_area, flags) - def do_activate(self, event, widget, path, background_area, cell_area, flags): - if not self.__visible: + if not self.props.visible: return if not event: event = gtk.gdk.Event(gtk.keysyms.KP_Space) @@ -46,7 +20,7 @@ class CellRendererToggle(gtk.CellRendererToggle): def do_start_editing(self, event, widget, path, background_area, cell_area, flags): - if not self.__visible: + if not self.props.visible: return return gtk.CellRendererToggle.do_start_editing(event, widget, path, background_area, cell_area, flags)