remove all_group_active_button. if you want to operate on all tracks, choose select...

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 9aff7083e04d05890e4a7eeee450940723ad3afa..e489f39103d909271fa9abbd0bb91928c29a9db8 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -4548,13 +4548,6 @@ Editor::get_regions_from_selection_and_edit_point ()
        if ( regions.empty() ) {
                TrackViewList tracks = selection->tracks;
 
-               if (_route_groups->all_group_active_button().get_active() && tracks.empty()) {
-                       /* tracks is empty (no track selected), and 'No Selection = All Tracks'
-                        * is enabled, so consider all tracks
-                        */
-                       tracks = track_views; 
-               }
-
                if (!tracks.empty()) {
                        /* no region selected or entered, but some selected tracks:
                         * act on all regions on the selected tracks at the edit point

diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc
index d74ba50d64bca7f8cb9045c9e6fae80fc5eb2bf6..377e58ccf8f986c9e4a972e2e5a2915c607a2c2d 100644 (file)
--- a/gtk2_ardour/editor_route_groups.cc
+++ b/gtk2_ardour/editor_route_groups.cc
@@ -64,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)
 {
@@ -188,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
@@ -561,8 +553,6 @@ EditorRouteGroups::set_session (Session* s)
 
                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()
@@ -575,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 ();
 }
@@ -588,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.

diff --git a/gtk2_ardour/editor_route_groups.h b/gtk2_ardour/editor_route_groups.h
index 42061ff089a743141f0e9f2abf87411052652136..504082305222d711c7b6c4b15ad27959bf63e4b2 100644 (file)
--- a/gtk2_ardour/editor_route_groups.h
+++ b/gtk2_ardour/editor_route_groups.h
@@ -32,7 +32,6 @@ public:
        }
 
        void clear ();
-       Gtkmm2ext::StatefulToggleButton& all_group_active_button() { return _all_group_active_button; }
 
 private:
 
@@ -80,8 +79,6 @@ private:
        void property_changed (ARDOUR::RouteGroup*, const PBD::PropertyChange &);
        void remove_selected ();
        void run_new_group_dialog ();
-        void all_group_toggled();
-        void all_group_changed (const PBD::PropertyChange&);
        void row_deleted (Gtk::TreeModel::Path const &);
 
        Glib::RefPtr<Gtk::ListStore> _model;
@@ -89,7 +86,6 @@ private:
        Gtk::TreeView _display;
        Gtk::ScrolledWindow _scroller;
        Gtk::VBox _display_packer;
-        Gtkmm2ext::StatefulToggleButton _all_group_active_button;
        bool _in_row_change;
        bool _in_rebuild;
        PBD::ScopedConnectionList _property_changed_connections;