Make menu item for Add Track/Bus/VCA dialog consistent with window title

[ardour.git] / gtk2_ardour / add_route_dialog.cc

diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index 5619e97b8d8a9988fbaa934deb9f686596b138c7..b1f84c0facb07ac859e6178a9cb3fc5235c7a25c 100644 (file)
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -43,7 +43,7 @@
 #include "add_route_dialog.h"
 #include "route_group_dialog.h"
 #include "tooltips.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace Gtkmm2ext;
@@ -63,7 +63,6 @@ AddRouteDialog::AddRouteDialog ()
        , instrument_label (_("Instrument:"))
 {
        set_name ("AddRouteDialog");
-       set_modal (true);
        set_skip_taskbar_hint (true);
        set_resizable (false);
        set_position (WIN_POS_MOUSE);
@@ -210,7 +209,6 @@ AddRouteDialog::~AddRouteDialog ()
 void
 AddRouteDialog::channel_combo_changed ()
 {
-       maybe_update_name_template_entry ();
        refill_track_modes ();
 }
 
@@ -236,19 +234,6 @@ AddRouteDialog::type_wanted() const
 void
 AddRouteDialog::maybe_update_name_template_entry ()
 {
-       if (
-               name_template_entry.get_text() != "" &&
-               name_template_entry.get_text() != VCA::default_name_template() &&
-               name_template_entry.get_text() != _("Audio") &&
-               name_template_entry.get_text() != _("MIDI")  &&
-               name_template_entry.get_text() != _("Audio+MIDI")  &&
-               name_template_entry.get_text() != _("Bus")) {
-               strict_io_combo.set_sensitive (false);
-               return;
-       }
-
-       strict_io_combo.set_sensitive (true);
-
        switch (type_wanted()) {
        case AudioTrack:
                name_template_entry.set_text (_("Audio"));
@@ -281,6 +266,8 @@ AddRouteDialog::track_type_chosen ()
                mode_label.set_sensitive (true);
                instrument_label.set_sensitive (false);
                route_group_combo.set_sensitive (true);
+               strict_io_combo.set_sensitive (true);
+               insert_at_combo.set_sensitive (true);
                break;
        case MidiTrack:
                channel_combo.set_sensitive (false);
@@ -290,6 +277,8 @@ AddRouteDialog::track_type_chosen ()
                mode_label.set_sensitive (false);
                instrument_label.set_sensitive (true);
                route_group_combo.set_sensitive (true);
+               strict_io_combo.set_sensitive (true);
+               insert_at_combo.set_sensitive (true);
                break;
        case MixedTrack:
                {
@@ -306,6 +295,8 @@ AddRouteDialog::track_type_chosen ()
                mode_label.set_sensitive (true);
                instrument_label.set_sensitive (true);
                route_group_combo.set_sensitive (true);
+               strict_io_combo.set_sensitive (true);
+               insert_at_combo.set_sensitive (true);
                break;
        case AudioBus:
                mode_combo.set_sensitive (false);
@@ -315,6 +306,8 @@ AddRouteDialog::track_type_chosen ()
                mode_label.set_sensitive (true);
                instrument_label.set_sensitive (false);
                route_group_combo.set_sensitive (true);
+               strict_io_combo.set_sensitive (true);
+               insert_at_combo.set_sensitive (true);
                break;
        case VCAMaster:
                mode_combo.set_sensitive (false);
@@ -324,6 +317,8 @@ AddRouteDialog::track_type_chosen ()
                mode_label.set_sensitive (false);
                instrument_label.set_sensitive (false);
                route_group_combo.set_sensitive (false);
+               strict_io_combo.set_sensitive (false);
+               insert_at_combo.set_sensitive (false);
                break;
        case MidiBus:
                mode_combo.set_sensitive (false);
@@ -332,6 +327,8 @@ AddRouteDialog::track_type_chosen ()
                configuration_label.set_sensitive (false);
                mode_label.set_sensitive (true);
                instrument_label.set_sensitive (true);
+               strict_io_combo.set_sensitive (true);
+               insert_at_combo.set_sensitive (true);
                break;
        }
 
@@ -616,9 +613,11 @@ AddRouteDialog::new_group_dialog_finished (int r, RouteGroupDialog* d)
        delete_when_idle (d);
 }
 
-AddRouteDialog::InsertAt
+RouteDialogs::InsertAt
 AddRouteDialog::insert_at ()
 {
+       using namespace RouteDialogs;
+
        std::string str = insert_at_combo.get_active_text();
 
        if (str == _("First")) {