auto (return,play,input) and click buttons become ArdourButtons ("transport option...
[ardour.git] / gtk2_ardour / ardour_ui2.cc
index a55f62976ecdaee294b0995e79e114b4f9a534e6..076f9f2f5225019dc11423b5066d5f5ed70c638c 100644 (file)
@@ -32,6 +32,7 @@
 #include "pbd/error.h"
 #include "pbd/basename.h"
 #include "pbd/fastlog.h"
+#include <gtkmm2ext/cairocell.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/tearoff.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"
 
@@ -132,13 +136,8 @@ ARDOUR_UI::setup_tooltips ()
        set_tip (auto_return_button, _("Return to last playback start when stopped"));
        set_tip (auto_play_button, _("Start playback after any locate"));
        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"));
@@ -196,7 +195,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) {
@@ -211,6 +210,8 @@ ARDOUR_UI::tearoff_settings (const char* name) const
 void
 ARDOUR_UI::setup_transport ()
 {
+       RefPtr<Action> act;
+
        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);
@@ -237,116 +238,71 @@ ARDOUR_UI::setup_transport ()
        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");
+       auto_return_button.set_text(_("Auto Return"));
+       auto_play_button.set_text(_("Auto Play"));
+       auto_input_button.set_text (_("Auto Input"));
+
+       click_button.set_image (get_icon (X_("metronome")));
+       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");
+       auto_play_button.set_name ("transport option button");
+       auto_input_button.set_name ("transport option button");
+       click_button.set_name ("transport option button");
+
        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);
+       stop_button.set_active_state (Active);
 
-       RefPtr<Action> act;
+       goto_start_button.set_image (get_icon (X_("transport_start")));
+       goto_end_button.set_image (get_icon (X_("transport_end")));
+       roll_button.set_image (get_icon (X_("transport_play")));
+       stop_button.set_image (get_icon (X_("transport_stop")));
+       play_selection_button.set_image (get_icon (X_("transport_range")));
+       rec_button.set_image (get_icon (X_("transport_record")));
+       auto_loop_button.set_image (get_icon (X_("transport_loop")));
+       join_play_range_button.set_image (get_icon (X_("tool_object_range")));
 
        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);
+       play_selection_button.set_related_action (act);
+
+
        act = ActionManager::get_action (X_("Transport"), X_("ToggleTimeMaster"));
        act->connect_proxy (time_master_button);
        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));
 
        /* 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'));
 
-       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");
+       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));
 
-       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 ("Transport", "ToggleAutoPlay");
+       auto_play_button.set_related_action (act);
+       act = ActionManager::get_action ("Transport", "ToggleAutoInput");
+       auto_input_button.set_related_action (act);
 
        /* alerts */
 
@@ -360,109 +316,115 @@ ARDOUR_UI::setup_transport ()
        alert_box.pack_start (solo_alert_button, false, false);
        alert_box.pack_start (auditioning_alert_button, false, false);
 
-       transport_tearoff_hbox.set_border_width (3);
-
-       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* tbox = manage (new HBox);
+       tbox->set_spacing (2);
 
-       sframe->set_shadow_type (SHADOW_IN);
-       sframe->add (shuttle_box);
-
-       shuttle_box.set_name (X_("ShuttleControl"));
+       transport_tearoff_hbox.set_border_width (3);
 
-       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);
+       tbox->pack_start (goto_start_button, false, false);
+       tbox->pack_start (goto_end_button, false, false);
 
-       shuttle_units_button.set_name (X_("ShuttleButton"));
-       shuttle_units_button.signal_clicked().connect (sigc::mem_fun(*this, &ARDOUR_UI::shuttle_unit_clicked));
+       /* translators: Egternal is "External" with a descender character */
+       set_size_request_to_display_given_text (sync_button, X_("Egternal"), 4, 10);
 
-       shuttle_style_button.set_name (X_("ShuttleStyleButton"));
+       // transport_tearoff_hbox.pack_start (*svbox, false, false, 3);
 
-       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));
+       Glib::RefPtr<SizeGroup> transport_button_size_group1 = SizeGroup::create (SIZE_GROUP_HORIZONTAL);
+       transport_button_size_group1->add_widget (goto_start_button);
+       transport_button_size_group1->add_widget (goto_end_button);
+       transport_button_size_group1->add_widget (auto_loop_button);
+       transport_button_size_group1->add_widget (rec_button);
 
-       Frame* sdframe = manage (new Frame);
+       if (Profile->get_sae()) {
+               tbox->pack_start (auto_loop_button);
+               tbox->pack_start (roll_button);
+               transport_button_size_group1->add_widget (play_selection_button);
+               transport_button_size_group1->add_widget (roll_button);
 
-       sdframe->set_shadow_type (SHADOW_IN);
-       sdframe->add (speed_display_box);
+       } else {
 
-       /* translators: Egternal is "External" with a descender character */
-       set_size_request_to_display_given_text (sync_button, X_("Egternal"), 4, 10);
+               tbox->pack_start (auto_loop_button, false, false);
 
-       shbox->pack_start (*sdframe, false, false);
-       shbox->pack_start (shuttle_units_button, true, true);
-       shbox->pack_start (shuttle_style_button, false, false);
+               Frame* jpframe = manage (new Frame);
+               HBox* jpbox = manage (new HBox);
 
-       svbox->pack_start (*sframe, false, false);
-       svbox->pack_start (*shbox, false, false);
+               jpframe->add (*jpbox);
+               jpframe->set_shadow_type (SHADOW_NONE);
+               
+               jpbox->pack_start (play_selection_button, false, false);
+               jpbox->pack_start (join_play_range_button, false, false);
+               jpbox->pack_start (roll_button, false, false);
 
-       transport_tearoff_hbox.pack_start (*svbox, false, false, 3);
+               tbox->pack_start (*jpframe, false, false);
 
-       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);
+               Glib::RefPtr<SizeGroup> transport_button_size_group2 = SizeGroup::create (SIZE_GROUP_HORIZONTAL);
+               transport_button_size_group2->add_widget (play_selection_button);
+               transport_button_size_group2->add_widget (join_play_range_button);
+               transport_button_size_group2->add_widget (roll_button);
        }
-       transport_tearoff_hbox.pack_start (stop_button, false, false);
-       transport_tearoff_hbox.pack_start (rec_button, false, false, 6);
+
+       tbox->pack_start (stop_button, false, false);
+       tbox->pack_start (rec_button, false, false, 6);
 
        HBox* clock_box = manage (new HBox);
-       clock_box->pack_start (primary_clock, false, false);
+       clock_box->set_border_width (2);
+       primary_clock->set_border_width (2);
+       clock_box->pack_start (*primary_clock, false, false);
        if (!ARDOUR::Profile->get_small_screen()) {
-               clock_box->pack_start (secondary_clock, false, false);
+               secondary_clock->set_border_width (2);
+               clock_box->pack_start (*secondary_clock, false, false);
        }
 
-       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);
-       }
 
-       transport_tearoff_hbox.pack_start (*clock_box, false, false, 0);
+       shuttle_box = new ShuttleControl;
+       shuttle_box->show ();
 
-       HBox* toggle_box = manage(new HBox);
+       VBox* transport_vbox = manage (new VBox);
+       transport_vbox->set_name ("TransportBase");
+       transport_vbox->set_border_width (3);
+       transport_vbox->set_spacing (3);
+       transport_vbox->pack_start (*tbox, true, true, 0);
+       transport_vbox->pack_start (*shuttle_box, false, false, 0);
+
+       transport_tearoff_hbox.pack_start (*transport_vbox, false, false, 0);
+
+       Table* time_controls_table = manage (new Table (2, 2));
+       time_controls_table->set_col_spacings (6);
+       time_controls_table->attach (sync_button, 0, 1, 0, 1, Gtk::AttachOptions(FILL|EXPAND), Gtk::AttachOptions(0));
+       time_controls_table->attach (time_master_button, 0, 1, 1, 2, Gtk::AttachOptions(FILL|EXPAND), Gtk::AttachOptions(0));
 
-       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);
+       time_controls_table->attach (click_button, 1, 2, 0, 2, Gtk::AttachOptions(FILL|EXPAND), FILL);
+
+       transport_tearoff_hbox.pack_start (*clock_box, false, false);
+       transport_tearoff_hbox.pack_start (*time_controls_table, false, false, 4);
+
+       time_info_box = manage (new TimeInfoBox);
+       transport_tearoff_hbox.pack_start (*time_info_box, false, false);
+
+       HBox* toggle_box = manage(new HBox);
 
        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);
+        if (!Profile->get_small_screen()) {
+                toggle_box->pack_start (*auto_box, false, false);
+        }
 
        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);
+       //io_box->pack_start (click_button, false, false);
+        if (!Profile->get_small_screen()) {
+                toggle_box->pack_start (*io_box, false, false);
+        }
 
        /* desensitize */
 
        set_transport_sensitivity (false);
 
-//     toggle_box->pack_start (preroll_button, false, false);
-//     toggle_box->pack_start (preroll_clock, false, false);
-
-//     toggle_box->pack_start (postroll_button, false, false);
-//     toggle_box->pack_start (postroll_clock, false, false);
-
        transport_tearoff_hbox.pack_start (*toggle_box, false, false, 4);
+        if (Profile->get_small_screen()) {
+                transport_tearoff_hbox.pack_start (_editor_transport_box, false, false, 4);
+        }
        transport_tearoff_hbox.pack_start (alert_box, false, false);
 
        if (Profile->get_sae()) {
@@ -604,331 +566,11 @@ ARDOUR_UI::audition_blink (bool onoff)
        }
 }
 
-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 ()
-{
-       if (shuttle_context_menu == 0) {
-               build_shuttle_context_menu ();
-       }
-
-       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)
-{
-       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);
-                       } else {
-                               shuttle_fract = 0;
-                               _session->request_transport_speed (0.0);
-                       }
-                       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;
-
-       }
-
-       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;
-}
-
-gint
-ARDOUR_UI::shuttle_box_motion (GdkEventMotion* ev)
-{
-       if (!_session || !shuttle_grabbed) {
-               return true;
-       }
-
-       return mouse_shuttle (ev->x, false);
-}
-
-gint
-ARDOUR_UI::mouse_shuttle (double x, bool force)
-{
-       double const 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);
-       }
-
-       shuttle_fract = distance / half_width;
-       use_shuttle_fract (force);
-       return true;
-}
-
-void
-ARDOUR_UI::set_shuttle_fract (double f)
-{
-       shuttle_fract = f;
-       use_shuttle_fract (false);
-}
-
-void
-ARDOUR_UI::use_shuttle_fract (bool force)
-{
-       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;
-       }
-
-       last_shuttle_request = now;
-
-       double speed = 0;
-
-       if (Config->get_shuttle_units() == Semitones) {
-
-               double const step = 1.0 / 24.0; // range is 24 semitones up & down
-               double const semitones = round (shuttle_fract / step);
-               speed = pow (2.0, (semitones / 12.0));
-
-       } else {
-
-               bool const neg = (shuttle_fract < 0.0);
-               double 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)
-{
-       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 */
-
-       win->draw_line (shuttle_box.get_style()->get_fg_gc (shuttle_box.get_state()),
-                       x,
-                       0,
-                       x,
-                       shuttle_box.get_height());
-       return true;
-}
-
-void
-ARDOUR_UI::shuttle_unit_clicked ()
-{
-       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());
-}
-
-void
-ARDOUR_UI::shuttle_style_changed ()
-{
-       string str = shuttle_style_button.get_active_text ();
-
-       if (str == _("sprung")) {
-               Config->set_shuttle_behaviour (Sprung);
-       } else if (str == _("wheel")) {
-               Config->set_shuttle_behaviour (Wheel);
-       }
-}
-
-void
-ARDOUR_UI::update_speed_display ()
-{
-       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 (x != 0) {
-                       if (Config->get_shuttle_units() == Percentage) {
-                               snprintf (buf, sizeof (buf), "%d", (int) round (x * 100));
-                       } else {
-
-                               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);
-               } else {
-                       speed_display_label.set_text (_("stop"));
-               }
-
-               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);
+       shuttle_box->set_sensitive (yn);
 }
 
 void
@@ -937,7 +579,6 @@ 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 ();
 }
 
@@ -965,3 +606,21 @@ ARDOUR_UI::restore_editing_space ()
        transport_tearoff->set_visible (true);
        editor->restore_editing_space ();
 }
+
+bool
+ARDOUR_UI::click_button_clicked (GdkEventButton* ev)
+{
+       if (ev->button != 3) {
+               /* this handler is just for button-3 clicks */
+               return false;
+       }
+
+       RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleRCOptionsEditor"));
+       assert (act);
+
+       RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic (act);
+       tact->set_active ();
+
+       rc_option_editor->set_current_page (_("Misc"));
+       return true;
+}