X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fadd_route_dialog.cc;h=29ae5cb3f399d85c60d8080117428f7776a2ea18;hb=a49b0f53aa2d83a9291c35f323f90b46d8869390;hp=72a19ca6efd4f5149dc4ca2876ef147a9156c718;hpb=7b2975244165b4ffd1dcf4080c1be4c8dcbc6708;p=ardour.git diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc index 72a19ca6ef..29ae5cb3f3 100644 --- a/gtk2_ardour/add_route_dialog.cc +++ b/gtk2_ardour/add_route_dialog.cc @@ -51,15 +51,8 @@ static const char* track_mode_names[] = { 0 }; -static const char* bus_mode_names[] = { - N_("Aux"), - N_("Direct"), - 0 -}; - std::vector AddRouteDialog::channel_combo_strings; std::vector AddRouteDialog::track_mode_strings; -std::vector AddRouteDialog::bus_mode_strings; AddRouteDialog::AddRouteDialog (Session* s) : ArdourDialog (_("Add Track or Bus")) @@ -81,10 +74,6 @@ AddRouteDialog::AddRouteDialog (Session* s) } } - if (bus_mode_strings.empty()) { - bus_mode_strings = I18N (bus_mode_names); - } - set_name ("AddRouteDialog"); set_position (Gtk::WIN_POS_MOUSE); set_modal (true); @@ -141,27 +130,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); @@ -169,6 +168,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::maybe_update_name_template_entry)); 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)); @@ -190,30 +190,38 @@ AddRouteDialog::~AddRouteDialog () } void -AddRouteDialog::track_type_chosen () +AddRouteDialog::maybe_update_name_template_entry () { - 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()); + 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 @@ -243,7 +251,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")){ @@ -316,7 +324,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); @@ -397,11 +405,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)); @@ -411,24 +419,22 @@ AddRouteDialog::refill_route_groups () void AddRouteDialog::group_changed () { - if (_session && route_group_combo.get_active_text () == _("New group...")) { + if (_session && route_group_combo.get_active_text () == _("New Group...")) { RouteGroup* g = new RouteGroup (*_session, ""); PropertyList plist; plist.add (Properties::active, true); g->apply_changes (plist); - RouteGroupDialog d (g, Gtk::Stock::NEW); - int const r = d.do_run (); + RouteGroupDialog d (g, true); - if (r == Gtk::RESPONSE_OK) { + 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); } } }