X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fadd_route_dialog.cc;h=1f7239f6e90cdbe7784fecd3d2e15ac9485d792a;hb=c78528dcea03a61685ad0586eaa6302847af6fe9;hp=a828caeb92b8c58ee5d0c07d1b73e173432c68ba;hpb=8687895abba4209a6de8d8a8fc1bda5996f0d875;p=ardour.git diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc index a828caeb92..1f7239f6e9 100644 --- a/gtk2_ardour/add_route_dialog.cc +++ b/gtk2_ardour/add_route_dialog.cc @@ -51,23 +51,17 @@ 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 (X_("add route dialog")) - , _session (s) +AddRouteDialog::AddRouteDialog (Session* s) + : 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); @@ -80,18 +74,12 @@ 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); 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")); @@ -142,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); @@ -170,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)); @@ -191,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 @@ -244,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")){ @@ -317,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); @@ -365,7 +372,7 @@ AddRouteDialog::refill_channel_setups () chn.channels = 12; channel_setups.push_back (chn); - chn.name = X_("Custom"); + chn.name = _("Custom"); chn.channels = 0; channel_setups.push_back (chn); } @@ -391,7 +398,7 @@ AddRouteDialog::route_group () return 0; } - return _session.route_group_by_name (route_group_combo.get_active_text()); + return _session->route_group_by_name (route_group_combo.get_active_text()); } void @@ -404,7 +411,7 @@ AddRouteDialog::refill_route_groups () route_group_combo.append_text (_("No group")); - _session.foreach_route_group (sigc::mem_fun (*this, &AddRouteDialog::add_route_group)); + _session->foreach_route_group (sigc::mem_fun (*this, &AddRouteDialog::add_route_group)); route_group_combo.set_active (2); } @@ -412,20 +419,22 @@ AddRouteDialog::refill_route_groups () void AddRouteDialog::group_changed () { - if (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) { - _session.add_route_group (g); - add_route_group (g); - route_group_combo.set_active (3); - } else { - delete g; + 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); } } }