Re-pack Editor Toolbar:

Move zoom tools to right of toolbar.
Tweak numeric (mode) keybindings to more closely match the order they appear in the UI.
Add some new default keybindings.

gtk2_ardour/ardour.keys.in

@@ -102,8 +102,6 @@ This mode provides many different operations on both regions and control points,
 @vis|Editor/zoom-to-session|<@TERTIARY@>underscore|zoom to session
 @eep|Editor/edit-cursor-to-previous-region-sync|apostrophe|EP to prev region sync
 @eep|Editor/edit-cursor-to-next-region-sync|semicolon|EP to next region sync
-@eep|Editor/cycle-edit-point|grave|next EP w/o marker
-@eep|Editor/cycle-edit-point-with-marker|<@PRIMARY@>grave|next EP w/marker
 
 @trans|Transport/ToggleRoll|space|toggle roll
 @trans|Transport/PlaySelection|<@SECONDARY@>space|play edit range
@@ -174,7 +172,6 @@ This mode provides many different operations on both regions and control points,
 @wvis|Window/toggle-session-options-editor|<@SECONDARY@>o|toggle preferences dialog
 @edit|Editor/set-playhead|p|set playhead position
 @wvis|Window/toggle-audio-connection-manager|<@SECONDARY@>p|toggle global audio patchbay
-@midi|MIDI/panic|<@PRIMARY@><@SECONDARY@>p|MIDI panic (stop all notes etc)
 
 ;; MIDDLE ROW
 
@@ -194,8 +191,8 @@ This mode provides many different operations on both regions and control points,
 @select|Editor/select-all-in-punch-range|<@PRIMARY@>d|select all in punch range
 @vis|Editor/fit-selection|f|fit selection vertically
 @edit|Editor/toggle-follow-playhead|<@PRIMARY@>f|toggle playhead tracking
+@edit|Editor/toggle-stationary-playhead|<@TERTIARY@>f|toggle stationary playhead
 @rop|Region/show-rhythm-ferret|<@SECONDARY@>f|show rhythm ferret window 
-@gmode|Transport/ToggleFollowEdits|<@TERTIARY@>f|toggle playhead follows edits
 @wvis|Common/ToggleMaximalEditor|<@PRIMARY@><@SECONDARY@>f|maximise editor space
 @wvis|Common/ToggleMaximalMixer|<@PRIMARY@><@TERTIARY@>f|maximise mixer space
 @edit|Region/play-selected-regions|h|play selected region(s)
@@ -340,14 +337,21 @@ This mode provides many different operations on both regions and control points,
 
 ;; numbers
 
-@vis|Editor/cycle-zoom-focus|1|cycle to next zoom focus
+@gmode|Transport/ToggleClick|grave|toggle click (metronome)
-@grid|Editor/cycle-snap-mode|2|cycle to next snap mode
+@midi|MIDI/panic|<@PRIMARY@>grave|MIDI panic (stop all midi notes)
-@grid|Editor/prev-grid-choice|3|use prev grid unit
+@trans|Transport/ToggleExternalSync|<@SECONDARY@>grave|toggle external sync
-@grid|Editor/next-grid-choice|4|use next grid unit
+@eep|Editor/cycle-edit-mode|1|cycle edit mode {slide, lock, ripple}
-@gmode|Transport/ToggleAutoPlay|5|toggle auto play
+@eep|Editor/cycle-edit-point|2|next EP w/o marker {playhead, mouse}
-@gmode|Transport/ToggleAutoReturn|6|toggle auto return
+@eep|Editor/cycle-edit-point-with-marker|<@PRIMARY@>2|next EP w/marker {playhead, mouse, marker}
-@gmode|Transport/ToggleClick|7|toggle click (metronome)
+@mmode|MouseMode/set-mouse-mode-object-range|3|Smart Mode (provide some Range tools in Object mode)
-@mmode|MouseMode/set-mouse-mode-object-range|8|link object/range tools
+@gmode|Transport/ToggleFollowEdits|<@PRIMARY@>3|toggle playhead follows edits
+@grid|Editor/cycle-snap-mode|4|cycle to next snap mode {On/Off}
+@grid|Editor/prev-grid-choice|5|use prev grid unit
+@grid|Editor/next-grid-choice|6|use next grid unit
+@gmode|Transport/ToggleAutoReturn|7|toggle auto return
+@gmode|Transport/ToggleAutoPlay|<@PRIMARY@>7|toggle auto play
+@gmode|Transport/TogglePunch|8|toggle punch in+out
+; ToDo @gmode|Transport/ToggleRecMode|<@PRIMARY@>8|toggle recording mode ( layered, overwrite, merge )
 @ranges|Region/set-tempo-from-region|9|set tempo (1 bar) from region(s)
 @ranges|Editor/set-tempo-from-edit-range|0|set tempo (1 bar) from edit range
 

gtk2_ardour/ardour.menus.in

@@ -158,6 +158,7 @@
       <menuitem action='toggle-follow-playhead'/>
       <menuitem action='toggle-stationary-playhead'/>
       <menuitem action='ToggleFollowEdits'/>
+      <menuitem action='ToggleExternalSync'/>
       <menuitem action='panic'/>
       <separator/>
     </menu>

gtk2_ardour/editor.cc

@@ -2950,6 +2950,9 @@ Editor::setup_toolbar ()
 
 	if (!ARDOUR::Profile->get_trx()) {
 		mode_box->pack_start (edit_mode_selector, false, false);
+		mode_box->pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
+		mode_box->pack_start (edit_point_selector, false, false);
+		mode_box->pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
 	}
 
 	mode_box->pack_start (*mouse_mode_box, false, false);
@@ -3037,13 +3040,6 @@ Editor::setup_toolbar ()
 	snap_box.pack_start (snap_mode_button, false, false);
 	snap_box.pack_start (grid_type_selector, false, false);
 
-	/* Edit Point*/
-	HBox *ep_box = manage (new HBox);
-	ep_box->set_spacing (2);
-	ep_box->set_border_width (2);
-
-	ep_box->pack_start (edit_point_selector, false, false);
-
 	/* Nudge */
 
 	HBox *nudge_box = manage (new HBox);
@@ -3069,23 +3065,20 @@ Editor::setup_toolbar ()
 
 		toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
 
-		toolbar_hbox.pack_start (_zoom_box, false, false);
-
-		toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
-
-		toolbar_hbox.pack_start (_track_box, false, false);
-
-		toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
-
 		toolbar_hbox.pack_start (snap_box, false, false);
 
 		toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
 
-		toolbar_hbox.pack_start (*ep_box, false, false);
-
-		toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
-
 		toolbar_hbox.pack_start (*nudge_box, false, false);
+
+		//zoom tools on right ege
+
+		toolbar_hbox.pack_end (_zoom_box, false, false);
+
+		toolbar_hbox.pack_end (*(manage (new ArdourVSpacer ())), false, false, 3);
+
+		toolbar_hbox.pack_end (_track_box, false, false);
+
 	}
 
 	toolbar_hbox.show_all ();