X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fadd_route_dialog.cc;h=9cfb747397e95286c63743c79f46ab5b3fe829aa;hb=05451a80f2dd90d2d5ea9f1a529d0573ac24587c;hp=47eeb94320c7c07303e988216f9317e78012672a;hpb=832aa18a813f5ed4cb8e1228c52d89ee6d8946c7;p=ardour.git

diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index 47eeb94320..9cfb747397 100644
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -44,55 +44,22 @@ using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
 
-static const char* track_mode_names[] = {
-	N_("Normal"),
-	N_("Non Layered"),
-	N_("Tape"),
-	0
-};
-
-static const char* bus_mode_names[] = {
-	N_("Aux"),
-	N_("Direct"),
-	0
-};
-
 std::vector<std::string> AddRouteDialog::channel_combo_strings;
-std::vector<std::string> AddRouteDialog::track_mode_strings;
-std::vector<std::string> AddRouteDialog::bus_mode_strings;
 
 AddRouteDialog::AddRouteDialog (Session* s)
-	: ArdourDialog (X_("add route dialog"))
+	: ArdourDialog (_("Add Track or Bus"))
 	, routes_adjustment (1, 1, 128, 1, 4)
 	, routes_spinner (routes_adjustment)
 	, mode_label (_("Track mode:"))
 {
 	set_session (s);
 
-	if (track_mode_strings.empty()) {
-		track_mode_strings = I18N (track_mode_names);
-
-		if (ARDOUR::Profile->get_sae()) {
-			/* remove all but the first track mode (Normal) */
-
-			while (track_mode_strings.size() > 1) {
-				track_mode_strings.pop_back();
-			}
-		}
-	}
-
-	if (bus_mode_strings.empty()) {
-		bus_mode_strings = I18N (bus_mode_names);
-	}
-
 	set_name ("AddRouteDialog");
 	set_position (Gtk::WIN_POS_MOUSE);
 	set_modal (true);
 	set_skip_taskbar_hint (true);
 	set_resizable (false);
 
-	set_title (_("Add Track/Bus"));
-
 	name_template_entry.set_name (X_("AddRouteDialogNameTemplateEntry"));
 	routes_spinner.set_name (X_("AddRouteDialogSpinner"));
 	channel_combo.set_name (X_("ChannelCountSelector"));
@@ -100,10 +67,9 @@ AddRouteDialog::AddRouteDialog (Session* s)
 
 	refill_channel_setups ();
 	refill_route_groups ();
-	set_popdown_strings (mode_combo, track_mode_strings, true);
+	refill_track_modes ();
 
 	channel_combo.set_active_text (channel_combo_strings.front());
-	mode_combo.set_active_text (track_mode_strings.front());
 
 	track_bus_combo.append_text (_("tracks"));
 	track_bus_combo.append_text (_("busses"));
@@ -143,27 +109,37 @@ AddRouteDialog::AddRouteDialog (Session* s)
 	l->set_padding (8, 0);
 	table2->attach (*l, 0, 1, 0, 3, Gtk::FILL, Gtk::FILL, 0, 0);
 
+	int n = 0;
+
+	l = manage (new Label (_("Name:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+	table2->attach (*l, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
+	table2->attach (name_template_entry, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
+	++n;
+
 	/* Route configuration */
 
 	l = manage (new Label (_("Configuration:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
-	table2->attach (*l, 1, 2, 0, 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
-	table2->attach (channel_combo, 2, 3, 0, 1, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0);
+	table2->attach (*l, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
+	table2->attach (channel_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
+	++n;
 
 	if (!ARDOUR::Profile->get_sae ()) {
 
 		/* Track mode */
 
 		mode_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
-		table2->attach (mode_label, 1, 2, 1, 2, Gtk::FILL, Gtk::EXPAND, 0, 0);
-		table2->attach (mode_combo, 2, 3, 1, 2, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0);
+		table2->attach (mode_label, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
+		table2->attach (mode_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
+		++n;
 
 	}
 
-	/* Group choise */
+	/* Group choice */
 
 	l = manage (new Label (_("Group:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
-	table2->attach (*l, 1, 2, 2, 3, Gtk::FILL, Gtk::EXPAND, 0, 0);
-	table2->attach (route_group_combo, 2, 3, 2, 3, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0);
+	table2->attach (*l, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
+	table2->attach (route_group_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
+	++n;
 
 	options_box->pack_start (*table2, false, true);
 	vbox->pack_start (*options_box, false, true);
@@ -171,6 +147,7 @@ AddRouteDialog::AddRouteDialog (Session* s)
 	get_vbox()->pack_start (*vbox, false, false);
 
 	track_bus_combo.signal_changed().connect (sigc::mem_fun (*this, &AddRouteDialog::track_type_chosen));
+	channel_combo.signal_changed().connect (sigc::mem_fun (*this, &AddRouteDialog::channel_combo_changed));
 	channel_combo.set_row_separator_func (sigc::mem_fun (*this, &AddRouteDialog::channel_separator));
 	route_group_combo.set_row_separator_func (sigc::mem_fun (*this, &AddRouteDialog::route_separator));
 	route_group_combo.signal_changed ().connect (sigc::mem_fun (*this, &AddRouteDialog::group_changed));
@@ -192,30 +169,45 @@ AddRouteDialog::~AddRouteDialog ()
 }
 
 void
-AddRouteDialog::track_type_chosen ()
+AddRouteDialog::channel_combo_changed ()
 {
-	if (track()) {
-		mode_label.set_text (_("Track mode:"));
-		set_popdown_strings (mode_combo, track_mode_strings);
-		mode_combo.set_active_text (track_mode_strings.front());
-	} else {
-		mode_label.set_text (_("Bus type:"));
-		set_popdown_strings (mode_combo, bus_mode_strings);
-		mode_combo.set_active_text (bus_mode_strings.front());
+	maybe_update_name_template_entry ();
+	refill_track_modes ();
+}
+
+void
+AddRouteDialog::maybe_update_name_template_entry ()
+{
+	if (
+		name_template_entry.get_text() != "" &&
+		name_template_entry.get_text() != _("Audio") &&
+		name_template_entry.get_text() != _("MIDI")  &&
+		name_template_entry.get_text() != _("Bus")) {
+		return;
 	}
 
+	if (track ()) {
+		if (type () == DataType::MIDI) {
+			name_template_entry.set_text (_("MIDI"));
+		} else {
+			name_template_entry.set_text (_("Audio"));
+		}
+	} else {
+		name_template_entry.set_text (_("Bus"));
+	}
 }
 
-bool
-AddRouteDialog::track ()
+void
+AddRouteDialog::track_type_chosen ()
 {
-	return track_bus_combo.get_active_row_number () == 0;
+	mode_combo.set_sensitive (track ());
+	maybe_update_name_template_entry ();
 }
 
 bool
-AddRouteDialog::aux ()
+AddRouteDialog::track ()
 {
-	return !track() && mode_combo.get_active_row_number () == 0;
+	return track_bus_combo.get_active_row_number () == 0;
 }
 
 ARDOUR::DataType
@@ -238,6 +230,25 @@ AddRouteDialog::count ()
 	return (int) floor (routes_adjustment.get_value ());
 }
 
+void
+AddRouteDialog::refill_track_modes ()
+{
+	vector<string> s;
+	
+	s.push_back (_("Normal"));
+
+	if (!ARDOUR::Profile->get_sae ()) {
+		s.push_back (_("Non Layered"));
+
+		if (type() != DataType::MIDI) {
+			s.push_back (_("Tape"));
+		}
+	}
+
+	set_popdown_strings (mode_combo, s);
+	mode_combo.set_active_text (s.front());
+}
+
 ARDOUR::TrackMode
 AddRouteDialog::mode ()
 {
@@ -245,7 +256,7 @@ AddRouteDialog::mode ()
 		return ARDOUR::Normal;
 	}
 
-	Glib::ustring str = mode_combo.get_active_text();
+	std::string str = mode_combo.get_active_text();
 	if (str == _("Normal")) {
 		return ARDOUR::Normal;
 	} else if (str == _("Non Layered")){
@@ -318,7 +329,7 @@ AddRouteDialog::refill_channel_setups ()
 	chn.name = "separator";
 	channel_setups.push_back (chn);
 
-	chn.name = X_("MIDI");
+	chn.name = _("MIDI");
 	chn.channels = 0;
 	channel_setups.push_back (chn);
 
@@ -375,7 +386,7 @@ AddRouteDialog::refill_channel_setups ()
 		channel_combo_strings.push_back ((*i).name);
 	}
 
-	set_popdown_strings (channel_combo, channel_combo_strings, true);
+	set_popdown_strings (channel_combo, channel_combo_strings);
 	channel_combo.set_active_text (channel_combo_strings.front());
 }
 
@@ -399,11 +410,11 @@ void
 AddRouteDialog::refill_route_groups ()
 {
 	route_group_combo.clear ();
-	route_group_combo.append_text (_("New group..."));
+	route_group_combo.append_text (_("New Group..."));
 
 	route_group_combo.append_text ("separator");
 
-	route_group_combo.append_text (_("No group"));
+	route_group_combo.append_text (_("No Group"));
 
 	_session->foreach_route_group (sigc::mem_fun (*this, &AddRouteDialog::add_route_group));
 
@@ -413,20 +424,22 @@ AddRouteDialog::refill_route_groups ()
 void
 AddRouteDialog::group_changed ()
 {
-	if (_session && route_group_combo.get_active_text () == _("New group...")) {
-		RouteGroup* g = new RouteGroup (*_session, "", RouteGroup::Active);
+	if (_session && route_group_combo.get_active_text () == _("New Group...")) {
+		RouteGroup* g = new RouteGroup (*_session, "");
 
-		RouteGroupDialog d (g, Gtk::Stock::NEW);
-		int const r = d.do_run ();
+		PropertyList plist;
+		plist.add (Properties::active, true);
+		g->apply_changes (plist);
 
-		if (r == Gtk::RESPONSE_OK) {
+		RouteGroupDialog d (g, true);
+
+		if (d.do_run ()) {
+			delete g;
+			route_group_combo.set_active (2);
+		} else {
 			_session->add_route_group (g);
 			add_route_group (g);
 			route_group_combo.set_active (3);
-		} else {
-			delete g;
-
-			route_group_combo.set_active (2);
 		}
 	}
 }