+ HBox* tbox = manage (new HBox);
+ tbox->set_spacing (PX_SCALE(2));
+
+ tbox->pack_start (midi_panic_button, true, true, 0);
+ tbox->pack_start (click_button, true, true, 0);
+ tbox->pack_start (goto_start_button, true, true);
+ tbox->pack_start (goto_end_button, true, true);
+ tbox->pack_start (auto_loop_button, true, true);
+ tbox->pack_start (play_selection_button, true, true);
+
+ tbox->pack_start (roll_button, true, true);
+ tbox->pack_start (stop_button, true, true);
+ tbox->pack_start (rec_button, true, true, 3);
+
+ /* alert box sub-group */
+ VBox* alert_box = manage (new VBox);
+ alert_box->set_homogeneous (true);
+ alert_box->set_spacing (1);
+ alert_box->set_border_width (0);
+ alert_box->pack_start (solo_alert_button, true, false, 0);
+ alert_box->pack_start (auditioning_alert_button, true, false, 0);
+ alert_box->pack_start (feedback_alert_button, true, false, 0);
+
+ /* clock button size groups */
+ Glib::RefPtr<SizeGroup> button_height_size_group = SizeGroup::create (Gtk::SIZE_GROUP_VERTICAL);
+ button_height_size_group->add_widget (follow_edits_button);
+ button_height_size_group->add_widget (*primary_clock->left_btn());
+ button_height_size_group->add_widget (*primary_clock->right_btn());
+ button_height_size_group->add_widget (*secondary_clock->left_btn());
+ button_height_size_group->add_widget (*secondary_clock->right_btn());
+
+ button_height_size_group->add_widget (stop_button);
+// button_height_size_group->add_widget (sync_button);
+// button_height_size_group->add_widget (layered_button);
+ button_height_size_group->add_widget (auto_return_button);
+ button_height_size_group->add_widget (editor_visibility_button);
+ button_height_size_group->add_widget (mixer_visibility_button);
+
+ Glib::RefPtr<SizeGroup> clock1_size_group = SizeGroup::create (SIZE_GROUP_BOTH);
+ clock1_size_group->add_widget (*primary_clock->left_btn());
+ clock1_size_group->add_widget (*primary_clock->right_btn());
+
+ Glib::RefPtr<SizeGroup> clock2_size_group = SizeGroup::create (SIZE_GROUP_BOTH);
+ clock2_size_group->add_widget (*secondary_clock->left_btn());
+ clock2_size_group->add_widget (*secondary_clock->right_btn());
+
+ /* sub-layout for Sync | Shuttle (grow) */
+ HBox* ssbox = manage (new HBox);
+ ssbox->set_spacing (PX_SCALE(2));
+ ssbox->pack_start (sync_button, false, false, 0);
+ ssbox->pack_start (*shuttle_box, true, true, 3);
+
+
+ /* and the main table layout */
+
+ int col = 0;
+#define TCOL col, col + 1
+
+ transport_table.attach (*tbox, TCOL, 0, 1 , SHRINK, SHRINK, 0, 0);
+ transport_table.attach (*ssbox, TCOL, 1, 2 , FILL, SHRINK, 0, 0);
+ ++col;
+
+ transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0);
+ ++col;
+
+ transport_table.attach (punch_label, TCOL, 0, 1 , FILL, SHRINK, 3, 0);
+ transport_table.attach (layered_label, TCOL, 1, 2 , FILL, SHRINK, 3, 0);
+ ++col;
+
+ transport_table.attach (punch_in_button, col, col + 1, 0, 1 , FILL, SHRINK, 0, 2);
+ transport_table.attach (*(manage (new Label (""))), col + 1, col + 2, 0, 1 , FILL, SHRINK, 2, 2);
+ transport_table.attach (punch_out_button, col + 2, col + 3, 0, 1 , FILL, SHRINK, 0, 2);
+ transport_table.attach (layered_button, col, col + 3, 1, 2 , FILL, SHRINK, 0, 2);
+ col += 3;
+
+ transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0);
+ ++col;
+
+ transport_table.attach (follow_edits_button, TCOL, 0, 1 , FILL, SHRINK, 2, 0);
+ transport_table.attach (auto_return_button, TCOL, 1, 2 , FILL, SHRINK, 2, 0);
+ ++col;
+
+ transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0);
+ ++col;
+
+ transport_table.attach (*primary_clock, col, col + 2, 0, 1 , FILL, SHRINK, 2, 0);
+ transport_table.attach (*primary_clock->left_btn(), col, col + 1, 1, 2 , FILL, SHRINK, 2, 0);
+ transport_table.attach (*primary_clock->right_btn(), col + 1, col + 2, 1, 2 , FILL, SHRINK, 2, 0);
+ col += 2;
+
+ transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0);
+ ++col;
+
+ if (!ARDOUR::Profile->get_small_screen()) {
+ transport_table.attach (*secondary_clock, col, col + 2, 0, 1 , FILL, SHRINK, 2, 0);
+ transport_table.attach (*secondary_clock->left_btn(), col, col + 1, 1, 2 , FILL, SHRINK, 2, 0);
+ transport_table.attach (*secondary_clock->right_btn(), col + 1, col + 2, 1, 2 , FILL, SHRINK, 2, 0);
+ col += 2;
+ }
+
+ transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0);
+ ++col;