From bf7eedc1e89dbb6404754fe360013a54a3de0cd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 20 Jan 2008 23:58:40 +0100 Subject: [PATCH] Better button for relation dialogs --- tryton/gui/window/view_form/view/form_gtk/many2one.py | 5 ++++- tryton/gui/window/view_form/view/form_gtk/one2many.py | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) 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 be19790bc0..db482d0a8c 100644 --- a/tryton/gui/window/view_form/view/form_gtk/many2one.py +++ b/tryton/gui/window/view_form/view/form_gtk/many2one.py @@ -36,7 +36,10 @@ class Dialog(object): self.accel_group = gtk.AccelGroup() self.dia.add_accel_group(self.accel_group) - self.but_cancel = self.dia.add_button(gtk.STOCK_CANCEL, + icon_cancel = gtk.STOCK_CLOSE + if not obj_id: + icon_cancel = gtk.STOCK_CANCEL + self.but_cancel = self.dia.add_button(icon_cancel, gtk.RESPONSE_CANCEL) self.but_cancel.add_accelerator('clicked', self.accel_group, gtk.keysyms.Escape, gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) 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 595123f507..9e2c2aa8c3 100644 --- a/tryton/gui/window/view_form/view/form_gtk/one2many.py +++ b/tryton/gui/window/view_form/view/form_gtk/one2many.py @@ -32,7 +32,10 @@ class Dialog(object): self.accel_group = gtk.AccelGroup() self.dia.add_accel_group(self.accel_group) - self.but_cancel = self.dia.add_button(gtk.STOCK_CANCEL, + icon_cancel = gtk.STOCK_CLOSE + if not model: + icon_cancel = gtk.STOCK_CANCEL + self.but_cancel = self.dia.add_button(icon_cancel, gtk.RESPONSE_CANCEL) self.but_cancel.add_accelerator('clicked', self.accel_group, gtk.keysyms.Escape, gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) @@ -88,6 +91,7 @@ class Dialog(object): or self.screen.current_model.validate() if not end: self.screen.display() + self.but_cancel.set_label(gtk.STOCK_CLOSE) if res == gtk.RESPONSE_OK: self.screen.current_view.set_value()