Merge branch 'export-dialog' into cairocanvas

[ardour.git] / gtk2_ardour / route_ui.cc

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index ad5e3bfd94be8ae67f8ad60c7f725201f8a17ff8..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;
        }
@@ -784,7 +784,7 @@ RouteUI::build_record_menu ()
                 MenuList& items = record_menu->items();
 
                 items.push_back (CheckMenuElem (_("Step Entry"), sigc::mem_fun (*this, &RouteUI::toggle_step_edit)));
-                step_edit_item = dynamic_cast<CheckMenuItem*> (&items.back());
+                step_edit_item = dynamic_cast<Gtk::CheckMenuItem*> (&items.back());
 
                 if (_route->record_enabled()) {
                         step_edit_item->set_sensitive (false);
@@ -1206,20 +1206,20 @@ RouteUI::build_solo_menu (void)
        solo_menu = new Menu;
        solo_menu->set_name ("ArdourContextMenu");
        MenuList& items = solo_menu->items();
-       CheckMenuItem* check;
+       Gtk::CheckMenuItem* check;
 
-       check = new CheckMenuItem(_("Solo Isolate"));
+       check = new Gtk::CheckMenuItem(_("Solo Isolate"));
        check->set_active (_route->solo_isolated());
        check->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_solo_isolated), check));
        items.push_back (CheckMenuElem(*check));
-        solo_isolated_check = dynamic_cast<CheckMenuItem*>(&items.back());
+        solo_isolated_check = dynamic_cast<Gtk::CheckMenuItem*>(&items.back());
        check->show_all();
 
-       check = new CheckMenuItem(_("Solo Safe"));
+       check = new Gtk::CheckMenuItem(_("Solo Safe"));
        check->set_active (_route->solo_safe());
        check->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_solo_safe), check));
        items.push_back (CheckMenuElem(*check));
-        solo_safe_check = dynamic_cast<CheckMenuItem*>(&items.back());
+        solo_safe_check = dynamic_cast<Gtk::CheckMenuItem*>(&items.back());
        check->show_all();
 
        //items.push_back (SeparatorElem());
@@ -1237,25 +1237,25 @@ RouteUI::build_mute_menu(void)
 
        MenuList& items = mute_menu->items();
 
-       pre_fader_mute_check = manage (new 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 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));
        post_fader_mute_check->show_all();
 
-       listen_mute_check = manage (new CheckMenuItem(_("Control Outs")));
+       listen_mute_check = manage (new Gtk::CheckMenuItem(_("Control Outs")));
        init_mute_menu(MuteMaster::Listen, listen_mute_check);
        listen_mute_check->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_mute_menu), MuteMaster::Listen, listen_mute_check));
        items.push_back (CheckMenuElem(*listen_mute_check));
        listen_mute_check->show_all();
 
-       main_mute_check = manage (new CheckMenuItem(_("Main Outs")));
+       main_mute_check = manage (new Gtk::CheckMenuItem(_("Main Outs")));
        init_mute_menu(MuteMaster::Main, main_mute_check);
        main_mute_check->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_mute_menu), MuteMaster::Main, main_mute_check));
        items.push_back (CheckMenuElem(*main_mute_check));
@@ -1268,7 +1268,7 @@ RouteUI::build_mute_menu(void)
 }
 
 void
-RouteUI::init_mute_menu(MuteMaster::MutePoint mp, CheckMenuItem* check)
+RouteUI::init_mute_menu(MuteMaster::MutePoint mp, Gtk::CheckMenuItem* check)
 {
        check->set_active (_route->mute_points() & mp);
 }
@@ -1816,13 +1816,14 @@ RouteUI::open_remote_control_id_dialog ()
                                                       (_route->is_master() ? _("the master bus") : _("the monitor bus"))));
                } else {
                        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 Ardour.\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);
@@ -1957,7 +1958,7 @@ RouteUI::invert_press (GdkEventButton* ev)
 
        for (uint32_t i = 0; i < N; ++i) {
                items.push_back (CheckMenuElem (string_compose (X_("Ø%1"), i + 1), sigc::bind (sigc::mem_fun (*this, &RouteUI::invert_menu_toggled), i)));
-               CheckMenuItem* e = dynamic_cast<CheckMenuItem*> (&items.back ());
+               Gtk::CheckMenuItem* e = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ());
                ++_i_am_the_modifier;
                e->set_active (_route->phase_invert (i));
                --_i_am_the_modifier;