fix double quote in fr.po
[ardour.git] / gtk2_ardour / ardour_ui2.cc
index 1a9b7e53dd1f51cef1a28930222652f8036f6858..00a1bde046977aabdfdcf71c6c9c2bb67dd2827c 100644 (file)
 #include <cmath>
 
 #include <sigc++/bind.h>
+#include "canvas/canvas.h"
+
 #include "pbd/error.h"
 #include "pbd/basename.h"
 #include "pbd/fastlog.h"
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/click_box.h>
-#include <gtkmm2ext/tearoff.h>
 
-#include "ardour/session.h"
-#include "ardour/audioengine.h"
-#include "ardour/ardour.h"
+#include "gtkmm2ext/cairocell.h"
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/click_box.h"
+#include "gtkmm2ext/window_title.h"
+
 #include "ardour/profile.h"
-#include "ardour/route.h"
+#include "ardour/session.h"
+#include "ardour/types.h"
 
 #include "ardour_ui.h"
 #include "keyboard.h"
 #include "public_editor.h"
 #include "audio_clock.h"
 #include "actions.h"
+#include "main_clock.h"
+#include "mixer_ui.h"
 #include "utils.h"
 #include "theme_manager.h"
 #include "midi_tracer.h"
+#include "shuttle_control.h"
 #include "global_port_matrix.h"
 #include "location_ui.h"
+#include "rc_option_editor.h"
+#include "time_info_box.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -61,88 +68,33 @@ using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
 using namespace Glib;
+using namespace ARDOUR_UI_UTILS;
 
-int
-ARDOUR_UI::setup_windows ()
-{
-       if (create_editor ()) {
-               error << _("UI: cannot setup editor") << endmsg;
-               return -1;
-       }
-
-       if (create_mixer ()) {
-               error << _("UI: cannot setup mixer") << endmsg;
-               return -1;
-       }
-
-       /* all other dialogs are created conditionally */
-
-       we_have_dependents ();
-
-       theme_manager->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleThemeManager")));
-
-#ifdef TOP_MENUBAR
-       HBox* status_bar_packer = manage (new HBox);
-       EventBox* status_bar_event_box = manage (new EventBox);
-
-       status_bar_event_box->add (status_bar_label);
-       status_bar_event_box->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-       status_bar_label.set_size_request (300, -1);
-       status_bar_packer->pack_start (*status_bar_event_box, true, true, 6);
-       status_bar_packer->pack_start (error_log_button, false, false);
-
-       status_bar_label.show ();
-       status_bar_event_box->show ();
-       status_bar_packer->show ();
-       error_log_button.show ();
-
-       error_log_button.signal_clicked().connect (mem_fun (*this, &UI::toggle_errors));
-       status_bar_event_box->signal_button_press_event().connect (mem_fun (*this, &ARDOUR_UI::status_bar_button_press));
-
-       editor->get_status_bar_packer().pack_start (*status_bar_packer, true, true);
-       editor->get_status_bar_packer().pack_start (menu_bar_base, false, false, 6);
-#else
-       top_packer.pack_start (menu_bar_base, false, false);
-#endif
-
-       top_packer.pack_start (transport_frame, false, false);
-
-       editor->add_toplevel_controls (top_packer);
-
-       setup_transport();
-       build_menu_bar ();
-
-       setup_tooltips ();
-
-       return 0;
-}
 
 void
 ARDOUR_UI::setup_tooltips ()
 {
+       ArdourCanvas::Canvas::set_tooltip_timeout (Gtk::Settings::get_default()->property_gtk_tooltip_timeout ());
+
        set_tip (roll_button, _("Play from playhead"));
        set_tip (stop_button, _("Stop playback"));
        set_tip (rec_button, _("Toggle record"));
        set_tip (play_selection_button, _("Play range/selection"));
-       set_tip (join_play_range_button, _("Always play range/selection"));
        set_tip (goto_start_button, _("Go to start of session"));
        set_tip (goto_end_button, _("Go to end of session"));
        set_tip (auto_loop_button, _("Play loop range"));
-
+       set_tip (midi_panic_button, _("MIDI Panic\nSend note off and reset controller messages on all MIDI channels"));
        set_tip (auto_return_button, _("Return to last playback start when stopped"));
-       set_tip (auto_play_button, _("Start playback after any locate"));
+       set_tip (follow_edits_button, _("Playhead follows range selections and edits"));
        set_tip (auto_input_button, _("Be sensible about input monitoring"));
-       set_tip (punch_in_button, _("Start recording at auto-punch start"));
-       set_tip (punch_out_button, _("Stop recording at auto-punch end"));
        set_tip (click_button, _("Enable/Disable audio click"));
-       set_tip (time_master_button, string_compose (_("Does %1 control the time?"), PROGRAM_NAME));
-       set_tip (shuttle_box, _("Shuttle speed control"));
-       set_tip (shuttle_units_button, _("Select semitones or %%-age for speed display"));
-       set_tip (speed_display_box, _("Current transport speed"));
        set_tip (solo_alert_button, _("When active, something is soloed.\nClick to de-solo everything"));
-       set_tip (auditioning_alert_button, _("When active, auditioning is taking place\nClick to stop the audition"));
-       set_tip (primary_clock, _("Primary Clock"));
-       set_tip (secondary_clock, _("Secondary Clock"));
+       set_tip (auditioning_alert_button, _("When active, auditioning is taking place.\nClick to stop the audition"));
+       set_tip (feedback_alert_button, _("When active, there is a feedback loop."));
+       set_tip (primary_clock, _("<b>Primary Clock</b> right-click to set display mode. Click to edit, click+drag a digit or mouse-over+scroll wheel to modify.\nText edits: right-to-left overwrite <tt>Esc</tt>: cancel; <tt>Enter</tt>: confirm; postfix the edit with '+' or '-' to enter delta times.\n"));
+       set_tip (secondary_clock, _("<b>Secondary Clock</b> right-click to set display mode. Click to edit, click+drag a digit or mouse-over+scroll wheel to modify.\nText edits: right-to-left overwrite <tt>Esc</tt>: cancel; <tt>Enter</tt>: confirm; postfix the edit with '+' or '-' to enter delta times.\n"));
+       set_tip (editor_meter_peak_display, _("Reset All Peak Indicators"));
+       set_tip (error_alert_button, _("Show Error Log and acknowledge warnings"));
 
        synchronize_sync_source_and_video_pullup ();
 
@@ -172,18 +124,25 @@ ARDOUR_UI::display_message (const char *prefix, gint prefix_len, RefPtr<TextBuff
        string text;
 
        UI::display_message (prefix, prefix_len, ptag, mtag, msg);
-#ifdef TOP_MENUBAR
+
+       ArdourLogLevel ll = LogLevelNone;
 
        if (strcmp (prefix, _("[ERROR]: ")) == 0) {
                text = "<span color=\"red\" weight=\"bold\">";
+               ll = LogLevelError;
        } else if (strcmp (prefix, _("[WARNING]: ")) == 0) {
                text = "<span color=\"yellow\" weight=\"bold\">";
+               ll = LogLevelWarning;
        } else if (strcmp (prefix, _("[INFO]: ")) == 0) {
                text = "<span color=\"green\" weight=\"bold\">";
+               ll = LogLevelInfo;
        } else {
                text = "<span color=\"white\" weight=\"bold\">???";
        }
 
+       _log_not_acknowledged = std::max(_log_not_acknowledged, ll);
+
+#ifdef TOP_MENUBAR
        text += prefix;
        text += "</span>";
        text += msg;
@@ -196,7 +155,7 @@ XMLNode*
 ARDOUR_UI::tearoff_settings (const char* name) const
 {
        XMLNode* ui_node = Config->extra_xml(X_("UI"));
-        
+
        if (ui_node) {
                XMLNode* tearoff_node = ui_node->child (X_("Tearoffs"));
                if (tearoff_node) {
@@ -208,18 +167,25 @@ ARDOUR_UI::tearoff_settings (const char* name) const
        return 0;
 }
 
+#define PX_SCALE(px) std::max((float)px, rintf((float)px * UIConfiguration::instance().get_ui_scale()))
+
+static
+bool drag_failed (const Glib::RefPtr<Gdk::DragContext>& context, DragResult result, Tabbable* tab)
+{
+       if (result == Gtk::DRAG_RESULT_NO_TARGET) {
+               tab->detach ();
+               return true;
+       }
+       return false;
+}
+
 void
 ARDOUR_UI::setup_transport ()
 {
-       transport_tearoff = manage (new TearOff (transport_tearoff_hbox));
-       transport_tearoff->set_name ("TransportBase");
-       transport_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &transport_tearoff->tearoff_window()), false);
-
-       if (Profile->get_sae()) {
-               transport_tearoff->set_can_be_torn_off (false);
-       }
+       RefPtr<Action> act;
 
-       transport_hbox.pack_start (*transport_tearoff, true, false);
+       transport_hbox.set_border_width (PX_SCALE(3));
+       transport_hbox.set_spacing (PX_SCALE(3));
 
        transport_base.set_name ("TransportBase");
        transport_base.add (transport_hbox);
@@ -228,275 +194,254 @@ ARDOUR_UI::setup_transport ()
        transport_frame.set_name ("BaseFrame");
        transport_frame.add (transport_base);
 
-       transport_tearoff->Detach.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast<Box*>(&top_packer),
-                                                static_cast<Widget*>(&transport_frame)));
-       transport_tearoff->Attach.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer),
-                                                static_cast<Widget*> (&transport_frame), 1));
-       transport_tearoff->Hidden.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast<Box*>(&top_packer),
-                                                static_cast<Widget*>(&transport_frame)));
-       transport_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast<Box*> (&top_packer),
-                                                 static_cast<Widget*> (&transport_frame), 1));
-
-       shuttle_box.set_name ("TransportButton");
-       goto_start_button.set_name ("TransportButton");
-       goto_end_button.set_name ("TransportButton");
-       roll_button.set_name ("TransportButton");
-       stop_button.set_name ("TransportButton");
-       play_selection_button.set_name ("TransportButton");
-       rec_button.set_name ("TransportRecButton");
-       auto_loop_button.set_name ("TransportButton");
-       join_play_range_button.set_name ("TransportButton");
-
-       auto_return_button.set_name ("TransportButton");
-       auto_play_button.set_name ("TransportButton");
-       auto_input_button.set_name ("TransportButton");
-       punch_in_button.set_name ("TransportButton");
-       punch_out_button.set_name ("TransportButton");
-       click_button.set_name ("TransportButton");
-       time_master_button.set_name ("TransportButton");
-       sync_button.set_name ("TransportSyncButton");
-
-       stop_button.set_size_request(29, -1);
-       roll_button.set_size_request(29, -1);
-       auto_loop_button.set_size_request(29, -1);
-       play_selection_button.set_size_request(29, -1);
-       goto_start_button.set_size_request(29, -1);
-       goto_end_button.set_size_request(29, -1);
-       rec_button.set_size_request(29, -1);
-
-       Widget* w;
-
-       stop_button.set_visual_state (1);
-
-       w = manage (new Image (get_icon (X_("transport_start"))));
-       w->show();
-       goto_start_button.add (*w);
-       w = manage (new Image (get_icon (X_("transport_end"))));
-       w->show();
-       goto_end_button.add (*w);
-       w = manage (new Image (get_icon (X_("transport_play"))));
-       w->show();
-       roll_button.add (*w);
-       w = manage (new Image (get_icon (X_("transport_stop"))));
-       w->show();
-       stop_button.add (*w);
-       w = manage (new Image (get_icon (X_("transport_range"))));
-       w->show();
-       play_selection_button.add (*w);
-       w = manage (new Image (get_icon (X_("transport_record"))));
-       w->show();
-       rec_button.add (*w);
-       w = manage (new Image (get_icon (X_("transport_loop"))));
-       w->show();
-       auto_loop_button.add (*w);
-       w = manage (new Image (get_icon (X_("join_tools"))));
-       w->show ();
-       join_play_range_button.add (*w);
+       auto_return_button.set_text(_("Auto Return"));
 
-       RefPtr<Action> act;
+       follow_edits_button.set_text(_("Follow Edits"));
+
+//     auto_input_button.set_text (_("Auto Input"));
+
+       click_button.set_icon (ArdourIcon::TransportMetronom);
+
+       act = ActionManager::get_action ("Transport", "ToggleClick");
+       click_button.set_related_action (act);
+       click_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::click_button_clicked), false);
+
+       auto_return_button.set_name ("transport option button");
+       follow_edits_button.set_name ("transport option button");
+       auto_input_button.set_name ("transport option button");
+
+       /* these have to provide a clear indication of active state */
+
+       click_button.set_name ("transport button");
+       sync_button.set_name ("transport active option button");
+
+       stop_button.set_active (true);
+
+       goto_start_button.set_icon (ArdourIcon::TransportStart);
+       goto_end_button.set_icon (ArdourIcon::TransportEnd);
+       roll_button.set_icon (ArdourIcon::TransportPlay);
+       stop_button.set_icon (ArdourIcon::TransportStop);
+       play_selection_button.set_icon (ArdourIcon::TransportRange);
+       auto_loop_button.set_icon (ArdourIcon::TransportLoop);
+       rec_button.set_icon (ArdourIcon::RecButton);
+       midi_panic_button.set_icon (ArdourIcon::TransportPanic);
 
        act = ActionManager::get_action (X_("Transport"), X_("Stop"));
-       act->connect_proxy (stop_button);
+       stop_button.set_related_action (act);
        act = ActionManager::get_action (X_("Transport"), X_("Roll"));
-       act->connect_proxy (roll_button);
+       roll_button.set_related_action (act);
        act = ActionManager::get_action (X_("Transport"), X_("Record"));
-       act->connect_proxy (rec_button);
+       rec_button.set_related_action (act);
        act = ActionManager::get_action (X_("Transport"), X_("GotoStart"));
-       act->connect_proxy (goto_start_button);
+       goto_start_button.set_related_action (act);
        act = ActionManager::get_action (X_("Transport"), X_("GotoEnd"));
-       act->connect_proxy (goto_end_button);
+       goto_end_button.set_related_action (act);
        act = ActionManager::get_action (X_("Transport"), X_("Loop"));
-       act->connect_proxy (auto_loop_button);
+       auto_loop_button.set_related_action (act);
        act = ActionManager::get_action (X_("Transport"), X_("PlaySelection"));
-       act->connect_proxy (play_selection_button);
-       act = ActionManager::get_action (X_("Transport"), X_("ToggleTimeMaster"));
-       act->connect_proxy (time_master_button);
+       play_selection_button.set_related_action (act);
+       act = ActionManager::get_action (X_("MIDI"), X_("panic"));
+       midi_panic_button.set_related_action (act);
        act = ActionManager::get_action (X_("Transport"), X_("ToggleExternalSync"));
-       act->connect_proxy (sync_button);
-
-       shuttle_box.set_flags (CAN_FOCUS);
-       shuttle_box.add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::POINTER_MOTION_MASK|Gdk::SCROLL_MASK);
-       shuttle_box.set_size_request (100, 15);
-
-       shuttle_box.signal_button_press_event().connect (sigc::mem_fun(*this, &ARDOUR_UI::shuttle_box_button_press));
-       shuttle_box.signal_button_release_event().connect (sigc::mem_fun(*this, &ARDOUR_UI::shuttle_box_button_release));
-       shuttle_box.signal_scroll_event().connect (sigc::mem_fun(*this, &ARDOUR_UI::shuttle_box_scroll));
-       shuttle_box.signal_motion_notify_event().connect (sigc::mem_fun(*this, &ARDOUR_UI::shuttle_box_motion));
-       shuttle_box.signal_expose_event().connect (sigc::mem_fun(*this, &ARDOUR_UI::shuttle_box_expose));
+       sync_button.set_related_action (act);
 
        /* clocks, etc. */
 
-       ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (primary_clock, &AudioClock::set), 'p'));
-       ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (secondary_clock, &AudioClock::set), 's'));
+       ARDOUR_UI::Clock.connect (sigc::mem_fun (primary_clock, &AudioClock::set));
+       ARDOUR_UI::Clock.connect (sigc::mem_fun (secondary_clock, &AudioClock::set));
 
-       primary_clock.ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::primary_clock_value_changed));
-       secondary_clock.ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::secondary_clock_value_changed));
-       big_clock.ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::big_clock_value_changed));
+       primary_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::primary_clock_value_changed));
+       secondary_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::secondary_clock_value_changed));
+       big_clock->ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::big_clock_value_changed));
 
-       ActionManager::get_action ("Transport", "ToggleAutoReturn")->connect_proxy (auto_return_button);
-       ActionManager::get_action ("Transport", "ToggleAutoPlay")->connect_proxy (auto_play_button);
-       ActionManager::get_action ("Transport", "ToggleAutoInput")->connect_proxy (auto_input_button);
-       ActionManager::get_action ("Transport", "ToggleClick")->connect_proxy (click_button);
-       ActionManager::get_action ("Transport", "TogglePunchIn")->connect_proxy (punch_in_button);
-       ActionManager::get_action ("Transport", "TogglePunchOut")->connect_proxy (punch_out_button);
-
-       preroll_button.set_name ("TransportButton");
-       postroll_button.set_name ("TransportButton");
-
-       preroll_clock.set_mode (AudioClock::MinSec);
-       preroll_clock.set_name ("TransportClockDisplay");
-       postroll_clock.set_mode (AudioClock::MinSec);
-       postroll_clock.set_name ("TransportClockDisplay");
+       act = ActionManager::get_action ("Transport", "ToggleAutoReturn");
+       auto_return_button.set_related_action (act);
+       act = ActionManager::get_action (X_("Transport"), X_("ToggleFollowEdits"));
+       follow_edits_button.set_related_action (act);
+       act = ActionManager::get_action ("Transport", "ToggleAutoInput");
+       auto_input_button.set_related_action (act);
 
        /* alerts */
 
        /* CANNOT sigc::bind these to clicked or toggled, must use pressed or released */
 
-       solo_alert_button.set_name ("TransportSoloAlert");
-       solo_alert_button.signal_button_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::solo_alert_press), false);
-       auditioning_alert_button.set_name ("TransportAuditioningAlert");
+       solo_alert_button.set_name ("rude solo");
+       act = ActionManager::get_action (X_("Main"), X_("cancel-solo"));
+       solo_alert_button.set_related_action (act);
+       auditioning_alert_button.set_name ("rude audition");
        auditioning_alert_button.signal_button_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::audition_alert_press), false);
+       feedback_alert_button.set_name ("feedback alert");
+       feedback_alert_button.signal_button_press_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::feedback_alert_press), false);
+       error_alert_button.set_name ("error alert");
+       error_alert_button.signal_button_release_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::error_alert_press), false);
+       act = ActionManager::get_action (X_("Editor"), X_("toggle-log-window"));
+       error_alert_button.set_related_action(act);
+       error_alert_button.set_fallthrough_to_parent(true);
+
+       alert_box.set_homogeneous (true);
+       alert_box.set_spacing (PX_SCALE(2));
+       alert_box.pack_start (solo_alert_button, true, true);
+       alert_box.pack_start (auditioning_alert_button, true, true);
+       alert_box.pack_start (feedback_alert_button, true, true);
+
+       /* all transport buttons should be the same size vertically and
+        * horizontally
+        */
 
-       alert_box.pack_start (solo_alert_button, false, false);
-       alert_box.pack_start (auditioning_alert_button, false, false);
+       Glib::RefPtr<SizeGroup> transport_button_size_group = SizeGroup::create (SIZE_GROUP_BOTH);
+       transport_button_size_group->add_widget (goto_start_button);
+       transport_button_size_group->add_widget (goto_end_button);
+       transport_button_size_group->add_widget (auto_loop_button);
+       transport_button_size_group->add_widget (rec_button);
+       transport_button_size_group->add_widget (play_selection_button);
+       transport_button_size_group->add_widget (roll_button);
+       transport_button_size_group->add_widget (stop_button);
 
-       transport_tearoff_hbox.set_border_width (3);
+       /* the icon for this has an odd aspect ratio, so fatten up the button */
+       midi_panic_button.set_size_request (PX_SCALE(25), -1);
+       goto_start_button.set_size_request (PX_SCALE(28), PX_SCALE(44));
+       click_button.set_size_request (PX_SCALE(32), PX_SCALE(44));
 
-       transport_tearoff_hbox.pack_start (goto_start_button, false, false);
-       transport_tearoff_hbox.pack_start (goto_end_button, false, false);
 
-       Frame* sframe = manage (new Frame);
-       VBox*  svbox = manage (new VBox);
-       HBox*  shbox = manage (new HBox);
+       HBox* tbox1 = manage (new HBox);
+       HBox* tbox2 = manage (new HBox);
+       HBox* tbox = manage (new HBox);
 
-       sframe->set_shadow_type (SHADOW_IN);
-       sframe->add (shuttle_box);
+       VBox* vbox1 = manage (new VBox);
+       VBox* vbox2 = manage (new VBox);
 
-       shuttle_box.set_name (X_("ShuttleControl"));
+       Alignment* a1 = manage (new Alignment);
+       Alignment* a2 = manage (new Alignment);
 
-       speed_display_box.add (speed_display_label);
-       speed_display_box.set_name (X_("ShuttleDisplay"));
-       set_size_request_to_display_given_text (speed_display_label, X_("> 24.0"), 2, 2);
+       tbox1->set_spacing (PX_SCALE(2));
+       tbox2->set_spacing (PX_SCALE(2));
+       tbox->set_spacing (PX_SCALE(2));
 
-       shuttle_units_button.set_name (X_("ShuttleButton"));
-       shuttle_units_button.signal_clicked().connect (sigc::mem_fun(*this, &ARDOUR_UI::shuttle_unit_clicked));
+       if (!Profile->get_trx()) {
+               tbox1->pack_start (midi_panic_button, true, true, 5);
+               tbox1->pack_start (click_button, true, true, 5);
+       }
 
-       shuttle_style_button.set_name (X_("ShuttleStyleButton"));
+       tbox1->pack_start (goto_start_button, true, true);
+       tbox1->pack_start (goto_end_button, true, true);
+       tbox1->pack_start (auto_loop_button, true, true);
 
-       vector<string> shuttle_strings;
-       shuttle_strings.push_back (_("sprung"));
-       shuttle_strings.push_back (_("wheel"));
-       set_popdown_strings (shuttle_style_button, shuttle_strings, true);
-       shuttle_style_button.signal_changed().connect (sigc::mem_fun (*this, &ARDOUR_UI::shuttle_style_changed));
+       if (!Profile->get_trx()) {
+               tbox2->pack_start (play_selection_button, true, true);
+       }
+       tbox2->pack_start (roll_button, true, true);
+       tbox2->pack_start (stop_button, true, true);
+       tbox2->pack_start (rec_button, true, true, 5);
 
-       Frame* sdframe = manage (new Frame);
+       vbox1->pack_start (*tbox1, true, true);
+       vbox2->pack_start (*tbox2, true, true);
 
-       sdframe->set_shadow_type (SHADOW_IN);
-       sdframe->add (speed_display_box);
+       a1->add (*vbox1);
+       a1->set (0.5, 0.5, 0.0, 1.0);
+       a2->add (*vbox2);
+       a2->set (0.5, 0.5, 0.0, 1.0);
 
-       /* translators: Egternal is "External" with a descender character */
-       set_size_request_to_display_given_text (sync_button, X_("Egternal"), 4, 10);
+       tbox->pack_start (*a1, false, false);
+       tbox->pack_start (*a2, false, false);
 
-       shbox->pack_start (*sdframe, false, false);
-       shbox->pack_start (shuttle_units_button, true, true);
-       shbox->pack_start (shuttle_style_button, false, false);
+       HBox* clock_box = manage (new HBox);
 
-       svbox->pack_start (*sframe, false, false);
-       svbox->pack_start (*shbox, false, false);
+       clock_box->pack_start (*primary_clock, false, false);
+       if (!ARDOUR::Profile->get_small_screen() && !ARDOUR::Profile->get_trx()) {
+               clock_box->pack_start (*secondary_clock, false, false);
+       }
+       clock_box->set_spacing (PX_SCALE(3));
 
-       transport_tearoff_hbox.pack_start (*svbox, false, false, 3);
+       shuttle_box = manage (new ShuttleControl);
+       shuttle_box->show ();
 
-       if (Profile->get_sae()) {
-               transport_tearoff_hbox.pack_start (auto_loop_button);
-               transport_tearoff_hbox.pack_start (roll_button);
-       } else {
-               transport_tearoff_hbox.pack_start (auto_loop_button, false, false);
-               play_range_hbox.pack_start (play_selection_button, false, false);
-               play_range_hbox.pack_start (roll_button, false, false);
-               play_range_vbox.pack_start (play_range_hbox, false, false);
-               play_range_vbox.pack_start (join_play_range_button, false, false);
-               transport_tearoff_hbox.pack_start (play_range_vbox, false, false);
+       VBox* transport_vbox = manage (new VBox);
+       transport_vbox->set_name ("TransportBase");
+       transport_vbox->set_border_width (0);
+       transport_vbox->set_spacing (PX_SCALE(3));
+       transport_vbox->pack_start (*tbox, true, true, 0);
+
+       if (!Profile->get_trx()) {
+               transport_vbox->pack_start (*shuttle_box, false, false, 0);
        }
-       transport_tearoff_hbox.pack_start (stop_button, false, false);
-       transport_tearoff_hbox.pack_start (rec_button, false, false, 6);
 
-       HBox* clock_box = manage (new HBox);
-       clock_box->pack_start (primary_clock, false, false);
-       if (!ARDOUR::Profile->get_small_screen()) {
-               clock_box->pack_start (secondary_clock, false, false);
+       time_info_box = manage (new TimeInfoBox);
+
+       transport_hbox.pack_start (*transport_vbox, false, true);
+
+       /* transport related toggle controls */
+
+       VBox* auto_box = manage (new VBox);
+       auto_box->set_homogeneous (true);
+       auto_box->set_spacing (PX_SCALE(2));
+       auto_box->pack_start (sync_button, true, true);
+       if (!ARDOUR::Profile->get_trx()) {
+               auto_box->pack_start (follow_edits_button, true, true);
+               auto_box->pack_start (auto_return_button, true, true);
        }
 
-       if (!Profile->get_sae()) {
-               VBox* time_controls_box = manage (new VBox);
-               time_controls_box->pack_start (sync_button, false, false);
-               time_controls_box->pack_start (time_master_button, false, false);
-               clock_box->pack_start (*time_controls_box, false, false, 1);
+       if (!ARDOUR::Profile->get_trx()) {
+               transport_hbox.pack_start (*auto_box, false, false);
        }
+       transport_hbox.pack_start (*clock_box, true, true);
 
-       transport_tearoff_hbox.pack_start (*clock_box, false, false, 0);
+       if (ARDOUR::Profile->get_trx()) {
+               transport_hbox.pack_start (*auto_box, false, false);
+       }
 
-       HBox* toggle_box = manage(new HBox);
+       if (!ARDOUR::Profile->get_trx()) {
+               transport_hbox.pack_start (*time_info_box, false, false);
+       }
 
-       VBox* punch_box = manage (new VBox);
-       punch_box->pack_start (punch_in_button, false, false);
-       punch_box->pack_start (punch_out_button, false, false);
-       toggle_box->pack_start (*punch_box, false, false);
+       if (!ARDOUR::Profile->get_trx()) {
+               transport_hbox.pack_start (alert_box, false, false);
+               transport_hbox.pack_start (meter_box, false, false);
+               transport_hbox.pack_start (editor_meter_peak_display, false, false);
+       }
 
-       VBox* auto_box = manage (new VBox);
-       auto_box->pack_start (auto_play_button, false, false);
-       auto_box->pack_start (auto_return_button, false, false);
-       toggle_box->pack_start (*auto_box, false, false);
+       Gtk::VBox*   window_button_box = manage (new Gtk::VBox);
 
-       VBox* io_box = manage (new VBox);
-       io_box->pack_start (auto_input_button, false, false);
-       io_box->pack_start (click_button, false, false);
-       toggle_box->pack_start (*io_box, false, false);
+       editor_visibility_button.signal_drag_failed().connect (sigc::bind (sigc::ptr_fun (drag_failed), editor));
+       mixer_visibility_button.signal_drag_failed().connect (sigc::bind (sigc::ptr_fun (drag_failed), mixer));
+       prefs_visibility_button.signal_drag_failed().connect (sigc::bind (sigc::ptr_fun (drag_failed), rc_option_editor));
 
-       /* desensitize */
+       /* catch context clicks so that we can show a menu on these buttons */
 
-       set_transport_sensitivity (false);
+       editor_visibility_button.signal_button_press_event().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::tabbable_visibility_button_press), X_("editor")), false);
+       mixer_visibility_button.signal_button_press_event().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::tabbable_visibility_button_press), X_("mixer")), false);
+       prefs_visibility_button.signal_button_press_event().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::tabbable_visibility_button_press), X_("preferences")), false);
 
-//     toggle_box->pack_start (preroll_button, false, false);
-//     toggle_box->pack_start (preroll_clock, false, false);
+       editor_visibility_button.set_related_action (ActionManager::get_action (X_("Common"), X_("change-editor-visibility")));
+       editor_visibility_button.set_name (X_("page switch button"));
+       mixer_visibility_button.set_related_action (ActionManager::get_action (X_("Common"), X_("change-mixer-visibility")));
+       mixer_visibility_button.set_name (X_("page switch button"));
+       prefs_visibility_button.set_related_action (ActionManager::get_action (X_("Common"), X_("change-preferences-visibility")));
+       prefs_visibility_button.set_name (X_("page switch button"));
 
-//     toggle_box->pack_start (postroll_button, false, false);
-//     toggle_box->pack_start (postroll_clock, false, false);
+       Gtkmm2ext::UI::instance()->set_tip (editor_visibility_button,
+                                           string_compose (_("Drag this tab to the desktop to show %1 in its own window\n\n"
+                                                             "To put the window back, use the Window > %1 > Attach menu action"), editor->name()));
 
-       transport_tearoff_hbox.pack_start (*toggle_box, false, false, 4);
-       transport_tearoff_hbox.pack_start (alert_box, false, false);
+       Gtkmm2ext::UI::instance()->set_tip (mixer_visibility_button,
+                                           string_compose (_("Drag this tab to the desktop to show %1 in its own window\n\n"
+                                                             "To put the window back, use the Window > %1 > Attach menu action"), mixer->name()));
 
-       if (Profile->get_sae()) {
-               Image* img = manage (new Image ((::get_icon (X_("sae")))));
-               transport_tearoff_hbox.pack_end (*img, false, false, 6);
-       }
+       Gtkmm2ext::UI::instance()->set_tip (prefs_visibility_button,
+                                           string_compose (_("Drag this tab to the desktop to show %1 in its own window\n\n"
+                                                             "To put the window back, use the Window > %1 > Attach menu action"), rc_option_editor->name()));
 
-       XMLNode* tnode = tearoff_settings ("transport");
-       if (tnode) {
-               transport_tearoff->set_state (*tnode);
-       }
-}
+       window_button_box->pack_start (editor_visibility_button, true, false);
+       window_button_box->pack_start (mixer_visibility_button, true, false);
+       window_button_box->pack_start (prefs_visibility_button, true, false);
 
-void
-ARDOUR_UI::manage_window (Window& win)
-{
-       win.signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), &win));
-       win.signal_enter_notify_event().connect (sigc::bind (sigc::mem_fun (Keyboard::the_keyboard(), &Keyboard::enter_window), &win));
-       win.signal_leave_notify_event().connect (sigc::bind (sigc::mem_fun (Keyboard::the_keyboard(), &Keyboard::leave_window), &win));
-}
+       transport_hbox.pack_end (*window_button_box, false, false);
+       transport_hbox.pack_end (action_script_table, false, false);
 
-void
-ARDOUR_UI::detach_tearoff (Box* b, Widget* w)
-{
-//     editor->ensure_float (transport_tearoff->tearoff_window());
-       b->remove (*w);
-}
+       /* desensitize */
 
-void
-ARDOUR_UI::reattach_tearoff (Box* b, Widget* w, int32_t n)
-{
-       b->pack_start (*w);
-       b->reorder_child (*w, n);
+       set_transport_sensitivity (false);
 }
+#undef PX_SCALE
 
 void
 ARDOUR_UI::soloing_changed (bool onoff)
@@ -509,10 +454,8 @@ ARDOUR_UI::soloing_changed (bool onoff)
 void
 ARDOUR_UI::_auditioning_changed (bool onoff)
 {
-       if (auditioning_alert_button.get_active() != onoff) {
-               auditioning_alert_button.set_active (onoff);
-               set_transport_sensitivity (!onoff);
-       }
+       auditioning_alert_button.set_active (onoff);
+       set_transport_sensitivity (!onoff);
 }
 
 void
@@ -531,16 +474,29 @@ ARDOUR_UI::audition_alert_press (GdkEventButton*)
 }
 
 bool
-ARDOUR_UI::solo_alert_press (GdkEventButton*)
+ARDOUR_UI::feedback_alert_press (GdkEventButton *)
 {
-       if (_session) {
-               if (_session->soloing()) {
-                       _session->set_solo (_session->get_routes(), false);
-               } else if (_session->listening()) {
-                       _session->set_listen (_session->get_routes(), false);
+       return true;
+}
+
+bool
+ARDOUR_UI::error_alert_press (GdkEventButton* ev)
+{
+       bool do_toggle = true;
+       if (ev->button == 1) {
+               if (_log_not_acknowledged == LogLevelError) {
+                       // just acknowledge the error, don't hide the log if it's already visible
+                       RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("toggle-log-window"));
+                       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+                       if (tact && tact->get_active()) {
+                               do_toggle = false;
+                       }
                }
+               _log_not_acknowledged = LogLevelNone;
+               error_blink (false); // immediate acknowledge
        }
-       return true;
+       // maybe fall through to to button toggle
+       return !do_toggle;
 }
 
 void
@@ -552,13 +508,12 @@ ARDOUR_UI::solo_blink (bool onoff)
 
        if (_session->soloing() || _session->listening()) {
                if (onoff) {
-                       solo_alert_button.set_state (STATE_ACTIVE);
+                       solo_alert_button.set_active (true);
                } else {
-                       solo_alert_button.set_state (STATE_NORMAL);
+                       solo_alert_button.set_active (false);
                }
        } else {
                solo_alert_button.set_active (false);
-               solo_alert_button.set_state (STATE_NORMAL);
        }
 }
 
@@ -567,7 +522,7 @@ ARDOUR_UI::sync_blink (bool onoff)
 {
        if (_session == 0 || !_session->config.get_external_sync()) {
                /* internal sync */
-               sync_button.set_visual_state (0);
+               sync_button.set_active (false);
                return;
        }
 
@@ -575,13 +530,13 @@ ARDOUR_UI::sync_blink (bool onoff)
                /* not locked, so blink on and off according to the onoff argument */
 
                if (onoff) {
-                       sync_button.set_visual_state (1); // "-active"
+                       sync_button.set_active (true);
                } else {
-                       sync_button.set_visual_state (0); // normal
+                       sync_button.set_active (false);
                }
        } else {
                /* locked */
-               sync_button.set_visual_state (1); // "-active"
+               sync_button.set_active (true);
        }
 }
 
@@ -594,380 +549,145 @@ ARDOUR_UI::audition_blink (bool onoff)
 
        if (_session->is_auditioning()) {
                if (onoff) {
-                       auditioning_alert_button.set_state (STATE_ACTIVE);
+                       auditioning_alert_button.set_active (true);
                } else {
-                       auditioning_alert_button.set_state (STATE_NORMAL);
+                       auditioning_alert_button.set_active (false);
                }
        } else {
                auditioning_alert_button.set_active (false);
-               auditioning_alert_button.set_state (STATE_NORMAL);
-       }
-}
-
-void
-ARDOUR_UI::build_shuttle_context_menu ()
-{
-       using namespace Menu_Helpers;
-
-       shuttle_context_menu = new Menu();
-       MenuList& items = shuttle_context_menu->items();
-
-       Menu* speed_menu = manage (new Menu());
-       MenuList& speed_items = speed_menu->items();
-
-       RadioMenuItem::Group group;
-
-       speed_items.push_back (RadioMenuElem (group, "8", sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 8.0f)));
-       if (shuttle_max_speed == 8.0) {
-               static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
-       }
-       speed_items.push_back (RadioMenuElem (group, "6", sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 6.0f)));
-       if (shuttle_max_speed == 6.0) {
-               static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
-       }
-       speed_items.push_back (RadioMenuElem (group, "4", sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 4.0f)));
-       if (shuttle_max_speed == 4.0) {
-               static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
-       }
-       speed_items.push_back (RadioMenuElem (group, "3", sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 3.0f)));
-       if (shuttle_max_speed == 3.0) {
-               static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
-       }
-       speed_items.push_back (RadioMenuElem (group, "2", sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 2.0f)));
-       if (shuttle_max_speed == 2.0) {
-               static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
        }
-       speed_items.push_back (RadioMenuElem (group, "1.5", sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::set_shuttle_max_speed), 1.5f)));
-       if (shuttle_max_speed == 1.5) {
-               static_cast<RadioMenuItem*>(&speed_items.back())->set_active ();
-       }
-
-       items.push_back (MenuElem (_("Maximum speed"), *speed_menu));
 }
 
 void
-ARDOUR_UI::show_shuttle_context_menu ()
+ARDOUR_UI::feedback_blink (bool onoff)
 {
-       if (shuttle_context_menu == 0) {
-               build_shuttle_context_menu ();
+       if (_feedback_exists) {
+               if (onoff) {
+                       feedback_alert_button.set_active (true);
+               } else {
+                       feedback_alert_button.set_active (false);
+               }
+       } else {
+               feedback_alert_button.set_active (false);
        }
-
-       shuttle_context_menu->popup (1, gtk_get_current_event_time());
 }
 
 void
-ARDOUR_UI::set_shuttle_max_speed (float speed)
-{
-       shuttle_max_speed = speed;
-}
-
-gint
-ARDOUR_UI::shuttle_box_button_press (GdkEventButton* ev)
-{
-       if (!_session) {
-               return true;
-       }
-
-       if (shuttle_controller_binding_proxy.button_press_handler (ev)) {
-               return true;
-       }
-
-       if (Keyboard::is_context_menu_event (ev)) {
-               show_shuttle_context_menu ();
-               return true;
-       }
-
-       switch (ev->button) {
-       case 1:
-               shuttle_box.add_modal_grab ();
-               shuttle_grabbed = true;
-               mouse_shuttle (ev->x, true);
-               break;
-
-       case 2:
-       case 3:
-               return true;
-               break;
-       }
-
-       return true;
-}
-
-gint
-ARDOUR_UI::shuttle_box_button_release (GdkEventButton* ev)
+ARDOUR_UI::error_blink (bool onoff)
 {
-       if (!_session) {
-               return true;
-       }
-
-       switch (ev->button) {
-       case 1:
-               mouse_shuttle (ev->x, true);
-               shuttle_grabbed = false;
-               shuttle_box.remove_modal_grab ();
-               if (Config->get_shuttle_behaviour() == Sprung) {
-                       if (_session->config.get_auto_play() || roll_button.get_visual_state()) {
-                               shuttle_fract = SHUTTLE_FRACT_SPEED1;
-                               _session->request_transport_speed (1.0);
-                               stop_button.set_visual_state (0);
-                               roll_button.set_visual_state (1);
+       switch (_log_not_acknowledged) {
+               case LogLevelError:
+                       // blink
+                       if (onoff) {
+                               error_alert_button.set_custom_led_color(0xff0000ff); // bright red
                        } else {
-                               shuttle_fract = 0;
-                               _session->request_transport_speed (0.0);
+                               error_alert_button.set_custom_led_color(0x880000ff); // dark red
                        }
-                       shuttle_box.queue_draw ();
-               }
-               return true;
-
-       case 2:
-               if (_session->transport_rolling()) {
-                       shuttle_fract = SHUTTLE_FRACT_SPEED1;
-                       _session->request_transport_speed (1.0);
-                       stop_button.set_visual_state (0);
-                       roll_button.set_visual_state (1);
-               } else {
-                       shuttle_fract = 0;
-               }
-               shuttle_box.queue_draw ();
-               return true;
-
-       case 3:
-       default:
-               return true;
-
+                       break;
+               case LogLevelWarning:
+                       error_alert_button.set_custom_led_color(0xccaa00ff); // yellow
+                       break;
+               case LogLevelInfo:
+                       error_alert_button.set_custom_led_color(0x88cc00ff); // lime green
+                       break;
+               default:
+                       error_alert_button.set_custom_led_color(0x333333ff); // gray
+                       break;
        }
-
-       use_shuttle_fract (true);
-
-       return true;
 }
 
-gint
-ARDOUR_UI::shuttle_box_scroll (GdkEventScroll* ev)
-{
-       if (!_session) {
-               return true;
-       }
 
-       switch (ev->direction) {
 
-       case GDK_SCROLL_UP:
-               shuttle_fract += 0.005;
-               break;
-       case GDK_SCROLL_DOWN:
-               shuttle_fract -= 0.005;
-               break;
-       default:
-               /* scroll left/right */
-               return false;
-       }
-
-       use_shuttle_fract (true);
-
-       return true;
+void
+ARDOUR_UI::set_transport_sensitivity (bool yn)
+{
+       ActionManager::set_sensitive (ActionManager::transport_sensitive_actions, yn);
+       shuttle_box->set_sensitive (yn);
 }
 
-gint
-ARDOUR_UI::shuttle_box_motion (GdkEventMotion* ev)
+void
+ARDOUR_UI::editor_realized ()
 {
-       if (!_session || !shuttle_grabbed) {
-               return true;
-       }
+       boost::function<void (string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1));
+       Config->map_parameters (pc);
 
-       return mouse_shuttle (ev->x, false);
+       UIConfiguration::instance().reset_dpi ();
 }
 
-gint
-ARDOUR_UI::mouse_shuttle (double x, bool force)
+void
+ARDOUR_UI::maximise_editing_space ()
 {
-       double half_width = shuttle_box.get_width() / 2.0;
-       double distance = x - half_width;
-
-       if (distance > 0) {
-               distance = min (distance, half_width);
-       } else {
-               distance = max (distance, -half_width);
+       if (editor) {
+               editor->maximise_editing_space ();
        }
-
-       shuttle_fract = distance / half_width;
-       use_shuttle_fract (force);
-       return true;
 }
 
 void
-ARDOUR_UI::set_shuttle_fract (double f)
+ARDOUR_UI::restore_editing_space ()
 {
-       shuttle_fract = f;
-       use_shuttle_fract (false);
+       if (editor) {
+               editor->restore_editing_space ();
+       }
 }
 
 void
-ARDOUR_UI::use_shuttle_fract (bool force)
+ARDOUR_UI::show_ui_prefs ()
 {
-       microseconds_t now = get_microseconds();
-
-       /* do not attempt to submit a motion-driven transport speed request
-          more than once per process cycle.
-        */
-
-       if (!force && (last_shuttle_request - now) < (microseconds_t) engine->usecs_per_cycle()) {
-               return;
+       if (rc_option_editor) {
+               show_tabbable (rc_option_editor);
+               rc_option_editor->set_current_page (_("GUI"));
        }
-
-       last_shuttle_request = now;
-
-       double speed = 0;
-
-       if (Config->get_shuttle_units() == Semitones) {
-
-               const double step = 1.0 / 24.0; // range is 24 semitones up & down
-               double semitones;
-
-               semitones = round (shuttle_fract / step);
-               speed = pow (2.0, (semitones / 12.0));
-
-       } else {
-
-               bool neg;
-               double fract;
-
-               neg = (shuttle_fract < 0.0);
-
-               fract = 1 - sqrt (1 - (shuttle_fract * shuttle_fract)); // Formula A1
-
-               if (neg) {
-                       fract = -fract;
-               }
-
-               speed = shuttle_max_speed * fract;
-       }
-       
-       _session->request_transport_speed_nonzero (speed);
-       
-       shuttle_box.queue_draw ();
 }
 
-gint
-ARDOUR_UI::shuttle_box_expose (GdkEventExpose* event)
+bool
+ARDOUR_UI::click_button_clicked (GdkEventButton* ev)
 {
-       gint x;
-       Glib::RefPtr<Gdk::Window> win (shuttle_box.get_window());
-
-       /* redraw the background */
-
-       win->draw_rectangle (shuttle_box.get_style()->get_bg_gc (shuttle_box.get_state()),
-                            true,
-                            event->area.x, event->area.y,
-                            event->area.width, event->area.height);
-
-
-       x = (gint) floor ((shuttle_box.get_width() / 2.0) + (0.5 * (shuttle_box.get_width() * shuttle_fract)));
-
-       /* draw line */
+       if (ev->button != 3) {
+               /* this handler is just for button-3 clicks */
+               return false;
+       }
 
-       win->draw_line (shuttle_box.get_style()->get_fg_gc (shuttle_box.get_state()),
-                       x,
-                       0,
-                       x,
-                       shuttle_box.get_height());
+       show_tabbable (rc_option_editor);
+       rc_option_editor->set_current_page (_("Misc"));
        return true;
 }
 
 void
-ARDOUR_UI::shuttle_unit_clicked ()
+ARDOUR_UI::toggle_follow_edits ()
 {
-       if (shuttle_unit_menu == 0) {
-               shuttle_unit_menu = dynamic_cast<Menu*> (ActionManager::get_widget ("/ShuttleUnitPopup"));
-       }
-       shuttle_unit_menu->popup (1, gtk_get_current_event_time());
-}
+       RefPtr<Action> act = ActionManager::get_action (X_("Transport"), X_("ToggleFollowEdits"));
+       assert (act);
 
-void
-ARDOUR_UI::shuttle_style_changed ()
-{
-       string str = shuttle_style_button.get_active_text ();
+       RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic (act);
+       assert (tact);
 
-       if (str == _("sprung")) {
-               Config->set_shuttle_behaviour (Sprung);
-       } else if (str == _("wheel")) {
-               Config->set_shuttle_behaviour (Wheel);
-       }
+       UIConfiguration::instance().set_follow_edits (tact->get_active ());
 }
 
 void
-ARDOUR_UI::update_speed_display ()
+ARDOUR_UI::update_title ()
 {
-       if (!_session) {
-               if (last_speed_displayed != 0) {
-                       speed_display_label.set_text (_("stop"));
-                       last_speed_displayed = 0;
-               }
-               return;
-       }
-
-       char buf[32];
-       float x = _session->transport_speed ();
-
-       if (x != last_speed_displayed) {
+       if (_session) {
+               bool dirty = _session->dirty();
 
-               if (x != 0) {
-                       if (Config->get_shuttle_units() == Percentage) {
-                               snprintf (buf, sizeof (buf), "%d", (int) round (x * 100));
-                       } else {
+               string session_name;
 
-                               if (x < 0) {
-                                       snprintf (buf, sizeof (buf), "< %d", (int) round (12.0 * fast_log2 (-x)));
-                               } else {
-                                       snprintf (buf, sizeof (buf), "> %d", (int) round (12.0 * fast_log2 (x)));
-                               }
-                       }
-                       speed_display_label.set_text (buf);
+               if (_session->snap_name() != _session->name()) {
+                       session_name = _session->snap_name();
                } else {
-                       speed_display_label.set_text (_("stop"));
+                       session_name = _session->name();
                }
 
-               last_speed_displayed = x;
-       }
-}
-
-void
-ARDOUR_UI::set_transport_sensitivity (bool yn)
-{
-       ActionManager::set_sensitive (ActionManager::transport_sensitive_actions, yn);
-       shuttle_box.set_sensitive (yn);
-}
-
-void
-ARDOUR_UI::editor_realized ()
-{
-       boost::function<void (string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1));
-       Config->map_parameters (pc);
-
-       set_size_request_to_display_given_text (speed_display_box, _("-0.55"), 2, 2);
-       reset_dpi ();
-}
-
-void
-ARDOUR_UI::maximise_editing_space ()
-{
-       if (!editor) {
-               return;
-       }
-
-       transport_tearoff->set_visible (false);
-       editor->maximise_editing_space ();
-       if (Config->get_keep_tearoffs()) {
-               transport_tearoff->set_visible (true);
-       }
-}
+               if (dirty) {
+                       session_name = "*" + session_name;
+               }
 
-void
-ARDOUR_UI::restore_editing_space ()
-{
-       if (!editor) {
-               return;
+               WindowTitle title (session_name);
+               title += Glib::get_application_name();
+               _main_window.set_title (title.get_string());
+       } else {
+               WindowTitle title (Glib::get_application_name());
+               _main_window.set_title (title.get_string());
        }
 
-       transport_tearoff->set_visible (true);
-       editor->restore_editing_space ();
 }