From 09e61095000f9f6a85ea968cefc499cc3aa4b444 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 13 Aug 2008 01:25:43 +0000 Subject: Remove control modifier which conflicted with multi-select in FlowCanvas. Edit mode is now toggled with 'e' ala Max. git-svn-id: http://svn.drobilla.net/lad/ingen@1349 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/gui/PatchCanvas.cpp | 21 +++------------------ src/libs/gui/ingen_gui.glade | 19 +++++++++++++++---- 2 files changed, 18 insertions(+), 22 deletions(-) (limited to 'src/libs/gui') diff --git a/src/libs/gui/PatchCanvas.cpp b/src/libs/gui/PatchCanvas.cpp index a787b1ae..0cd82ecb 100644 --- a/src/libs/gui/PatchCanvas.cpp +++ b/src/libs/gui/PatchCanvas.cpp @@ -475,32 +475,17 @@ PatchCanvas::canvas_event(GdkEvent* event) bool PatchCanvas::canvas_key_event(GdkEventKey* event) { - static bool control_modded = false; - switch (event->type) { case GDK_KEY_PRESS: switch (event->keyval) { case GDK_Delete: destroy_selection(); return true; - case GDK_Control_L: - case GDK_Control_R: - if (_patch->get_editable() == true) { - control_modded = true; + case GDK_e: + if (_patch->get_editable() == true) _patch->set_editable(false); - } - return true; - default: - return false; - } - case GDK_KEY_RELEASE: - switch (event->keyval) { - case GDK_Control_L: - case GDK_Control_R: - if (_patch->get_editable() == false && control_modded) { - control_modded = false; + else _patch->set_editable(true); - } return true; default: return false; diff --git a/src/libs/gui/ingen_gui.glade b/src/libs/gui/ingen_gui.glade index e4f11624..d8ab7bb5 100644 --- a/src/libs/gui/ingen_gui.glade +++ b/src/libs/gui/ingen_gui.glade @@ -366,7 +366,20 @@ True Right-click the canvas to add objects True - + + + True + gtk-info + 1 + + + + + + + True + Press 'e' to toggle edit mode + True True @@ -1474,9 +1487,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Enable edit mode to move objects. -Disable edit mode to play controls. -Hold <Ctrl> to play controls in either mode. + Enable edit mode to move objects and make connections, disable to play controls ('e' to toggle) Edit gtk-edit True -- cgit v1.2.1