first pass hiding/rearrangement of UI elements related to trx

[ardour.git] / gtk2_ardour / route_ui.cc

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 3b3f32ac04a1b9e61566dbf327ff14e10d6467a0..d8db8b5bd987f09e847aea71d0b1d5bc2aea9614 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -125,7 +125,7 @@ RouteUI::init ()
 
        rec_enable_button = manage (new ArdourButton);
        rec_enable_button->set_name ("record enable button");
-       rec_enable_button->set_tweaks (ArdourButton::ImplicitUsesSolidColor);
+//     rec_enable_button->set_tweaks (ArdourButton::ImplicitUsesSolidColor);
        UI::instance()->set_tip (rec_enable_button, _("Enable recording on this track"), "");
 
        show_sends_button = manage (new ArdourButton);
@@ -588,7 +588,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
        }
 
        if (!_session->engine().connected()) {
-               MessageDialog msg (_("Not connected to JACK - cannot engage record"));
+               MessageDialog msg (_("Not connected to AudioEngine - cannot engage record"));
                msg.run ();
                return true;
        }
@@ -1237,13 +1237,13 @@ RouteUI::build_mute_menu(void)
 
        MenuList& items = mute_menu->items();
 
-       pre_fader_mute_check = manage (new Gtk::CheckMenuItem(_("Pre Fader")));
+       pre_fader_mute_check = manage (new Gtk::CheckMenuItem(_("Pre Fader Sends")));
        init_mute_menu(MuteMaster::PreFader, pre_fader_mute_check);
        pre_fader_mute_check->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_mute_menu), MuteMaster::PreFader, pre_fader_mute_check));
        items.push_back (CheckMenuElem(*pre_fader_mute_check));
        pre_fader_mute_check->show_all();
 
-       post_fader_mute_check = manage (new Gtk::CheckMenuItem(_("Post Fader")));
+       post_fader_mute_check = manage (new Gtk::CheckMenuItem(_("Post Fader Sends")));
        init_mute_menu(MuteMaster::PostFader, post_fader_mute_check);
        post_fader_mute_check->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_mute_menu), MuteMaster::PostFader, post_fader_mute_check));
        items.push_back (CheckMenuElem(*post_fader_mute_check));
@@ -1815,15 +1815,15 @@ RouteUI::open_remote_control_id_dialog ()
                                                       _route->remote_control_id(),
                                                       (_route->is_master() ? _("the master bus") : _("the monitor bus"))));
                } else {
-                       l->set_markup (string_compose (_("The remote control ID of %6 is: %3\n\n\n"
-                                                        "Remote Control IDs are currently determined by track/bus ordering in %1\n\n"
-                                                        "%4Use the User Interaction tab of the Preferences window if you want to change this%5"),
-                                                      (Config->get_remote_model() == MixerOrdered ? _("the mixer") : _("the editor")),
+                       l->set_markup (string_compose (_("The remote control ID of %5 is: %2\n\n\n"
+                                                        "Remote Control IDs are currently determined by track/bus ordering in %6.\n\n"
+                                                        "%3Use the User Interaction tab of the Preferences window if you want to change this%4"),
                                                       (is_track() ? _("track") : _("bus")),
                                                       _route->remote_control_id(),
                                                       "<span size=\"small\" style=\"italic\">",
                                                       "</span>",
-                                                      Glib::Markup::escape_text (_route->name())));
+                                                      Glib::Markup::escape_text (_route->name()),
+                                                      PROGRAM_NAME));
                }
                dialog.get_vbox()->pack_start (*l);
                dialog.add_button (Stock::OK, RESPONSE_CANCEL);