X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fadd_route_dialog.cc;h=f165d191c6b7d6f08871b475eb5fba1a0b10156b;hb=ae6dbb836cc1ab1bcbc21883f282361c43f10883;hp=9baa8f3cd20c4d1c1c0c848255525ebc1477349a;hpb=0d36301907afd612f93a7bfa53724cc9a17724de;p=ardour.git diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc index 9baa8f3cd2..f165d191c6 100644 --- a/gtk2_ardour/add_route_dialog.cc +++ b/gtk2_ardour/add_route_dialog.cc @@ -23,16 +23,20 @@ #include #include #include +#include +#include #include "pbd/error.h" #include "pbd/convert.h" #include "gtkmm2ext/utils.h" #include "ardour/profile.h" #include "ardour/template_utils.h" +#include "ardour/route_group.h" #include "ardour/session.h" #include "utils.h" #include "add_route_dialog.h" +#include "route_group_dialog.h" #include "i18n.h" using namespace Gtk; @@ -42,18 +46,6 @@ using namespace std; using namespace PBD; using namespace ARDOUR; -static const char* channel_setup_names[] = { - N_("Mono"), - N_("Stereo"), - N_("3 Channels"), - N_("4 Channels"), - N_("6 Channels"), - N_("8 Channels"), - N_("Manual Setup"), - N_("MIDI"), - 0 -}; - static const char* track_mode_names[] = { N_("Normal"), N_("Non Layered"), @@ -61,31 +53,13 @@ static const char* track_mode_names[] = { 0 }; -static vector channel_combo_strings; -static vector track_mode_strings; - - -AddRouteDialog::AddRouteDialog () - : Dialog (_("ardour: add track/bus")), - track_button (_("Tracks")), - bus_button (_("Busses")), - template_button (_("Using this template:")), - routes_adjustment (1, 1, 128, 1, 4), - routes_spinner (routes_adjustment) +AddRouteDialog::AddRouteDialog (Session & s) + : ArdourDialog (X_("add route dialog")) + , _session (s) + , routes_adjustment (1, 1, 128, 1, 4) + , routes_spinner (routes_adjustment) + , track_mode_label (_("Track mode:")) { - if (channel_combo_strings.empty()) { - channel_combo_strings = I18N (channel_setup_names); - - if (ARDOUR::Profile->get_sae()) { - /* remove all but the first two (Mono & Stereo) */ - - while (track_mode_strings.size() > 2) { - track_mode_strings.pop_back(); - } - } - - } - if (track_mode_strings.empty()) { track_mode_strings = I18N (track_mode_names); @@ -99,108 +73,98 @@ AddRouteDialog::AddRouteDialog () } set_name ("AddRouteDialog"); - set_wmclass (X_("ardour_add_track_bus"), "Ardour"); set_position (Gtk::WIN_POS_MOUSE); + set_modal (true); + set_skip_taskbar_hint (true); set_resizable (false); - name_template_entry.set_name ("AddRouteDialogNameTemplateEntry"); - track_button.set_name ("AddRouteDialogRadioButton"); - bus_button.set_name ("AddRouteDialogRadioButton"); - template_button.set_name ("AddRouteDialogRadioButton"); - routes_spinner.set_name ("AddRouteDialogSpinner"); - - RadioButton::Group g = track_button.get_group(); - bus_button.set_group (g); - template_button.set_group (g); - track_button.set_active (true); - - /* add */ - - HBox* hbox1 = manage (new HBox); - hbox1->set_spacing (6); - Label* label1 = manage (new Label (_("Add this many:"))); - hbox1->pack_start (*label1, PACK_SHRINK); - hbox1->pack_start (routes_spinner, PACK_SHRINK); - - HBox* hbox2 = manage (new HBox); - hbox2->set_spacing (6); - hbox2->set_border_width (6); - hbox2->pack_start (*hbox1, PACK_EXPAND_WIDGET); - - /* templates */ - - hbox3 = new HBox; - hbox3->set_spacing (6); - hbox3->set_border_width (6); - hbox3->pack_start (template_button, PACK_SHRINK); - - hbox9 = new HBox; - hbox9->set_spacing (6); - hbox9->set_border_width (6); - hbox9->pack_start (track_template_combo, PACK_EXPAND_WIDGET); - - /* separator */ - - hbox4 = new HBox; - hbox4->set_spacing (6); - Label* label2 = manage (new Label (_("OR"))); - hbox4->pack_start (*(manage (new HSeparator)), PACK_EXPAND_WIDGET); - hbox4->pack_start (*label2, false, false); - hbox4->pack_start (*(manage (new HSeparator)), PACK_EXPAND_WIDGET); - - /* we need more control over the visibility of these boxes */ - /* - hbox3->set_no_show_all (true); - hbox9->set_no_show_all (true); - hbox4->set_no_show_all (true); - */ - /* track/bus choice & modes */ - - HBox* hbox5 = manage (new HBox); - hbox5->set_spacing (6); - hbox5->pack_start (track_button, PACK_EXPAND_PADDING); - hbox5->pack_start (bus_button, PACK_EXPAND_PADDING); + WindowTitle title(Glib::get_application_name()); + title += _("Add Route"); + set_title(title.get_string()); + name_template_entry.set_name (X_("AddRouteDialogNameTemplateEntry")); + routes_spinner.set_name (X_("AddRouteDialogSpinner")); channel_combo.set_name (X_("ChannelCountSelector")); track_mode_combo.set_name (X_("ChannelCountSelector")); - set_popdown_strings (channel_combo, channel_combo_strings, true); + refill_channel_setups (); + refill_route_groups (); set_popdown_strings (track_mode_combo, track_mode_strings, true); channel_combo.set_active_text (channel_combo_strings.front()); track_mode_combo.set_active_text (track_mode_strings.front()); - track_button.signal_clicked().connect (mem_fun (*this, &AddRouteDialog::track_type_chosen)); - bus_button.signal_clicked().connect (mem_fun (*this, &AddRouteDialog::track_type_chosen)); - template_button.signal_clicked().connect (mem_fun (*this, &AddRouteDialog::track_type_chosen)); + track_bus_combo.append_text (_("tracks")); + track_bus_combo.append_text (_("busses")); + track_bus_combo.set_active (0); + + VBox* vbox = manage (new VBox); + Gtk::Label* l; + + get_vbox()->set_spacing (4); + vbox->set_spacing (18); + vbox->set_border_width (5); + + HBox *type_hbox = manage (new HBox); + type_hbox->set_spacing (6); - VBox* vbox1 = manage (new VBox); - vbox1->set_spacing (6); - vbox1->set_border_width (6); + /* track/bus choice */ - Frame* frame1 = manage (new Frame (_("Channel Configuration"))); - frame1->add (channel_combo); - Frame* frame2 = manage (new Frame (_("Track Mode"))); - frame2->add (track_mode_combo); + type_hbox->pack_start (*manage (new Label (_("Add:")))); + type_hbox->pack_start (routes_spinner); + type_hbox->pack_start (track_bus_combo); + + vbox->pack_start (*type_hbox, false, true); - vbox1->pack_start (*hbox5, PACK_SHRINK); - vbox1->pack_start (*frame1, PACK_SHRINK); + VBox* options_box = manage (new VBox); + Table *table2 = manage (new Table (3, 3, false)); + + options_box->set_spacing (6); + table2->set_row_spacings (6); + table2->set_col_spacing (1, 6); + + l = manage (new Label (_("Options"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); + l->set_use_markup (); + options_box->pack_start (*l, false, true); + + l = manage (new Label ("", Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); + l->set_padding (8, 0); + table2->attach (*l, 0, 1, 0, 3, Gtk::FILL, Gtk::FILL, 0, 0); + + /* 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); + + if (!ARDOUR::Profile->get_sae ()) { + + /* Track mode */ + + track_mode_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER); + table2->attach (track_mode_label, 1, 2, 1, 2, Gtk::FILL, Gtk::EXPAND, 0, 0); + table2->attach (track_mode_combo, 2, 3, 1, 2, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0); - if (!ARDOUR::Profile->get_sae()) { - vbox1->pack_start (*frame2, PACK_SHRINK); } - get_vbox()->set_spacing (6); - get_vbox()->set_border_width (6); + /* Group choise */ + + 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); + + options_box->pack_start (*table2, false, true); + vbox->pack_start (*options_box, false, true); + + get_vbox()->pack_start (*vbox, false, false); - get_vbox()->pack_start (*hbox2, PACK_SHRINK); - get_vbox()->pack_start (*hbox3, PACK_SHRINK); - get_vbox()->pack_start (*hbox9, PACK_SHRINK); - get_vbox()->pack_start (*hbox4, PACK_SHRINK); - get_vbox()->pack_start (*vbox1, PACK_SHRINK); + track_bus_combo.signal_changed().connect (mem_fun (*this, &AddRouteDialog::track_type_chosen)); + channel_combo.set_row_separator_func (mem_fun (*this, &AddRouteDialog::channel_separator)); + route_group_combo.set_row_separator_func (mem_fun (*this, &AddRouteDialog::route_separator)); + route_group_combo.signal_changed ().connect (mem_fun (*this, &AddRouteDialog::group_changed)); - get_vbox()->show_all (); + show_all_children (); /* track template info will be managed whenever this dialog is shown, via ::on_show() @@ -219,25 +183,14 @@ AddRouteDialog::~AddRouteDialog () void AddRouteDialog::track_type_chosen () { - if (template_button.get_active()) { - track_mode_combo.set_sensitive (false); - channel_combo.set_sensitive (false); - track_template_combo.set_sensitive (true); - } else { - track_template_combo.set_sensitive (false); - channel_combo.set_sensitive (true); - if (track_button.get_active()) { - track_mode_combo.set_sensitive (true); - } else { - track_mode_combo.set_sensitive (false); - } - } + track_mode_label.set_sensitive (track ()); + track_mode_combo.set_sensitive (track ()); } bool AddRouteDialog::track () { - return track_button.get_active (); + return track_bus_combo.get_active_row_number () == 0; } ARDOUR::DataType @@ -246,10 +199,11 @@ AddRouteDialog::type () // FIXME: ew const string str = channel_combo.get_active_text(); - if (str == _("MIDI")) + if (str == _("MIDI")) { return ARDOUR::DataType::MIDI; - else + } else { return ARDOUR::DataType::AUDIO; + } } string @@ -291,15 +245,12 @@ int AddRouteDialog::channels () { string str = channel_combo.get_active_text(); - int chns; - - if (str == _("Mono")) { - return 1; - } else if (str == _("Stereo")) { - return 2; - } else if ((chns = PBD::atoi (str)) != 0) { - return chns; - } + + for (ChannelSetups::iterator i = channel_setups.begin(); i != channel_setups.end(); ++i) { + if (str == (*i).name) { + return (*i).channels; + } + } return 0; } @@ -307,15 +258,11 @@ AddRouteDialog::channels () string AddRouteDialog::track_template () { - if (!template_button.get_active()) { - return string (); - } - - string str = track_template_combo.get_active_text(); + string str = channel_combo.get_active_text(); - for (vector::iterator x = route_templates.begin(); x != route_templates.end(); ++x) { - if ((*x).name == str) { - return (*x).path; + for (ChannelSetups::iterator i = channel_setups.begin(); i != channel_setups.end(); ++i) { + if (str == (*i).name) { + return (*i).template_path; } } @@ -325,38 +272,158 @@ AddRouteDialog::track_template () void AddRouteDialog::on_show () { - refill_track_templates (); + refill_channel_setups (); + refill_route_groups (); + Dialog::on_show (); } void -AddRouteDialog::refill_track_templates () +AddRouteDialog::refill_channel_setups () { + ChannelSetup chn; + route_templates.clear (); + channel_combo_strings.clear (); + channel_setups.clear (); + + chn.name = _("Mono"); + chn.channels = 1; + channel_setups.push_back (chn); + + chn.name = _("Stereo"); + chn.channels = 2; + channel_setups.push_back (chn); + + chn.name = "separator"; + channel_setups.push_back (chn); + + chn.name = X_("MIDI"); + chn.channels = 0; + channel_setups.push_back (chn); + + chn.name = "separator"; + channel_setups.push_back (chn); + ARDOUR::find_route_templates (route_templates); - - if (!route_templates.empty()) { - vector v; - for (vector::iterator x = route_templates.begin(); x != route_templates.end(); ++x) { - v.push_back ((*x).name); - } - set_popdown_strings (track_template_combo, v); - track_template_combo.set_active_text (v.front()); - } - reset_template_option_visibility (); + if (!ARDOUR::Profile->get_sae()) { + if (!route_templates.empty()) { + vector v; + for (vector::iterator x = route_templates.begin(); x != route_templates.end(); ++x) { + chn.name = x->name; + chn.channels = 0; + chn.template_path = x->path; + channel_setups.push_back (chn); + } + } + + /* clear template path for the rest */ + + chn.template_path = ""; + + chn.name = _("3 Channel"); + chn.channels = 3; + channel_setups.push_back (chn); + + chn.name = _("4 Channel"); + chn.channels = 4; + channel_setups.push_back (chn); + + chn.name = _("5 Channel"); + chn.channels = 5; + channel_setups.push_back (chn); + + chn.name = _("6 Channel"); + chn.channels = 6; + channel_setups.push_back (chn); + + chn.name = _("8 Channel"); + chn.channels = 8; + channel_setups.push_back (chn); + + chn.name = _("12 Channel"); + chn.channels = 12; + channel_setups.push_back (chn); + + chn.name = X_("Custom"); + chn.channels = 0; + channel_setups.push_back (chn); + } + + for (ChannelSetups::iterator i = channel_setups.begin(); i != channel_setups.end(); ++i) { + channel_combo_strings.push_back ((*i).name); + } + + set_popdown_strings (channel_combo, channel_combo_strings, true); + channel_combo.set_active_text (channel_combo_strings.front()); } void -AddRouteDialog::reset_template_option_visibility () +AddRouteDialog::add_route_group (RouteGroup* g) { - if (route_templates.empty()) { - hbox3->hide (); - hbox9->hide (); - hbox4->hide (); - } else { - hbox3->show_all (); - hbox9->show_all (); - hbox4->show_all (); + route_group_combo.insert_text (3, g->name ()); +} + +RouteGroup* +AddRouteDialog::route_group () +{ + if (route_group_combo.get_active_row_number () == 2) { + return 0; } + + return _session.route_group_by_name (route_group_combo.get_active_text()); } + +void +AddRouteDialog::refill_route_groups () +{ + route_group_combo.clear (); + route_group_combo.append_text (_("New group...")); + + route_group_combo.append_text ("separator"); + + route_group_combo.append_text (_("No group")); + + _session.foreach_route_group (mem_fun (*this, &AddRouteDialog::add_route_group)); + + route_group_combo.set_active (2); +} + +void +AddRouteDialog::group_changed () +{ + if (route_group_combo.get_active_text () == _("New group...")) { + RouteGroup* g = new RouteGroup (_session, "", RouteGroup::Active); + + RouteGroupDialog d (g, Gtk::Stock::NEW); + int const r = d.do_run (); + + if (r == Gtk::RESPONSE_OK) { + _session.add_route_group (g); + add_route_group (g); + route_group_combo.set_active (3); + } else { + delete g; + + route_group_combo.set_active (2); + } + } +} + +bool +AddRouteDialog::channel_separator (const Glib::RefPtr &, const Gtk::TreeModel::iterator &i) +{ + channel_combo.set_active (i); + + return channel_combo.get_active_text () == "separator"; +} + +bool +AddRouteDialog::route_separator (const Glib::RefPtr &, const Gtk::TreeModel::iterator &i) +{ + route_group_combo.set_active (i); + + return route_group_combo.get_active_text () == "separator"; +} +