From ed7ce05f1e24667a899b4df56fd93e7b9a8aa1de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 3 Nov 2015 12:15:01 +0100 Subject: [PATCH] Manage copy/paste on darwin The control mask on darwin for copy/paste should be MOD2 instead of CONTROL. issue5022 review18671002 --- CHANGELOG | 2 ++ tryton/gui/window/view_form/view/list.py | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 93b6ed113c..fc9b14e87b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +* Use Apple key for copy/past of list + Version 3.8.0 - 2015-11-02 * Bug fixes (see mercurial logs for details) * Use italic labels for editable fields diff --git a/tryton/gui/window/view_form/view/list.py b/tryton/gui/window/view_form/view/list.py index c70a992b40..7d41b23c86 100644 --- a/tryton/gui/window/view_form/view/list.py +++ b/tryton/gui/window/view_form/view/list.py @@ -637,12 +637,15 @@ class ViewTree(View): if isinstance(b.renderer, CellRendererButton)] def on_keypress(self, widget, event): + control_mask = gtk.gdk.CONTROL_MASK + if sys.platform == 'darwin': + control_mask = gtk.gdk.MOD2_MASK if (event.keyval == gtk.keysyms.c - and event.state & gtk.gdk.CONTROL_MASK): + and event.state & control_mask): self.on_copy() return False if (event.keyval == gtk.keysyms.v - and event.state & gtk.gdk.CONTROL_MASK): + and event.state & control_mask): self.on_paste() return False