reinstate export-region which was lost, change keybindings to more closely match 3.0, and make zoom-to-region more straightforward.

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5656 d708f5d6-7413-0410-9779-e7cbd77b26cf

8 files changed, 38 insertions, 56 deletions

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index fbb20d4cdc..606b79f26e 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -18,6 +18,7 @@
            <menu name='Export' action='Export'>
                <menuitem action='ExportSession'/>
                <menuitem action='ExportSelection'/>
+               <menuitem action='export-region'/>
                <menuitem action='ExportRangeMarkers'/>
            </menu>
            <separator/>
@@ -209,7 +210,6 @@
 			   <menuitem action='toggle-edit-mode'/>
 			   <separator/>
 			   <menu name='MouseMode' action='MouseMode'>
-			   <menuitem action='step-mouse-mode'/>
 			   <menuitem action='set-mouse-mode-object'/>
 			   <menuitem action='set-mouse-mode-range'/>
 			   <menuitem action='set-mouse-mode-gain'/>
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 90faeb33d3..fc016acb53 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -143,11 +143,11 @@ ARDOUR_UI::install_actions ()
 	act = ActionManager::register_action (main_actions, X_("ExportSession"), _("Export session to audiofile..."),  mem_fun (*editor, &PublicEditor::export_session));
 	ActionManager::session_sensitive_actions.push_back (act);
 
-	act = ActionManager::register_action (main_actions, X_("ExportSelection"), _("Export selection to audiofile..."),  mem_fun (*editor, &PublicEditor::export_selection));
+	act = ActionManager::register_action (main_actions, X_("ExportSelection"), _("Export selected range to audiofile..."),  mem_fun (*editor, &PublicEditor::export_selection));
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::time_selection_sensitive_actions.push_back (act);
 
-	act = ActionManager::register_action (main_actions, X_("ExportRangeMarkers"), _("Export range markers to audiofile..."),  mem_fun (*editor, &PublicEditor::export_range_markers));
+	act = ActionManager::register_action (main_actions, X_("ExportRangeMarkers"), _("Export range markers to multiple audiofiles..."),  mem_fun (*editor, &PublicEditor::export_range_markers));
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::range_sensitive_actions.push_back (act);
 
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 256f053f08..693ff74623 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -345,7 +345,6 @@ Editor::Editor ()
 	_dragging_edit_point = false;
 	_dragging_hscrollbar = false;
 	select_new_marker = false;
-	zoomed_to_region = false;
 	rhythm_ferret = 0;
 	allow_vertical_scroll = false;
 	no_save_visual = false;
@@ -4359,7 +4358,6 @@ Editor::current_visual_state (bool with_tracks)
 	vs->frames_per_unit = frames_per_unit;
 	vs->leftmost_frame = leftmost_frame;
 	vs->zoom_focus = zoom_focus;
-	vs->zoomed_to_region = zoomed_to_region;
 
 	if (with_tracks) {
 		for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
@@ -4416,7 +4414,6 @@ Editor::use_visual_state (VisualState& vs)
 
 	set_zoom_focus (vs.zoom_focus);
 	reposition_and_zoom (vs.leftmost_frame, vs.frames_per_unit);
-	zoomed_to_region = vs.zoomed_to_region;
 	
 	for (list<TAVState>::iterator i = vs.track_states.begin(); i != vs.track_states.end(); ++i) {
 		TrackViewList::iterator t;
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index caad69d532..234680ebbc 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -430,7 +430,6 @@ class Editor : public PublicEditor
 	    double              frames_per_unit;
 	    nframes64_t         leftmost_frame;
 	    Editing::ZoomFocus  zoom_focus;
-	    bool                zoomed_to_region;
 	    std::list<TAVState> track_states;
 	};
 	
@@ -1150,7 +1149,6 @@ class Editor : public PublicEditor
 	void temporal_zoom_selection ();
 	void temporal_zoom_region (bool both_axes);
 	void toggle_zoom_region (bool both_axes);
-	bool zoomed_to_region;
 	void temporal_zoom_session ();
 	void temporal_zoom (gdouble scale);
 	void temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const string & op);
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 07d76a4a24..d9afdc2c23 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -497,7 +497,7 @@ Editor::register_actions ()
 	act = ActionManager::register_action (editor_actions, "lower-region", _("Lower Region"), mem_fun(*this, &Editor::lower_region));
         ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::region_selection_sensitive_actions.push_back (act);
-	act = ActionManager::register_action (editor_actions, "export-region", _("Export Region"), mem_fun(*this, &Editor::export_region));
+	act = ActionManager::register_action (editor_actions, "export-region", _("Export selected regions to audiofile..."), mem_fun(*this, &Editor::export_region));
         ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::region_selection_sensitive_actions.push_back (act);
 	act = ActionManager::register_toggle_action (editor_actions, "lock-region", _("Lock Region"), mem_fun(*this, &Editor::toggle_region_lock));
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 3c19d69a30..8604aa7175 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1815,18 +1815,13 @@ Editor::temporal_zoom_region (bool both_axes)
 		no_save_visual = false;
 	}
 
-	zoomed_to_region = true;
 	redo_visual_stack.push_back (current_visual_state());
 }
 
 void
 Editor::toggle_zoom_region (bool both_axes)
 {
-	if (zoomed_to_region) {
-		swap_visual_state ();
-	} else {
-		temporal_zoom_region (both_axes);
-	}
+	temporal_zoom_region (both_axes);
 }
 
 void
diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index e6a0695bda..b82d296429 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -832,8 +832,6 @@ Editor::region_selection_changed ()
 	}
 	
 	sensitize_the_right_region_actions (!selection->regions.empty());
-
-	zoomed_to_region = false;
 }
 
 void
diff --git a/gtk2_ardour/mnemonic-us.bindings.in b/gtk2_ardour/mnemonic-us.bindings.in
index d6df9078cc..832e9715f5 100644
--- a/gtk2_ardour/mnemonic-us.bindings.in
+++ b/gtk2_ardour/mnemonic-us.bindings.in
@@ -12,58 +12,54 @@
 (gtk_accel_path "<Actions>/Editor/cycle-edit-point" "grave")
 (gtk_accel_path "<Actions>/Editor/cycle-edit-point-with-marker" "<%PRIMARY%>asciicircum")
 
-(gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary" "period")
-(gtk_accel_path "<Actions>/Editor/playhead-to-next-region-sync" "<%PRIMARY%>period")
-
-(gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary" "comma")
-(gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-sync" "<%PRIMARY%>comma")
-
 (gtk_accel_path "<Actions>/Editor/extend-range-to-end-of-region" "rightanglebracket")
 (gtk_accel_path "<Actions>/Editor/extend-range-to-start-of-region" "leftanglebracket")
 
 (gtk_accel_path "<Actions>/Transport/ToggleRoll" "space")
+(gtk_accel_path "<Actions>/Editor/play-edit-range" "<%SECONDARY%>space")
+(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<%PRIMARY%><%TERTIARY%>space")
 (gtk_accel_path "<Actions>/Transport/ToggleRollForgetCapture" "<%PRIMARY%>space")
 (gtk_accel_path "<Actions>/Transport/record-roll" "<%TERTIARY%>space")
-
 (gtk_accel_path "<Actions>/Editor/set-fade-in-length" "slash")
-(gtk_accel_path "<Actions>/Editor/set-fade-out-length" "backslash")
-
+(gtk_accel_path "<Actions>/Editor/set-fade-out-length" "<%PRIMARY%>slash")
+(gtk_accel_path "<Actions>/Editor/toggle-fade-out-active" "backslash")
+(gtk_accel_path "<Actions>/Editor/toggle-fade-out-active" "<%PRIMARY%>backslash")
 (gtk_accel_path "<Actions>/Editor/trim-from-start" "<%TERTIARY%>braceleft")
 (gtk_accel_path "<Actions>/Editor/trim-to-end" "<%TERTIARY%>braceright")
-
 (gtk_accel_path "<Actions>/Editor/set-loop-from-edit-range" "bracketright")
 (gtk_accel_path "<Actions>/Editor/set-loop-from-region" "<%SECONDARY%>bracketright")
-
 (gtk_accel_path "<Actions>/Editor/set-punch-from-edit-range" "bracketleft")
 (gtk_accel_path "<Actions>/Editor/set-punch-from-region" "<%SECONDARY%>bracketleft")
-
 (gtk_accel_path "<Actions>/Editor/boost-region-gain" "asciicircum")
 (gtk_accel_path "<Actions>/Editor/cut-region-gain" "ampersand")
-
-;; letters
-
-;; TOP ROW
-
 (gtk_accel_path "<Actions>/Common/Quit" "<%PRIMARY%>q")
 
 ;; note that ctrl-w is special and consumed by the keyboard snooper
 
 (gtk_accel_path "<Actions>/Editor/set-edit-point" "e")
 (gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<%PRIMARY%>e")
+(gtk_accel_path "<Actions>/Editor/export-region" "<%SECONDARY%><%TERTIARY%>e")
+(gtk_accel_path "<Actions>/Main/ExportSession" "<%PRIMARY%><%SECONDARY%>e")
+(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<%PRIMARY%><%TERTIARY%>e")
 (gtk_accel_path "<Actions>/Editor/show-editor-mixer" "<%TERTIARY%>e")
 (gtk_accel_path "<Actions>/Common/goto-editor" "<%WINDOW%>e")
-(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<%TERTIARY%><%PRIMARY%>e")
 (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-range" "r")
 (gtk_accel_path "<Actions>/Editor/redo" "<%PRIMARY%>r")
+(gtk_accel_path "<Actions>/Editor/reverse-region" "<%SECONDARY%>r")
 (gtk_accel_path "<Actions>/Transport/Record" "<%TERTIARY%>r")
 (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-timefx" "t")
+(gtk_accel_path "<Actions>/Editor/pitch-shift-region" "<%SECONDARY%>t")
 (gtk_accel_path "<Actions>/Editor/insert-time" "<%PRIMARY%>t")
-(gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "u")
+(gtk_accel_path "<Actions>/Editor/select-all-between-cursors" "<%PRIMARY%>u")
+(gtk_accel_path "<Actions>/Editor/select-all-within-cursors" "u")
 (gtk_accel_path "<Actions>/Editor/insert-region" "i")
 (gtk_accel_path "<Actions>/Editor/invert-selection" "<%TERTIARY%>i")
-(gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<%SECONDARY%>i")
+(gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<%PRIMARY%>i")
 (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-object" "o")
+(gtk_accel_path "<Actions>/Main/Open" "<%PRIMARY%>o")
+(gtk_accel_path "<Actions>/Main/Recent" "<%PRIMARY%><%TERTIARY%>o")
 (gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<%WINDOW%>o")
+(gtk_accel_path "<Actions>/Editor/naturalize-region" "<%PRIMARY%><%SECONDARY%>o")
 (gtk_accel_path "<Actions>/Editor/set-playhead" "p")
 (gtk_accel_path "<Actions>/Editor/select-all-before-playhead" "<%PRIMARY%>p")
 (gtk_accel_path "<Actions>/Editor/select-all-after-playhead" "<%TERTIARY%><%PRIMARY%>p")
@@ -74,10 +70,13 @@
 (gtk_accel_path "<Actions>/Editor/select-all" "<%PRIMARY%>a")
 (gtk_accel_path "<Actions>/Editor/align-regions-end" "<%SECONDARY%>a")
 (gtk_accel_path "<Actions>/Editor/align-regions-sync" "<%TERTIARY%>a")
-(gtk_accel_path "<Actions>/Editor/align-regions-start-relative" "<%LEVEL4%>a")
+(gtk_accel_path "<Actions>/Editor/align-regions-start" "<%PRIMARY%><%SECONDARY%>a")
+(gtk_accel_path "<Actions>/Editor/align-regions-start-relative" "<%SECONDARY%><%TERTIARY%>a")
 (gtk_accel_path "<Actions>/Editor/split-region" "s")
 (gtk_accel_path "<Actions>/Common/Save" "<%PRIMARY%>s")
+(gtk_accel_path "<Actions>/Main/Snapshot" "<%PRIMARY%><%TERTIARY%>s")
 (gtk_accel_path "<Actions>/Editor/duplicate-region" "d")
+(gtk_accel_path "<Actions>/Editor/multi-duplicate-region" "<%TERTIARY%>d")
 (gtk_accel_path "<Actions>/Editor/select-all-in-punch-range" "<%PRIMARY%>d")
 (gtk_accel_path "<Actions>/Editor/fit-tracks" "f")
 (gtk_accel_path "<Actions>/Editor/toggle-follow-playhead" "<%PRIMARY%>f")
@@ -90,9 +89,6 @@
 (gtk_accel_path "<Actions>/Transport/Loop" "l")
 (gtk_accel_path "<Actions>/Editor/select-all-in-loop-range" "<%PRIMARY%>l")
 (gtk_accel_path "<Actions>/Common/ToggleLocations" "<%WINDOW%>l")
-
-;; HOME ROW
-
 (gtk_accel_path "<Actions>/Editor/zoom-to-region" "<%PRIMARY%><%SECONDARY%>z")
 (gtk_accel_path "<Actions>/Editor/zoom-to-region-both-axes" "<%SECONDARY%>z")
 (gtk_accel_path "<Actions>/Editor/undo" "<%PRIMARY%>z")
@@ -104,13 +100,14 @@
 (gtk_accel_path "<Actions>/Editor/set-region-sync-position" "v")
 (gtk_accel_path "<Actions>/Editor/editor-paste" "<%PRIMARY%>v")
 (gtk_accel_path "<Actions>/Editor/brush-at-mouse" "<%PRIMARY%>b")
+(gtk_accel_path "<Actions>/Editor/track-record-enable-toggle" "<%SECONDARY%>b")
 (gtk_accel_path "<Actions>/Common/ToggleBigClock" "<%WINDOW%>b")
 (gtk_accel_path "<Actions>/Editor/normalize-region" "n")
-(gtk_accel_path "<Actions>/Editor/mute-unmute-region" "m")
+(gtk_accel_path "<Actions>/Main/AddTrackBus" "<%PRIMARY%><%TERTIARY%>n")
+(gtk_accel_path "<Actions>/Main/New" "<%PRIMARY%>n")
+(gtk_accel_path "<Actions>/Editor/toggle-internal-edit" "<%PRIMARY%>m")
+(gtk_accel_path "<Actions>/Editor/mute-unmute-region" "<%PRIMARY%>m")
 (gtk_accel_path "<Actions>/Common/toggle-editor-mixer-on-top" "<%WINDOW%>m")
-
-;; arrow keys, navigation etc.
-
 (gtk_accel_path "<Actions>/Editor/step-tracks-up" "uparrow")
 (gtk_accel_path "<Actions>/Transport/TransitionToRoll" "<%TERTIARY%>uparrow")
 (gtk_accel_path "<Actions>/Editor/select-prev-route" "<%SECONDARY%>uparrow")
@@ -122,19 +119,21 @@
 (gtk_accel_path "<Actions>/Editor/move-selected-tracks-down" "<%PRIMARY%>downarrow")
 
 (gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary" "leftarrow")
-(gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary-noselection" "<%LEVEL4%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary-noselection" "<%SECONDARY%><%TERTIARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-sync" "<%PRIMARY%><%SECONDARY%>leftarrow")
 (gtk_accel_path "<Actions>/Editor/tab-to-transient-backwards" "<%PRIMARY%>leftarrow")
 (gtk_accel_path "<Actions>/Editor/nudge-playhead-backward" "<%SECONDARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-backward-to-grid" "<%SECONDARY%><%TERTIARY%>leftarrow")
 (gtk_accel_path "<Actions>/Transport/Rewind" "<%TERTIARY%>leftarrow")
 (gtk_accel_path "<Actions>/Editor/selected-marker-to-previous-region-boundary" "<%PRIMARY%><%TERTIARY%>leftarrow")
-
 (gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary" "rightarrow")
-(gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary-noselection" "<%LEVEL4%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary-noselection" "<%SECONDARY%><%TERTIARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-to-next-region-sync" "<%PRIMARY%><%SECONDARY%>rightarrow")
 (gtk_accel_path "<Actions>/Editor/tab-to-transient-forwards" "<%PRIMARY%>rightarrow")
 (gtk_accel_path "<Actions>/Editor/nudge-playhead-forward" "<%SECONDARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/playhead-forward-to-grid" "<%SECONDARY%><%TERTIARY%>rightarrow")
 (gtk_accel_path "<Actions>/Transport/Forward" "<%TERTIARY%>rightarrow")
 (gtk_accel_path "<Actions>/Editor/selected-marker-to-next-region-boundary" "<%PRIMARY%><%TERTIARY%>rightarrow")
-
 (gtk_accel_path "<Actions>/Editor/scroll-tracks-down" "Page_Down")
 (gtk_accel_path "<Actions>/Editor/scroll-tracks-up" "Page_Up")
 (gtk_accel_path "<Actions>/Transport/GotoStart" "Home")
@@ -149,18 +148,13 @@
 
 (gtk_accel_path "<Actions>/Editor/nudge-backward" "KP_Subtract")
 (gtk_accel_path "<Actions>/Editor/nudge-next-backward" "<%PRIMARY%>KP_Subtract")
-
 (gtk_accel_path "<Actions>/Editor/jump-forward-to-mark" "<%PRIMARY%>KP_Right")
 (gtk_accel_path "<Actions>/Editor/jump-backward-to-mark" "<%PRIMARY%>KP_Left")
-
 (gtk_accel_path "<Actions>/Editor/nudge-forward" "KP_Add")
 (gtk_accel_path "<Actions>/Editor/nudge-next-forward" "<%PRIMARY%>KP_Add")
-
 (gtk_accel_path "<Actions>/Editor/start-range" "<%PRIMARY%>KP_Down")
-
 (gtk_accel_path "<Actions>/Editor/finish-range" "<%PRIMARY%>KP_Up")
 (gtk_accel_path "<Actions>/Editor/finish-add-range" "<%TERTIARY%><%PRIMARY%>KP_Up")
-
 (gtk_accel_path "<Actions>/Editor/add-location-from-playhead" "KP_Enter")
 (gtk_accel_path "<Actions>/Transport/focus-on-clock" "KP_Divide")
 
@@ -181,7 +175,7 @@
 (gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-end" "F2")
 (gtk_accel_path "<Actions>/Editor/crop" "F3")
 (gtk_accel_path "<Actions>/Editor/separate" "F4")
-(gtk_accel_path "<Actions>/Editor/pitch-shift-region" "F5")
+(gtk_accel_path "<Actions>/Editor/pitch-<%TERTIARY%>-region" "F5")
 (gtk_accel_path "<Actions>/Editor/select-range-between-cursors" "F6")
 (gtk_accel_path "<Actions>/Common/ToggleMaximalEditor" "F11")
 
@@ -217,7 +211,7 @@
 (gtk_accel_path "<Actions>/Editor/toggle-edit-mode" "1")
 (gtk_accel_path "<Actions>/Editor/cycle-snap-mode" "2")
 (gtk_accel_path "<Actions>/Editor/cycle-snap-choice" "3")
-(gtk_accel_path "<Actions>/Editor/step-mouse-mode" "4")
+(gtk_accel_path "<Actions>/Transport/ToggleAutoPlay" "4")
 (gtk_accel_path "<Actions>/Transport/ToggleAutoReturn" "5")
 (gtk_accel_path "<Actions>/Transport/ToggleClick" "6")
 (gtk_accel_path "<Actions>/Editor/set-tempo-from-region" "9")