diff --git a/tryton/gui/window/view_form/view/form_gtk/calendar.py b/tryton/gui/window/view_form/view/form_gtk/calendar.py index 5421f4a745..5ab4260e2b 100644 --- a/tryton/gui/window/view_form/view/form_gtk/calendar.py +++ b/tryton/gui/window/view_form/view/form_gtk/calendar.py @@ -38,8 +38,8 @@ class Calendar(WidgetInterface): self.but_open.set_relief(gtk.RELIEF_NONE) self.but_open.connect('clicked', self.cal_open) self.but_open.set_alignment(0.5, 0.5) - self.but_open.set_property('can-focus', False) self.widget.pack_start(self.but_open, expand=False, fill=False) + self.widget.set_focus_chain([self.entry]) tooltips = gtk.Tooltips() tooltips.set_tip(self.but_open, _('Open the calendar')) @@ -165,8 +165,8 @@ class DateTime(WidgetInterface): self.but_open.set_relief(gtk.RELIEF_NONE) self.but_open.connect('clicked', self.cal_open) self.but_open.set_alignment(0.5, 0.5) - self.but_open.set_property('can-focus', False) self.widget.pack_start(self.but_open, expand=False, fill=False) + self.widget.set_focus_chain([self.entry]) tooltips = gtk.Tooltips() tooltips.set_tip(self.but_open, _('Open the calendar')) diff --git a/tryton/gui/window/view_form/view/form_gtk/many2one.py b/tryton/gui/window/view_form/view/form_gtk/many2one.py index 19de40cab6..bbe4c3aafd 100644 --- a/tryton/gui/window/view_form/view/form_gtk/many2one.py +++ b/tryton/gui/window/view_form/view/form_gtk/many2one.py @@ -181,7 +181,6 @@ class Many2One(WidgetInterface): self.but_open.set_relief(gtk.RELIEF_NONE) self.but_open.connect('clicked', self.sig_edit) self.but_open.set_alignment(0.5, 0.5) - self.but_open.set_property('can-focus', False) self.widget.pack_start(self.but_open, expand=False, fill=False) self.but_new = gtk.Button() @@ -191,9 +190,10 @@ class Many2One(WidgetInterface): self.but_new.set_relief(gtk.RELIEF_NONE) self.but_new.connect('clicked', self.sig_new) self.but_new.set_alignment(0.5, 0.5) - self.but_new.set_property('can-focus', False) self.widget.pack_start(self.but_new, expand=False, fill=False) + self.widget.set_focus_chain([self.wid_text]) + self.tooltips = gtk.Tooltips() self.tooltips.set_tip(self.but_new, _('Create a new record')) self.tooltips.set_tip(self.but_open, _('Open a record')) diff --git a/tryton/gui/window/view_form/view/form_gtk/one2many.py b/tryton/gui/window/view_form/view/form_gtk/one2many.py index d58814b80b..0e8e581236 100644 --- a/tryton/gui/window/view_form/view/form_gtk/one2many.py +++ b/tryton/gui/window/view_form/view/form_gtk/one2many.py @@ -54,7 +54,6 @@ def _create_menu(self, attrs): img_add.set_alignment(0.5, 0.5) self.but_add.add(img_add) self.but_add.set_relief(gtk.RELIEF_NONE) - self.but_add.set_property('can-focus', False) hbox.pack_start(self.but_add, expand=False, fill=False) self.but_remove = gtk.Button() @@ -65,7 +64,6 @@ def _create_menu(self, attrs): img_remove.set_alignment(0.5, 0.5) self.but_remove.add(img_remove) self.but_remove.set_relief(gtk.RELIEF_NONE) - self.but_remove.set_property('can-focus', False) hbox.pack_start(self.but_remove, expand=False, fill=False) hbox.pack_start(gtk.VSeparator(), expand=False, fill=True) @@ -78,7 +76,6 @@ def _create_menu(self, attrs): img_new.set_alignment(0.5, 0.5) self.but_new.add(img_new) self.but_new.set_relief(gtk.RELIEF_NONE) - self.but_new.set_property('can-focus', False) hbox.pack_start(self.but_new, expand=False, fill=False) self.but_open = gtk.Button() @@ -89,7 +86,6 @@ def _create_menu(self, attrs): img_open.set_alignment(0.5, 0.5) self.but_open.add(img_open) self.but_open.set_relief(gtk.RELIEF_NONE) - self.but_open.set_property('can-focus', False) hbox.pack_start(self.but_open, expand=False, fill=False) self.but_del = gtk.Button() @@ -100,7 +96,6 @@ def _create_menu(self, attrs): img_del.set_alignment(0.5, 0.5) self.but_del.add(img_del) self.but_del.set_relief(gtk.RELIEF_NONE) - self.but_del.set_property('can-focus', False) hbox.pack_start(self.but_del, expand=False, fill=False) hbox.pack_start(gtk.VSeparator(), expand=False, fill=True) @@ -113,7 +108,6 @@ def _create_menu(self, attrs): img_pre.set_alignment(0.5, 0.5) but_pre.add(img_pre) but_pre.set_relief(gtk.RELIEF_NONE) - but_pre.set_property('can-focus', False) hbox.pack_start(but_pre, expand=False, fill=False) self.label = gtk.Label('(0,0)') @@ -127,7 +121,6 @@ def _create_menu(self, attrs): img_next.set_alignment(0.5, 0.5) but_next.add(img_next) but_next.set_relief(gtk.RELIEF_NONE) - but_next.set_property('can-focus', False) hbox.pack_start(but_next, expand=False, fill=False) hbox.pack_start(gtk.VSeparator(), expand=False, fill=True) @@ -140,8 +133,8 @@ def _create_menu(self, attrs): img_switch.set_alignment(0.5, 0.5) but_switch.add(img_switch) but_switch.set_relief(gtk.RELIEF_NONE) - but_switch.set_property('can-focus', False) hbox.pack_start(but_switch, expand=False, fill=False) + hbox.set_focus_chain([]) tooltips.enable() diff --git a/tryton/gui/window/view_form/view/form_gtk/reference.py b/tryton/gui/window/view_form/view/form_gtk/reference.py index 6e144581f5..c3b99958fb 100644 --- a/tryton/gui/window/view_form/view/form_gtk/reference.py +++ b/tryton/gui/window/view_form/view/form_gtk/reference.py @@ -51,7 +51,6 @@ class Reference(WidgetInterface): self.but_new.set_relief(gtk.RELIEF_NONE) self.but_new.connect('clicked', self.sig_new) self.but_new.set_alignment(0.5, 0.5) - self.but_new.set_property('can-focus', False) self.widget.pack_start(self.but_new, expand=False, fill=False) self.but_open = gtk.Button() @@ -63,9 +62,9 @@ class Reference(WidgetInterface): self.but_open.set_relief(gtk.RELIEF_NONE) self.but_open.connect('clicked', self.sig_activate) self.but_open.set_alignment(0.5, 0.5) - self.but_open.set_property('can-focus', False) self.widget.pack_start(self.but_open, padding=2, expand=False, fill=False) + self.widget.set_focus_chain([self.widget_combo, self.wid_text]) tooltips = gtk.Tooltips() tooltips.set_tip(self.but_new, _('Create a new record')) diff --git a/tryton/gui/window/view_form/view/form_gtk/url.py b/tryton/gui/window/view_form/view/form_gtk/url.py index 9d72d320f8..85fa925522 100644 --- a/tryton/gui/window/view_form/view/form_gtk/url.py +++ b/tryton/gui/window/view_form/view/form_gtk/url.py @@ -21,8 +21,8 @@ class URL(Char): self.button.set_relief(gtk.RELIEF_NONE) self.button.connect('clicked', self.button_clicked) self.button.set_alignment(0.5, 0.5) - self.button.set_property('can-focus', False) self.widget.pack_start(self.button, expand=False, fill=False) + self.widget.set_focus_chain([self.entry]) def display(self, model, model_field): super(URL, self).display(model, model_field) @@ -40,9 +40,10 @@ class URL(Char): super(URL, self)._readonly_set(value) if value: self.entry.hide() + self.widget.set_focus_chain([self.button]) else: self.entry.show() - self.button.set_property('can-focus', value) + self.widget.set_focus_chain([self.entry]) def button_clicked(self, widget): value = self.entry.get_text()