summaryrefslogtreecommitdiff
path: root/gtk2_ardour/ardour_ui2.cc
diff options
context:
space:
mode:
authorHans Baier <hansfbaier@googlemail.com>2008-04-19 11:49:05 +0000
committerHans Baier <hansfbaier@googlemail.com>2008-04-19 11:49:05 +0000
commit20cfa08aeac02b6bd743fa1517a2cc90ff175cc0 (patch)
treead808468de6f3fcd36322d8b66a9fe15c7df09b3 /gtk2_ardour/ardour_ui2.cc
parentd0cee9db099419cfbd1ad90429c2a7647b95931e (diff)
* gave the MIDI panic button a new home....
git-svn-id: svn://localhost/ardour2/branches/3.0@3270 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui2.cc')
-rw-r--r--gtk2_ardour/ardour_ui2.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 2a0ec59085..b497d6ab32 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -344,15 +344,12 @@ ARDOUR_UI::setup_transport ()
solo_alert_button.signal_pressed().connect (mem_fun(*this,&ARDOUR_UI::solo_alert_toggle));
auditioning_alert_button.set_name ("TransportAuditioningAlert");
auditioning_alert_button.signal_pressed().connect (mem_fun(*this,&ARDOUR_UI::audition_alert_toggle));
- midi_panic_button.set_name("TransportMidiPanic");
- midi_panic_button.signal_pressed().connect (mem_fun(*this, &ARDOUR_UI::midi_panic_toggle));
tooltips().set_tip (solo_alert_button, _("When active, something is soloed.\nClick to de-solo everything"));
tooltips().set_tip (auditioning_alert_button, _("When active, auditioning is taking place\nClick to stop the audition"));
alert_box.pack_start (solo_alert_button, false, false);
alert_box.pack_start (auditioning_alert_button, false, false);
- alert_box.pack_start (midi_panic_button, false, false);
transport_tearoff_hbox.set_border_width (3);
@@ -453,6 +450,13 @@ ARDOUR_UI::setup_transport ()
transport_tearoff_hbox.pack_start (*toggle_box, false, false, 4);
transport_tearoff_hbox.pack_start (alert_box, false, false);
+
+ VBox* panic_box = manage (new VBox);
+ midi_panic_button.set_name("TransportMidiPanic");
+ midi_panic_button.signal_pressed().connect (mem_fun(*this, &ARDOUR_UI::midi_panic_toggle));
+ panic_box->pack_start (midi_panic_button, true, true);
+ transport_tearoff_hbox.pack_start(*panic_box, true, true, 4);
+
if (Profile->get_sae()) {
Image* img = manage (new Image ((::get_icon (X_("sae")))));