X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_group_dialog.cc;h=d7fb115e9fcd4b847041dd3b65afc82567cb555a;hb=25ec63968c0e792217a015c402ac52ae59a85e3b;hp=b7c8895d8e153e977bbb7862210ddf272a610513;hpb=41532886616c2714db94cb31a7f0105589f27be3;p=ardour.git diff --git a/gtk2_ardour/route_group_dialog.cc b/gtk2_ardour/route_group_dialog.cc index b7c8895d8e..d7fb115e9f 100644 --- a/gtk2_ardour/route_group_dialog.cc +++ b/gtk2_ardour/route_group_dialog.cc @@ -17,22 +17,29 @@ */ +#include + +#include "ardour/route_group.h" +#include "ardour/session.h" + #include #include #include -#include "ardour/route_group.h" -#include "ardour/session.h" + #include "route_group_dialog.h" -#include "i18n.h" -#include +#include "group_tabs.h" +#include "utils.h" + +#include "pbd/i18n.h" using namespace Gtk; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace std; using namespace PBD; RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new) - : ArdourDialog (_("Route Group")) + : ArdourDialog (_("Track/bus Group")) , _group (g) , _initial_name (g->name ()) , _active (_("Active")) @@ -42,21 +49,21 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new) , _solo (_("Soloing")) , _rec_enable (_("Record enable")) , _select (_("Selection")) - , _edit (_("Editing")) + , _route_active (_("Active state")) + , _share_color (_("Color")) + , _share_monitoring (_("Monitoring")) { - set_modal (true); set_skip_taskbar_hint (true); - set_resizable (false); - set_position (Gtk::WIN_POS_MOUSE); + set_resizable (true); set_name (N_("RouteGroupDialog")); - VBox* vbox = manage (new VBox); + VBox* main_vbox = manage (new VBox); Gtk::Label* l; get_vbox()->set_spacing (4); - vbox->set_spacing (18); - vbox->set_border_width (5); + main_vbox->set_spacing (18); + main_vbox->set_border_width (5); HBox* hbox = manage (new HBox); hbox->set_spacing (6); @@ -65,7 +72,26 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new) hbox->pack_start (*l, false, true); hbox->pack_start (_name, true, true); - vbox->pack_start (*hbox, false, true); + VBox* top_vbox = manage (new VBox); + top_vbox->set_spacing (4); + + top_vbox->pack_start (*hbox, false, true); + top_vbox->pack_start (_active); + + l = manage (new Label (_("Color"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); + hbox = manage (new HBox); + hbox->set_spacing (12); + hbox->pack_start (*l, false, false); + hbox->pack_start (_color, false, false); + top_vbox->pack_start (*hbox, false, false); + + main_vbox->pack_start (*top_vbox, false, false); + + _active.set_active (_group->is_active ()); + + Gdk::Color c; + set_color_from_rgba (c, GroupTabs::group_color (_group)); + _color.set_color (c); VBox* options_box = manage (new VBox); options_box->set_spacing (6); @@ -74,39 +100,50 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new) l->set_use_markup (); options_box->pack_start (*l, false, true); - _name.set_text (_group->name ()); - _active.set_active (_group->is_active ()); - - _name.signal_activate ().connect (sigc::bind (sigc::mem_fun (*this, &Dialog::response), RESPONSE_OK)); - _gain.set_active (_group->is_gain()); _relative.set_active (_group->is_relative()); _mute.set_active (_group->is_mute()); _solo.set_active (_group->is_solo()); _rec_enable.set_active (_group->is_recenable()); _select.set_active (_group->is_select()); - _edit.set_active (_group->is_edit()); + _route_active.set_active (_group->is_route_active()); + _share_color.set_active (_group->is_color()); + _share_monitoring.set_active (_group->is_monitoring()); + + if (_group->name ().empty()) { + _initial_name = "1"; + while (!unique_name (_initial_name)) { + _initial_name = bump_name_number (_initial_name); + } + _name.set_text (_initial_name); + update(); + } else { + _name.set_text (_initial_name); + } + _name.signal_activate ().connect (sigc::bind (sigc::mem_fun (*this, &Dialog::response), RESPONSE_OK)); _name.signal_changed().connect (sigc::mem_fun (*this, &RouteGroupDialog::update)); _active.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update)); + _color.signal_color_set().connect (sigc::mem_fun (*this, &RouteGroupDialog::update)); _gain.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update)); - _relative.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update)); - _mute.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update)); - _solo.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update)); - _rec_enable.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update)); - _select.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update)); - _edit.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update)); + _relative.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update)); + _mute.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update)); + _solo.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update)); + _rec_enable.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update)); + _select.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update)); + _route_active.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update)); + _share_color.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update)); + _share_monitoring.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update)); gain_toggled (); - Table* table = manage (new Table (8, 3, false)); + Table* table = manage (new Table (11, 4, false)); table->set_row_spacings (6); l = manage (new Label ("", Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); l->set_padding (8, 0); table->attach (*l, 0, 1, 0, 8, Gtk::FILL, Gtk::FILL, 0, 0); - table->attach (_active, 1, 3, 0, 1, Gtk::FILL, Gtk::FILL, 0, 0); table->attach (_gain, 1, 3, 1, 2, Gtk::FILL, Gtk::FILL, 0, 0); l = manage (new Label ("", Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); @@ -118,12 +155,14 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new) table->attach (_solo, 1, 3, 4, 5, Gtk::FILL, Gtk::FILL, 0, 0); table->attach (_rec_enable, 1, 3, 5, 6, Gtk::FILL, Gtk::FILL, 0, 0); table->attach (_select, 1, 3, 6, 7, Gtk::FILL, Gtk::FILL, 0, 0); - table->attach (_edit, 1, 3, 7, 8, Gtk::FILL, Gtk::FILL, 0, 0); + table->attach (_route_active, 1, 3, 7, 8, Gtk::FILL, Gtk::FILL, 0, 0); + table->attach (_share_color, 1, 3, 8, 9, Gtk::FILL, Gtk::FILL, 0, 0); + table->attach (_share_monitoring, 1, 3, 9, 10, Gtk::FILL, Gtk::FILL, 0, 0); options_box->pack_start (*table, false, true); - vbox->pack_start (*options_box, false, true); + main_vbox->pack_start (*options_box, false, true); - get_vbox()->pack_start (*vbox, false, false); + get_vbox()->pack_start (*main_vbox, false, false); _gain.signal_toggled().connect(sigc::mem_fun (*this, &RouteGroupDialog::gain_toggled)); @@ -135,39 +174,31 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new) add_button (Stock::CLOSE, RESPONSE_CLOSE); set_default_response (RESPONSE_CLOSE); } - + show_all_children (); } -/** @return true if the route group edit was cancelled, otherwise false */ bool -RouteGroupDialog::do_run () +RouteGroupDialog::name_check () const { - while (1) { - int const r = run (); - if (r == Gtk::RESPONSE_CANCEL) { - /* cancel, so just bail now */ - return Gtk::RESPONSE_CANCEL; - } - - if (unique_name ()) { - /* not cancelled and the name is ok, so all is well */ - return false; - } - - _group->set_name (_initial_name); - MessageDialog msg ( - _("A route group of this name already exists. Please use a different name."), - false, - Gtk::MESSAGE_ERROR, - Gtk::BUTTONS_OK, - true - ); - - msg.run (); + if (unique_name (_name.get_text())) { + /* not cancelled and the name is ok, so all is well */ + return true; } - /* NOTREACHED */ + _group->set_name (_initial_name); + + MessageDialog msg ( + _("The group name is not unique. Please use a different name."), + false, + Gtk::MESSAGE_ERROR, + Gtk::BUTTONS_OK, + true + ); + + msg.set_position (WIN_POS_MOUSE); + msg.run (); + return false; } @@ -176,17 +207,21 @@ RouteGroupDialog::update () { PropertyList plist; - plist.add (Properties::gain, _gain.get_active()); - plist.add (Properties::recenable, _rec_enable.get_active()); - plist.add (Properties::mute, _mute.get_active()); - plist.add (Properties::solo, _solo.get_active ()); - plist.add (Properties::select, _select.get_active()); - plist.add (Properties::edit, _edit.get_active()); - plist.add (Properties::relative, _relative.get_active()); + plist.add (Properties::group_gain, _gain.get_active()); + plist.add (Properties::group_recenable, _rec_enable.get_active()); + plist.add (Properties::group_mute, _mute.get_active()); + plist.add (Properties::group_solo, _solo.get_active ()); + plist.add (Properties::group_select, _select.get_active()); + plist.add (Properties::group_route_active, _route_active.get_active()); + plist.add (Properties::group_relative, _relative.get_active()); + plist.add (Properties::group_color, _share_color.get_active()); + plist.add (Properties::group_monitoring, _share_monitoring.get_active()); plist.add (Properties::active, _active.get_active()); plist.add (Properties::name, string (_name.get_text())); _group->apply_changes (plist); + + GroupTabs::set_group_color (_group, gdk_color_to_rgba (_color.get_color ())); } void @@ -197,11 +232,12 @@ RouteGroupDialog::gain_toggled () /** @return true if the current group's name is unique accross the session */ bool -RouteGroupDialog::unique_name () const +RouteGroupDialog::unique_name (std::string const name) const { + if (name.empty()) return false; // do not allow empty name, empty means unset. list route_groups = _group->session().route_groups (); list::iterator i = route_groups.begin (); - while (i != route_groups.end() && ((*i)->name() != _name.get_text() || *i == _group)) { + while (i != route_groups.end() && ((*i)->name() != name || *i == _group)) { ++i; }