From 6902a461444ad06363403ab0d44766afcbbfb295 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Tue, 29 Mar 2011 18:06:08 +0000 Subject: [PATCH] add a second Delete action, so both Backspace and Delete can be bound to delete. this is really useful on macbooks which have a backspace but no delete key. to turn on this behavior, users will have to add the new editor-alternate-delete action to theri bindings, OR go to Preferences->Mouse/Key and re-load one of the default bindings files git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@9232 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/SAE-de-keypad.bindings.in | 3 ++- gtk2_ardour/SAE-de-nokeypad.bindings.in | 3 ++- gtk2_ardour/SAE-us-keypad.bindings.in | 3 ++- gtk2_ardour/SAE-us-nokeypad.bindings.in | 3 ++- gtk2_ardour/ardour.menus.in | 2 ++ gtk2_ardour/editor_actions.cc | 2 ++ gtk2_ardour/ergonomic-us.bindings.in | 3 ++- gtk2_ardour/mnemonic-us.bindings.in | 1 + 8 files changed, 15 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/SAE-de-keypad.bindings.in b/gtk2_ardour/SAE-de-keypad.bindings.in index dad2ead224..d22509f5f0 100644 --- a/gtk2_ardour/SAE-de-keypad.bindings.in +++ b/gtk2_ardour/SAE-de-keypad.bindings.in @@ -119,7 +119,8 @@ (gtk_accel_path "/Editor/playhead-to-edit" "Return") (gtk_accel_path "/Editor/edit-to-playhead" "<%SECONDARY%>Return") -(gtk_accel_path "/Editor/editor-delete" "BackSpace") +(gtk_accel_path "/Editor/editor-delete" "Delete") +(gtk_accel_path "/Editor/editor-alternate-delete" "BackSpace") (gtk_accel_path "/Editor/remove-last-capture" "<%PRIMARY%>Delete") (gtk_accel_path "/Editor/playhead-to-previous-region-boundary-noselection" "<%LEVEL4%>leftarrow") diff --git a/gtk2_ardour/SAE-de-nokeypad.bindings.in b/gtk2_ardour/SAE-de-nokeypad.bindings.in index bcd7f6d3de..61af30e786 100644 --- a/gtk2_ardour/SAE-de-nokeypad.bindings.in +++ b/gtk2_ardour/SAE-de-nokeypad.bindings.in @@ -118,7 +118,8 @@ (gtk_accel_path "/Editor/playhead-to-edit" "Return") (gtk_accel_path "/Editor/edit-to-playhead" "<%SECONDARY%>Return") -(gtk_accel_path "/Editor/editor-delete" "BackSpace") +(gtk_accel_path "/Editor/editor-delete" "Delete") +(gtk_accel_path "/Editor/editor-alternate-delete" "BackSpace") (gtk_accel_path "/Editor/remove-last-capture" "<%PRIMARY%>BackSpace") (gtk_accel_path "/Editor/playhead-to-previous-region-boundary-noselection" "<%LEVEL4%>leftarrow") diff --git a/gtk2_ardour/SAE-us-keypad.bindings.in b/gtk2_ardour/SAE-us-keypad.bindings.in index 88085b0968..9b5d6c7e5b 100644 --- a/gtk2_ardour/SAE-us-keypad.bindings.in +++ b/gtk2_ardour/SAE-us-keypad.bindings.in @@ -117,7 +117,8 @@ (gtk_accel_path "/Editor/playhead-to-edit" "Return") (gtk_accel_path "/Editor/edit-to-playhead" "<%SECONDARY%>Return") -(gtk_accel_path "/Editor/editor-delete" "BackSpace") +(gtk_accel_path "/Editor/editor-delete" "Delete") +(gtk_accel_path "/Editor/editor-alternate-delete" "BackSpace") (gtk_accel_path "/Editor/remove-last-capture" "<%PRIMARY%>Delete") (gtk_accel_path "/Editor/playhead-to-previous-region-boundary-noselection" "<%LEVEL4%>leftarrow") diff --git a/gtk2_ardour/SAE-us-nokeypad.bindings.in b/gtk2_ardour/SAE-us-nokeypad.bindings.in index 33fe2f0e76..fe41b7df36 100644 --- a/gtk2_ardour/SAE-us-nokeypad.bindings.in +++ b/gtk2_ardour/SAE-us-nokeypad.bindings.in @@ -116,7 +116,8 @@ (gtk_accel_path "/Editor/playhead-to-edit" "Return") (gtk_accel_path "/Editor/edit-to-playhead" "<%SECONDARY%>Return") -(gtk_accel_path "/Editor/editor-delete" "BackSpace") +(gtk_accel_path "/Editor/editor-delete" "Delete") +(gtk_accel_path "/Editor/editor-alternate-delete" "BackSpace") (gtk_accel_path "/Editor/remove-last-capture" "<%PRIMARY%>BackSpace") (gtk_accel_path "/Editor/playhead-to-previous-region-boundary-noselection" "<%LEVEL4%>leftarrow") diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index 9200c0b453..8830ae491c 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -1,5 +1,7 @@ + + diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 89136db682..c11cbe06a2 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -553,6 +553,8 @@ Editor::register_actions () /* Note: for now, editor-delete does the exact same thing as editor-cut */ act = ActionManager::register_action (editor_actions, "editor-delete", _("Delete"), mem_fun(*this, &Editor::cut)); ActionManager::session_sensitive_actions.push_back (act); + act = ActionManager::register_action (editor_actions, "editor-alternate-delete", _("Delete (Backspace)"), mem_fun(*this, &Editor::cut)); + ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_action (editor_actions, "editor-copy", _("Copy"), mem_fun(*this, &Editor::copy)); ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_action (editor_actions, "editor-paste", _("Paste"), mem_fun(*this, &Editor::keyboard_paste)); diff --git a/gtk2_ardour/ergonomic-us.bindings.in b/gtk2_ardour/ergonomic-us.bindings.in index 523878bd3f..0268140233 100644 --- a/gtk2_ardour/ergonomic-us.bindings.in +++ b/gtk2_ardour/ergonomic-us.bindings.in @@ -284,7 +284,8 @@ ; (gtk_accel_path "/options/FileHeaderFormatCAF" "") (gtk_accel_path "/Common/ToggleLocations" "<%WINDOW%>l") ; (gtk_accel_path "/Editor/ToggleGeneric MIDISurface" "") -(gtk_accel_path "/Editor/editor-delete" "BackSpace") +(gtk_accel_path "/Editor/editor-delete" "Delete") +(gtk_accel_path "/Editor/editor-alternate-delete" "BackSpace") ; (gtk_accel_path "/JACK/JACKLatency256" "") (gtk_accel_path "/Editor/select-all-between-cursors" "F16") ; (gtk_accel_path "/Editor/LayerAddHigher" "") diff --git a/gtk2_ardour/mnemonic-us.bindings.in b/gtk2_ardour/mnemonic-us.bindings.in index 02f8fdd59e..22df5caebc 100644 --- a/gtk2_ardour/mnemonic-us.bindings.in +++ b/gtk2_ardour/mnemonic-us.bindings.in @@ -140,6 +140,7 @@ (gtk_accel_path "/Transport/GotoStart" "Home") (gtk_accel_path "/Transport/GotoEnd" "End") (gtk_accel_path "/Editor/editor-delete" "Delete") +(gtk_accel_path "/Editor/editor-alternate-delete" "BackSpace") (gtk_accel_path "/Editor/playhead-to-edit" "Return") (gtk_accel_path "/Editor/edit-to-playhead" "<%SECONDARY%>Return")