update selection clock

[ardour.git] / gtk2_ardour / editor_route_groups.cc

diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc
index 5d01ef207f5405d9a91a281dad649fcb77ea9d2e..dbf717308292d3cbbd2253027004ccf6ac6a4ed8 100644 (file)
--- a/gtk2_ardour/editor_route_groups.cc
+++ b/gtk2_ardour/editor_route_groups.cc
@@ -51,6 +51,7 @@
 
 using namespace std;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtk;
 using Gtkmm2ext::Keyboard;
@@ -63,7 +64,6 @@ struct ColumnInfo {
 
 EditorRouteGroups::EditorRouteGroups (Editor* e)
        : EditorComponent (e)
-       , _all_group_active_button (_("No Selection = All Tracks?"))
        , _in_row_change (false)
        , _in_rebuild (false)
 {
@@ -187,15 +187,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
@@ -204,7 +197,7 @@ EditorRouteGroups::remove_selected ()
        Glib::RefPtr<TreeSelection> selection = _display.get_selection();
        TreeView::Selection::ListHandle_Path rows = selection->get_selected_rows ();
 
-       if (rows.empty()) {
+       if (rows.empty() || _session->deletion_in_progress()) {
                return;
        }
 
@@ -279,7 +272,6 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
                case RESPONSE_ACCEPT:
                        c = color_dialog.get_colorsel()->get_current_color();
                        GroupTabs::set_group_color (group, gdk_color_to_rgba (c));
-                       ARDOUR_UI::config()->set_dirty ();
                        break;
                        
                default:
@@ -480,6 +472,7 @@ EditorRouteGroups::groups_changed ()
 void
 EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange&)
 {
+       assert(group);
        _in_row_change = true;
 
        Gtk::TreeModel::Children children = _model->children();
@@ -558,10 +551,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()
@@ -574,7 +563,6 @@ EditorRouteGroups::set_session (Session* s)
        PBD::PropertyChange pc;
        pc.add (Properties::select);
        pc.add (Properties::active);
-       all_group_changed (pc);
 
        groups_changed ();
 }
@@ -587,25 +575,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.
@@ -613,7 +582,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.
                */