Fix name collision between PopdownMixin and Reference widget

get_model is already used in Reference widget inherited from the Many2One
widget. So it is renamed into get_popdown_model.
This commit is contained in:
Cédric Krier committed 2014-03-12 15:18:06 +01:00
1 parent fee62b0a07
commit ca0023f8af
2 files changed
+3 -3

No files matched your search

+2 -2
View File
@@ -112,7 +112,7 @@ class PopdownMixin(object):
def set_popdown(self, selection, entry):
if not entry.child: # entry is destroyed
return
model, lengths = self.get_model(selection)
model, lengths = self.get_popdown_model(selection)
entry.set_model(model)
# GTK 2.24 and above use a ComboBox instead of a ComboBoxEntry
if hasattr(entry, 'set_text_column'):
@@ -137,7 +137,7 @@ class PopdownMixin(object):
completion.set_text_column(0)
completion.connect('match-selected', self.match_selected, entry)
def get_model(self, selection):
def get_popdown_model(self, selection):
model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_PYOBJECT)
lengths = []
for (value, name) in selection:
@@ -929,7 +929,7 @@ class Selection(Char, SelectionMixin, PopdownMixin):
self.renderer = CellRendererCombo()
self.renderer.connect('editing-started', self.editing_started)
self.init_selection()
self.renderer.set_property('model', self.get_model(self.selection)[0])
self.renderer.set_property('model', self.get_popdown_model(self.selection)[0])
self.renderer.set_property('text-column', 0)
def get_textual_value(self, record):