[Summary] Reordering TRACKS top bars

[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 461616]

gtk2_ardour/editor_actions.cc

@@ -443,7 +443,7 @@ Editor::register_actions ()
 
 	act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-zoom", _("Zoom Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseZoom));	
 	mouse_zoom_button.set_related_action (act);
-	mouse_zoom_button.set_image (::get_icon("tool_zoom"));
+	mouse_zoom_button.set_image (::get_icon("tool_zoom_ardour"));
 	mouse_zoom_button.add_elements ( ArdourButton::Inset );
 	mouse_zoom_button.set_name ("mouse mode button");
 

gtk2_ardour/ui/tracks_tools.xml

@@ -1,47 +1,88 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <Layout>
-  <HBox spacing="1">
-    <iconbutton id="inspector_on_button"
-                width="47" height="26"
-                normalicon="inspector_on"
-                activeicon="inspector_on_active"
-                prelighticon="inspector_on_prelight"/>
-    <iconbutton id="mixer_on_button"
-                width="48" height="26"
-                normalicon="mixer_on"
-                activeicon="mixer_on_active"
-                prelighticon="mixer_on_prelight"/>
-    <layout     width="48" height="26" bgnormal=""/>
-    <iconbutton id="transport_start_button"
-                width="34" height="26"
-                normalicon="transport_start"
-                activeicon="transport_start_active"
-                prelighticon="transport_start_prelight"/>
-    <iconbutton id="transport_end_button"
-                width="34" height="26"
-                normalicon="transport_end"
-                activeicon="transport_end_active"
-                prelighticon="transport_end_prelight"/>
-    <iconbutton id="transport_play_button"
-                width="34" height="26"
-                normalicon="transport_play"
-                activeicon="transport_play_active"
-                prelighticon="transport_play_prelight"/>
-    <iconbutton id="transport_record_button"
-                width="34" height="26"
-                normalicon="transport_record"
-                activeicon="transport_record_active"
-                prelighticon="transport_record_prelight"/>
-    <iconbutton id="transport_stop_button"
-                width="34" height="26"
-                normalicon="transport_stop"
-                activeicon="transport_stop_active"
-                prelighticon="transport_stop_prelight"/>
-    <iconbutton id="transport_loop_button"
-                width="34" height="26"
-                normalicon="transport_loop"
-                activeicon="transport_loop_active"
-                prelighticon="transport_loop_prelight"/>
-  </HBox>
+  <VBox>
+    <HBox>
+      <iconbutton id="tracks_button"
+                  width="53" height="53"
+                  normalicon="tracks"
+                  activeicon="tracks_active"
+                  prelighticon="tracks_prelight"/>
+    </HBox>
+    <HBox spacing="1">
+      <iconbutton id="inspector_on_button"
+                  width="48" height="26"
+                  normalicon="inspector_on"
+                  activeicon="inspector_on_active"
+                  prelighticon="inspector_on_prelight"/>
+      <iconbutton id="mixer_on_button"
+                  width="48" height="26"
+                  normalicon="mixer_on"
+                  activeicon="mixer_on_active"
+                  prelighticon="mixer_on_prelight"/>
+      <iconbutton id="meter_bridge_on_button"
+                  width="48" height="26"
+                  normalicon="meter_bridge_on"
+                  activeicon="meter_bridge_on_active"
+                  prelighticon="meter_bridge_on_prelight"/>
+      <layout     width="54" height="26" bgnormal=""/>
+      <iconbutton id="transport_start_button"
+                  width="34" height="26"
+                  normalicon="transport_start"
+                  activeicon="transport_start_active"
+                  prelighticon="transport_start_prelight"/>
+      <iconbutton id="transport_end_button"
+                  width="34" height="26"
+                  normalicon="transport_end"
+                  activeicon="transport_end_active"
+                  prelighticon="transport_end_prelight"/>
+      <iconbutton id="transport_play_button"
+                  width="34" height="26"
+                  normalicon="transport_play"
+                  activeicon="transport_play_active"
+                  prelighticon="transport_play_prelight"/>
+      <iconbutton id="transport_record_button"
+                  width="34" height="26"
+                  normalicon="transport_record"
+                  activeicon="transport_record_active"
+                  prelighticon="transport_record_prelight"/>
+      <iconbutton id="transport_stop_button"
+                  width="34" height="26"
+                  normalicon="transport_stop"
+                  activeicon="transport_stop_active"
+                  prelighticon="transport_stop_prelight"/>
+      <iconbutton id="transport_loop_button"
+                  width="34" height="26"
+                  normalicon="transport_loop"
+                  activeicon="transport_loop_active"
+                  prelighticon="transport_loop_prelight"/>
+      <iconbutton id="lock_session_button"
+                  width="34" height="26"
+                  normalicon="lock_session"
+                  activeicon="lock_session_active"
+                  prelighticon="lock_session_prelight"/>
+      <layout     width="60" height="26" bgnormal=""/>
+      <iconbutton id="tool_marker_button"
+                  width="34" height="26"
+                  normalicon="tool_marker"
+                  activeicon="tool_marker_active"
+                  prelighticon="tool_marker_prelight"/>
+      <iconbutton id="tool_arrow_button"
+                  width="34" height="26"
+                  normalicon="tool_arrow"
+                  activeicon="tool_arrow_active"
+                  prelighticon="tool_arrow_prelight"/>
+      <iconbutton id="tool_cut_button"
+                  width="34" height="26"
+                  normalicon="tool_cut"
+                  activeicon="tool_cut_active"
+                  prelighticon="tool_cut_prelight"/>
+      <iconbutton id="tool_zoom_button"
+                  width="34" height="26"
+                  normalicon="tool_zoom"
+                  activeicon="tool_zoom_active"
+                  prelighticon="tool_zoom_prelight"/>
+      <layout     width="68" height="26" bgnormal=""/>
+    </HBox>
+  </VBox>
 </Layout>