X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Feditor_route_groups.cc;h=85644359f6fa747836f107e6824edaae0c0396aa;hb=9e5b7db89f381c70232fab35dc21fd885863f998;hp=72f6adfa8259abf3200d553d26f8fd81753fb05f;hpb=54ce76e8fd7d6c4840cbdfabd6034bae008f520e;p=ardour.git diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc index 72f6adfa82..85644359f6 100644 --- a/gtk2_ardour/editor_route_groups.cc +++ b/gtk2_ardour/editor_route_groups.cc @@ -30,27 +30,29 @@ #include "gtkmm2ext/cell_renderer_color_selector.h" #include "ardour/route_group.h" +#include "ardour/route.h" +#include "ardour/session.h" +#include "ardour_ui.h" #include "editor.h" +#include "editor_group_tabs.h" +#include "editor_route_groups.h" +#include "editor_routes.h" +#include "gui_thread.h" #include "keyboard.h" #include "marker.h" -#include "time_axis_view.h" #include "prompter.h" -#include "gui_thread.h" -#include "editor_group_tabs.h" #include "route_group_dialog.h" #include "route_time_axis.h" -#include "editor_routes.h" -#include "editor_route_groups.h" -#include "ardour_ui.h" - -#include "ardour/route.h" -#include "ardour/session.h" +#include "time_axis_view.h" +#include "tooltips.h" +#include "utils.h" #include "i18n.h" using namespace std; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Gtk; using Gtkmm2ext::Keyboard; @@ -63,7 +65,6 @@ struct ColumnInfo { EditorRouteGroups::EditorRouteGroups (Editor* e) : EditorComponent (e) - , _all_group_active_button (_("No Selection = All Tracks?")) , _in_row_change (false) , _in_rebuild (false) { @@ -72,8 +73,9 @@ EditorRouteGroups::EditorRouteGroups (Editor* e) Gtkmm2ext::CellRendererColorSelector* color_renderer = manage (new Gtkmm2ext::CellRendererColorSelector); TreeViewColumn* color_column = manage (new TreeViewColumn ("", *color_renderer)); + color_column->add_attribute (color_renderer->property_color(), _columns.gdkcolor); - + _display.append_column (*color_column); _display.append_column ("", _columns.text); @@ -92,18 +94,18 @@ EditorRouteGroups::EditorRouteGroups (Editor* e) Gtk::Label* l; ColumnInfo ci[] = { - { 0, _("Col"), _("Group Tab Color") }, - { 1, _("Name"), _("Name of Group") }, - { 2, _("V"), _("Group is visible?") }, - { 3, _("On"), _("Group is enabled?") }, - { 4, S_("group|G"), _("Sharing Gain?") }, - { 5, S_("relative|Rel"), _("Relative Gain Changes?") }, - { 6, S_("mute|M"), _("Sharing Mute?") }, - { 7, S_("solo|S"), _("Sharing Solo?") }, - { 8, _("Rec"), _("Sharing Record-enable Status?") }, - { 9, S_("monitoring|Mon"), _("Sharing Monitoring Choice?") }, - { 10, S_("selection|Sel"), _("Sharing Selected/Editing Status?") }, - { 11, S_("active|A"), _("Sharing Active Status?") }, + { 0, _("Col"), _("Group Tab Color") }, + { 1, _("Name"), _("Name of Group") }, + { 2, S_("Visible|V"), _("Group is visible?") }, + { 3, _("On"), _("Group is enabled?") }, + { 4, S_("Group|G"), _("Sharing Gain?") }, + { 5, S_("Relative|Rel"), _("Relative Gain Changes?") }, + { 6, S_("Mute|M"), _("Sharing Mute?") }, + { 7, S_("Solo|S"), _("Sharing Solo?") }, + { 8, _("Rec"), _("Sharing Record-enable Status?") }, + { 9, S_("Monitoring|Mon"), _("Sharing Monitoring Choice?") }, + { 10, S_("Selection|Sel"), _("Sharing Selected/Editing Status?") }, + { 11, S_("Active|A"), _("Sharing Active Status?") }, { -1, 0, 0 } }; @@ -111,7 +113,7 @@ EditorRouteGroups::EditorRouteGroups (Editor* e) for (int i = 0; ci[i].index >= 0; ++i) { col = _display.get_column (ci[i].index); l = manage (new Label (ci[i].label)); - ARDOUR_UI::instance()->set_tip (*l, ci[i].tooltip); + set_tooltip (*l, ci[i].tooltip); col->set_widget (*l); l->show (); @@ -136,7 +138,7 @@ EditorRouteGroups::EditorRouteGroups (Editor* e) CellRendererText* name_cell = dynamic_cast(_display.get_column_cell_renderer (1)); name_cell->property_editable() = true; name_cell->signal_edited().connect (sigc::mem_fun (*this, &EditorRouteGroups::name_edit)); - + for (int i = 1; ci[i].index >= 0; ++i) { CellRendererToggle* active_cell = dynamic_cast (_display.get_column_cell_renderer (i)); @@ -186,15 +188,8 @@ EditorRouteGroups::EditorRouteGroups (Editor* e) button_box->pack_start (*add_button); button_box->pack_start (*remove_button); - _all_group_active_button.show (); - _display_packer.pack_start (_scroller, true, true); - _display_packer.pack_start (_all_group_active_button, false, false); _display_packer.pack_start (*button_box, false, false); - - _all_group_active_button.signal_toggled().connect (sigc::mem_fun (*this, &EditorRouteGroups::all_group_toggled)); - _all_group_active_button.set_name (X_("EditorRouteGroupsAllGroupButton")); - ARDOUR_UI::instance()->set_tip (_all_group_active_button, _("Activate this button to operate on all tracks when none are selected.")); } void @@ -203,7 +198,7 @@ EditorRouteGroups::remove_selected () Glib::RefPtr selection = _display.get_selection(); TreeView::Selection::ListHandle_Path rows = selection->get_selected_rows (); - if (rows.empty()) { + if (rows.empty() || _session->deletion_in_progress()) { return; } @@ -249,12 +244,12 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev) if (iter) { group = (*iter)[_columns.routegroup]; - } + } if (Keyboard::is_context_menu_event (ev)) { _editor->_group_tabs->get_menu(group)->popup (1, ev->time); return true; - } + } if (!p) { /* cancel selection */ @@ -267,9 +262,8 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev) group = (*iter)[_columns.routegroup]; switch (GPOINTER_TO_UINT (column->get_data (X_("colnum")))) { - case 0: - c = (*iter)[_columns.gdkcolor]; - + case 0: + c = (*iter)[_columns.gdkcolor]; color_dialog.get_colorsel()->set_previous_color (c); color_dialog.get_colorsel()->set_current_color (c); @@ -278,13 +272,12 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev) break; case RESPONSE_ACCEPT: c = color_dialog.get_colorsel()->get_current_color(); - GroupTabs::set_group_color (group, c); - ARDOUR_UI::config()->set_dirty (); + GroupTabs::set_group_color (group, gdk_color_to_rgba (c)); break; - + default: break; - + } color_dialog.hide (); @@ -308,7 +301,7 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev) ret = true; break; - + case 3: val = (*iter)[_columns.active_state]; group->set_active (!val, this); @@ -409,7 +402,7 @@ EditorRouteGroups::row_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel group->apply_changes (plist); - GroupTabs::set_group_color ((*iter)[_columns.routegroup], (*iter)[_columns.gdkcolor]); + GroupTabs::set_group_color ((*iter)[_columns.routegroup], gdk_color_to_rgba ((*iter)[_columns.gdkcolor])); } void @@ -430,8 +423,11 @@ EditorRouteGroups::add (RouteGroup* group) row[_columns.active_shared] = group->is_route_active (); row[_columns.active_state] = group->is_active (); row[_columns.is_visible] = !group->is_hidden(); - row[_columns.gdkcolor] = GroupTabs::group_color (group); - + + Gdk::Color c; + set_color_from_rgba (c, GroupTabs::group_color (group)); + row[_columns.gdkcolor] = c; + _in_row_change = true; row[_columns.routegroup] = group; @@ -477,6 +473,7 @@ EditorRouteGroups::groups_changed () void EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange&) { + assert(group); _in_row_change = true; Gtk::TreeModel::Children children = _model->children(); @@ -500,12 +497,15 @@ EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange&) (*iter)[_columns.active_shared] = group->is_route_active (); (*iter)[_columns.active_state] = group->is_active (); (*iter)[_columns.is_visible] = !group->is_hidden(); - (*iter)[_columns.gdkcolor] = GroupTabs::group_color (group); + + Gdk::Color c; + set_color_from_rgba (c, GroupTabs::group_color (group)); + (*iter)[_columns.gdkcolor] = c; break; } } - + _in_row_change = false; for (TrackViewList::const_iterator i = _editor->get_track_views().begin(); i != _editor->get_track_views().end(); ++i) { @@ -517,6 +517,7 @@ EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange&) } } } + _editor->_routes->reset_remote_control_ids (); } void @@ -552,10 +553,6 @@ EditorRouteGroups::set_session (Session* s) if (_session) { - RouteGroup& arg (_session->all_route_group()); - - arg.PropertyChanged.connect (all_route_groups_changed_connection, MISSING_INVALIDATOR, boost::bind (&EditorRouteGroups::all_group_changed, this, _1), gui_context()); - _session->route_group_added.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&EditorRouteGroups::add, this, _1), gui_context()); _session->route_group_removed.connect ( _session_connections, MISSING_INVALIDATOR, boost::bind (&EditorRouteGroups::groups_changed, this), gui_context() @@ -568,7 +565,6 @@ EditorRouteGroups::set_session (Session* s) PBD::PropertyChange pc; pc.add (Properties::select); pc.add (Properties::active); - all_group_changed (pc); groups_changed (); } @@ -581,25 +577,6 @@ EditorRouteGroups::run_new_group_dialog () return _editor->_group_tabs->run_new_group_dialog (rl); } -void -EditorRouteGroups::all_group_toggled () -{ - if (_session) { - _session->all_route_group().set_select (_all_group_active_button.get_active()); - } -} - -void -EditorRouteGroups::all_group_changed (const PropertyChange&) -{ - if (_session) { - RouteGroup& arg (_session->all_route_group()); - _all_group_active_button.set_active (arg.is_active() && arg.is_select()); - } else { - _all_group_active_button.set_active (false); - } -} - /** Called when a model row is deleted, but also when the model is * reordered by a user drag-and-drop; the latter is what we are * interested in here. @@ -607,7 +584,7 @@ EditorRouteGroups::all_group_changed (const PropertyChange&) void EditorRouteGroups::row_deleted (Gtk::TreeModel::Path const &) { - if (_in_rebuild) { + if (_in_rebuild || !_session || _session->deletion_in_progress()) { /* We need to ignore this in cases where we're not doing a drag-and-drop re-order. */