remove needless message from log window when a system has no ALSA-capable devices
[ardour.git] / gtk2_ardour / editor_route_groups.cc
index c52817a15aa17c878e8722b3cd1c07eebfb7578d..7bcf5008ee92492d619113520db71ef555030904 100644 (file)
 
 */
 
+#ifdef WAF_BUILD
+#include "gtk2ardour-config.h"
+#endif
+
 #include <cstdlib>
 #include <cmath>
 
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/gtk_ui.h>
 #include "ardour/route_group.h"
 
@@ -48,42 +51,36 @@ using namespace Gtk;
 using Gtkmm2ext::Keyboard;
 
 EditorRouteGroups::EditorRouteGroups (Editor* e)
-       : EditorComponent (e),
-         _menu (0),
-         _in_row_change (false)
-
+       : EditorComponent (e)
+       , _all_group_active_button (_("No Selection = All Tracks"))
+       , _in_row_change (false)
+       , _in_rebuild (false)
 {
        _model = ListStore::create (_columns);
        _display.set_model (_model);
 
-       _display.append_column (_("Name"), _columns.text);
+       int const columns = 10;
 
+       _display.append_column (_("Name"), _columns.text);
        _display.append_column (_("G"), _columns.gain);
-       _display.append_column (_("R"), _columns.record);
+       _display.append_column (_("Rel"), _columns.gain_relative);
        _display.append_column (_("M"), _columns.mute);
        _display.append_column (_("S"), _columns.solo);
+       _display.append_column (_("Rec"), _columns.record);
        _display.append_column (_("Sel"), _columns.select);
        _display.append_column (_("E"), _columns.edits);
-
+       _display.append_column (_("A"), _columns.active_state);
        _display.append_column (_("Show"), _columns.is_visible);
 
-       _display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0));
-       _display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
-       _display.get_column (2)->set_data (X_("colnum"), GUINT_TO_POINTER(2));
-       _display.get_column (3)->set_data (X_("colnum"), GUINT_TO_POINTER(3));
-       _display.get_column (4)->set_data (X_("colnum"), GUINT_TO_POINTER(4));
-       _display.get_column (5)->set_data (X_("colnum"), GUINT_TO_POINTER(5));
-       _display.get_column (6)->set_data (X_("colnum"), GUINT_TO_POINTER(6));
-       _display.get_column (7)->set_data (X_("colnum"), GUINT_TO_POINTER(7));
+       for (int i = 0; i < columns; ++i) {
+               _display.get_column (i)->set_data (X_("colnum"), GUINT_TO_POINTER(i));
+       }
 
        _display.get_column (0)->set_expand (true);
-       _display.get_column (1)->set_expand (false);
-       _display.get_column (2)->set_expand (false);
-       _display.get_column (3)->set_expand (false);
-       _display.get_column (4)->set_expand (false);
-       _display.get_column (5)->set_expand (false);
-       _display.get_column (6)->set_expand (false);
-       _display.get_column (7)->set_expand (false);
+       
+       for (int i = 1; i < columns; ++i) {
+               _display.get_column (i)->set_expand (false);
+       }
 
        _display.set_headers_visible (true);
 
@@ -92,43 +89,26 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
        CellRendererText* name_cell = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (0));
        name_cell->property_editable() = true;
        name_cell->signal_edited().connect (sigc::mem_fun (*this, &EditorRouteGroups::name_edit));
-
+       
        /* use checkbox for the active + visible columns */
-
-       CellRendererToggle* active_cell = dynamic_cast<CellRendererToggle*>(_display.get_column_cell_renderer (1));
-       active_cell->property_activatable() = true;
-       active_cell->property_radio() = false;
-
-       active_cell = dynamic_cast<CellRendererToggle*>(_display.get_column_cell_renderer (2));
-       active_cell->property_activatable() = true;
-       active_cell->property_radio() = false;
-
-       active_cell = dynamic_cast<CellRendererToggle*>(_display.get_column_cell_renderer (3));
-       active_cell->property_activatable() = true;
-       active_cell->property_radio() = false;
-
-       active_cell = dynamic_cast<CellRendererToggle*>(_display.get_column_cell_renderer (4));
-       active_cell->property_activatable() = true;
-       active_cell->property_radio() = false;
-
-       active_cell = dynamic_cast<CellRendererToggle*>(_display.get_column_cell_renderer (5));
-       active_cell->property_activatable() = true;
-       active_cell->property_radio() = false;
-
-       active_cell = dynamic_cast<CellRendererToggle*>(_display.get_column_cell_renderer (6));
-       active_cell->property_activatable() = true;
-       active_cell->property_radio() = false;
-
-       active_cell = dynamic_cast<CellRendererToggle*>(_display.get_column_cell_renderer (7));
-       active_cell->property_activatable() = true;
-       active_cell->property_radio() = false;
+       
+       for (int i = 1; i < columns; ++i) {
+               CellRendererToggle* active_cell = dynamic_cast <CellRendererToggle*> (_display.get_column_cell_renderer (i));
+               active_cell->property_activatable() = true;
+               active_cell->property_radio() = false;
+       }
 
        _model->signal_row_changed().connect (sigc::mem_fun (*this, &EditorRouteGroups::row_change));
+       /* What signal would you guess was emitted when the rows of your treeview are reordered
+          by a drag and drop?  signal_rows_reordered?  That would be far too easy.
+          No, signal_row_deleted().
+        */
+       _model->signal_row_deleted().connect (sigc::mem_fun (*this, &EditorRouteGroups::row_deleted));
 
        _display.set_name ("EditGroupList");
        _display.get_selection()->set_mode (SELECTION_SINGLE);
        _display.set_headers_visible (true);
-       _display.set_reorderable (false);
+       _display.set_reorderable (true);
        _display.set_rules_hint (true);
        _display.set_size_request (75, -1);
 
@@ -137,7 +117,6 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
 
        _display.signal_button_press_event().connect (sigc::mem_fun(*this, &EditorRouteGroups::button_press_event), false);
 
-       _display_packer = new VBox;
        HBox* button_box = manage (new HBox());
        button_box->set_homogeneous (true);
 
@@ -154,196 +133,19 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
        w->show();
        remove_button->add (*w);
 
-       add_button->signal_clicked().connect (hide_return (sigc::mem_fun (*this, &EditorRouteGroups::new_route_group)));
+       add_button->signal_clicked().connect (sigc::hide_return (sigc::mem_fun (*this, &EditorRouteGroups::run_new_group_dialog)));
        remove_button->signal_clicked().connect (sigc::mem_fun (*this, &EditorRouteGroups::remove_selected));
 
        button_box->pack_start (*add_button);
        button_box->pack_start (*remove_button);
 
-       _display_packer->pack_start (_scroller, true, true);
-       _display_packer->pack_start (*button_box, false, false);
-}
-
-
-Gtk::Menu*
-EditorRouteGroups::menu (RouteGroup* g)
-{
-       using namespace Gtk::Menu_Helpers;
-
-       delete _menu;
-
-       Menu* new_from = new Menu;
-       MenuList& f = new_from->items ();
-       f.push_back (MenuElem (_("Selection..."), sigc::mem_fun (*this, &EditorRouteGroups::new_from_selection)));
-       f.push_back (MenuElem (_("Record Enabled..."), sigc::mem_fun (*this, &EditorRouteGroups::new_from_rec_enabled)));
-       f.push_back (MenuElem (_("Soloed..."), sigc::mem_fun (*this, &EditorRouteGroups::new_from_soloed)));
-
-       _menu = new Menu;
-       _menu->set_name ("ArdourContextMenu");
-       MenuList& items = _menu->items();
-
-       items.push_back (MenuElem (_("New..."), hide_return (sigc::mem_fun(*this, &EditorRouteGroups::new_route_group))));
-       items.push_back (MenuElem (_("New From"), *new_from));
-       if (g) {
-               items.push_back (MenuElem (_("Edit..."), sigc::bind (sigc::mem_fun (*this, &EditorRouteGroups::edit), g)));
-               items.push_back (MenuElem (_("Fit to Window"), sigc::bind (sigc::mem_fun (*_editor, &Editor::fit_route_group), g)));
-               items.push_back (MenuElem (_("Subgroup"), sigc::bind (sigc::mem_fun (*this, &EditorRouteGroups::subgroup), g)));
-               items.push_back (MenuElem (_("Collect"), sigc::bind (sigc::mem_fun (*this, &EditorRouteGroups::collect), g)));
-       }
-       items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Activate All"), sigc::mem_fun(*this, &EditorRouteGroups::activate_all)));
-       items.push_back (MenuElem (_("Disable All"), sigc::mem_fun(*this, &EditorRouteGroups::disable_all)));
-
-       return _menu;
-}
-
-void
-EditorRouteGroups::subgroup (RouteGroup* g)
-{
-       g->make_subgroup ();
-}
-
-void
-EditorRouteGroups::unsubgroup (RouteGroup* g)
-{
-       g->destroy_subgroup ();
-}
-
-void
-EditorRouteGroups::activate_all ()
-{
-       _session->foreach_route_group (
-               sigc::bind (sigc::mem_fun (*this, &EditorRouteGroups::set_activation), true)
-               );
-}
-
-void
-EditorRouteGroups::disable_all ()
-{
-       _session->foreach_route_group (
-               sigc::bind (sigc::mem_fun (*this, &EditorRouteGroups::set_activation), false)
-               );
-}
-
-void
-EditorRouteGroups::set_activation (RouteGroup* g, bool a)
-{
-       g->set_active (a, this);
-}
-
-ARDOUR::RouteGroup *
-EditorRouteGroups::new_route_group () const
-{
-       RouteGroup* g = new RouteGroup (
-               *_session,
-               "",
-               RouteGroup::Active,
-               (RouteGroup::Property) (RouteGroup::Mute | RouteGroup::Solo | RouteGroup::Edit)
-               );
-
-       RouteGroupDialog d (g, Gtk::Stock::NEW);
-       int const r = d.do_run ();
-
-       if (r != Gtk::RESPONSE_OK) {
-               delete g;
-               return 0;
-       }
-       
-       _session->add_route_group (g);
-       return g;
-}
-void
-EditorRouteGroups::run_new_group_dialog (const RouteList& rl)
-{
-       RouteGroup* g = new RouteGroup (
-               *_session,
-               "",
-               RouteGroup::Active,
-               (RouteGroup::Property) (RouteGroup::Mute | RouteGroup::Solo | RouteGroup::Edit | RouteGroup::RecEnable)
-               );
-
-       RouteGroupDialog d (g, Gtk::Stock::NEW);
-       int const r = d.do_run ();
-
-       switch (r) {
-       case Gtk::RESPONSE_OK:
-       case Gtk::RESPONSE_ACCEPT:
-               _session->add_route_group (g);
-               for (RouteList::const_iterator i = rl.begin(); i != rl.end(); ++i) {
-                       g->add (*i);
-               }
-               break;
-       default:
-               delete g;
-       }
-}
-
-void
-EditorRouteGroups::new_from_selection ()
-{
-       if (_editor->get_selection().tracks.empty()) {
-               return;
-       }
-
-       RouteList rl;
-
-       for (TrackSelection::iterator i = _editor->get_selection().tracks.begin(); i != _editor->get_selection().tracks.end(); ++i) {
-               RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i);
-               if (rtv) {
-                       rl.push_back (rtv->route());
-               }
-       }
-
-       if (rl.empty()) {
-               return;
-       }
-
-       run_new_group_dialog (rl);
-}
-
-void
-EditorRouteGroups::new_from_rec_enabled ()
-{
-       RouteList rl;
-
-       for (TrackViewList::const_iterator i = _editor->get_track_views().begin(); i != _editor->get_track_views().end(); ++i) {
-               RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i);
-               if (rtv && rtv->route()->record_enabled()) {
-                       rl.push_back (rtv->route());
-               }
-       }
-
-       if (rl.empty()) {
-               return;
-       }
-
-       run_new_group_dialog (rl);
-}
-
-void
-EditorRouteGroups::new_from_soloed ()
-{
-       RouteList rl;
-
-       for (TrackViewList::const_iterator i = _editor->get_track_views().begin(); i != _editor->get_track_views().end(); ++i) {
-               RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i);
-               if (rtv && !rtv->route()->is_master() && rtv->route()->soloed()) {
-                       rl.push_back (rtv->route());
-               }
-       }
-
-       if (rl.empty()) {
-               return;
-       }
+       _all_group_active_button.show ();
 
-       run_new_group_dialog (rl);
-}
+       _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);
 
-void
-EditorRouteGroups::edit (RouteGroup* g)
-{
-       RouteGroupDialog d (g, Gtk::Stock::APPLY);
-       d.do_run ();
+       _all_group_active_button.signal_toggled().connect (sigc::mem_fun (*this, &EditorRouteGroups::all_group_toggled));
 }
 
 void
@@ -374,7 +176,7 @@ EditorRouteGroups::remove_selected ()
 void
 EditorRouteGroups::button_clicked ()
 {
-       new_route_group ();
+       run_new_group_dialog ();
 }
 
 gint
@@ -382,7 +184,7 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
 {
        TreeModel::Path path;
        TreeIter iter;
-        RouteGroup* group = 0;
+       RouteGroup* group = 0;
        TreeViewColumn* column;
        int cellx;
        int celly;
@@ -398,7 +200,7 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
        }
 
        if (Keyboard::is_context_menu_event (ev)) {
-               menu(group)->popup (1, ev->time);
+               _editor->_group_tabs->get_menu(group)->popup (1, ev->time);
                return true;
        }
 
@@ -411,7 +213,6 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
                if (Keyboard::is_edit_event (ev)) {
                        if ((iter = _model->get_iter (path))) {
                                if ((group = (*iter)[_columns.routegroup]) != 0) {
-                                       // edit_route_group (group);
 #ifdef GTKOSX
                                        _display.queue_draw();
 #endif
@@ -435,8 +236,8 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
 
        case 2:
                if ((iter = _model->get_iter (path))) {
-                       bool record = (*iter)[_columns.record];
-                       (*iter)[_columns.record] = !record;
+                       bool gain_relative = (*iter)[_columns.gain_relative];
+                       (*iter)[_columns.gain_relative] = !gain_relative;
 #ifdef GTKOSX
                        _display.queue_draw();
 #endif
@@ -467,6 +268,17 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
                break;
 
        case 5:
+               if ((iter = _model->get_iter (path))) {
+                       bool record = (*iter)[_columns.record];
+                       (*iter)[_columns.record] = !record;
+#ifdef GTKOSX
+                       _display.queue_draw();
+#endif
+                       return true;
+               }
+               break;
+
+       case 6:
                if ((iter = _model->get_iter (path))) {
                        bool select = (*iter)[_columns.select];
                        (*iter)[_columns.select] = !select;
@@ -477,7 +289,7 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
                }
                break;
 
-       case 6:
+       case 7:
                if ((iter = _model->get_iter (path))) {
                        bool edits = (*iter)[_columns.edits];
                        (*iter)[_columns.edits] = !edits;
@@ -488,10 +300,10 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
                }
                break;
 
-       case 7:
+       case 8:
                if ((iter = _model->get_iter (path))) {
-                       bool visible = (*iter)[_columns.is_visible];
-                       (*iter)[_columns.is_visible] = !visible;
+                       bool active_state = (*iter)[_columns.active_state];
+                       (*iter)[_columns.active_state] = !active_state;
 #ifdef GTKOSX
                        _display.queue_draw();
 #endif
@@ -499,6 +311,17 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
                }
                break;
 
+       case 9:
+               if ((iter = _model->get_iter (path))) {
+                       bool is_visible = (*iter)[_columns.is_visible];
+                       (*iter)[_columns.is_visible] = !is_visible;
+#ifdef GTKOSX
+                       _display.queue_draw();
+#endif
+                       return true;
+               }
+               break;
+               
        default:
                break;
        }
@@ -519,49 +342,48 @@ EditorRouteGroups::row_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel
                return;
        }
 
-       if ((*iter)[_columns.is_visible]) {
-               for (TrackViewList::const_iterator j = _editor->get_track_views().begin(); j != _editor->get_track_views().end(); ++j) {
-                       if ((*j)->route_group() == group) {
-                               _editor->_routes->show_track_in_display (**j);
-                       }
-               }
-       } else {
-               for (TrackViewList::const_iterator j = _editor->get_track_views().begin(); j != _editor->get_track_views().end(); ++j) {
-                       if ((*j)->route_group() == group) {
-                               _editor->hide_track_in_display (**j);
-                       }
-               }
-       }
-
-       group->set_property (RouteGroup::Gain, (*iter)[_columns.gain]);
-       group->set_property (RouteGroup::RecEnable, (*iter)[_columns.record]);
-       group->set_property (RouteGroup::Mute, (*iter)[_columns.mute]);
-       group->set_property (RouteGroup::Solo, (*iter)[_columns.solo]);
-       group->set_property (RouteGroup::Select, (*iter)[_columns.select]);
-       group->set_property (RouteGroup::Edit, (*iter)[_columns.edits]);
-
-       string name = (*iter)[_columns.text];
-
-       if (name != group->name()) {
-               group->set_name (name);
-       }
+       PropertyList plist;
+       plist.add (Properties::name, string ((*iter)[_columns.text]));
+       
+       bool val = (*iter)[_columns.gain];
+       plist.add (Properties::gain, val);
+       val = (*iter)[_columns.gain_relative];
+       plist.add (Properties::relative, val);
+       val = (*iter)[_columns.mute];
+       plist.add (Properties::mute, val);
+       val = (*iter)[_columns.solo];
+       plist.add (Properties::solo, val);
+       val = (*iter)[_columns.record];
+       plist.add (Properties::recenable, val);
+       val = (*iter)[_columns.select];
+       plist.add (Properties::select, val);
+       val = (*iter)[_columns.edits];
+       plist.add (Properties::edit, val);
+       val = (*iter)[_columns.active_state];
+       plist.add (Properties::route_active, val);
+
+       group->set_hidden (!(*iter)[_columns.is_visible], this);
+
+       group->apply_changes (plist);
 }
 
 void
 EditorRouteGroups::add (RouteGroup* group)
 {
-        ENSURE_GUI_THREAD (*this, &EditorRouteGroups::add, group)
+       ENSURE_GUI_THREAD (*this, &EditorRouteGroups::add, group)
        bool focus = false;
 
        TreeModel::Row row = *(_model->append());
 
+       row[_columns.gain] = group->is_gain ();
+       row[_columns.gain_relative] = group->is_relative ();
+       row[_columns.mute] = group->is_mute ();
+       row[_columns.solo] = group->is_solo ();
+       row[_columns.record] = group->is_recenable();
+       row[_columns.select] = group->is_select ();
+       row[_columns.edits] = group->is_edit ();
+       row[_columns.active_state] = group->is_route_active ();
        row[_columns.is_visible] = !group->is_hidden();
-       row[_columns.gain] = group->property(RouteGroup::Gain);
-       row[_columns.record] = group->property(RouteGroup::RecEnable);
-       row[_columns.mute] = group->property(RouteGroup::Mute);
-       row[_columns.solo] = group->property(RouteGroup::Solo);
-       row[_columns.select] = group->property(RouteGroup::Select);
-       row[_columns.edits] = group->property(RouteGroup::Edit);
 
        _in_row_change = true;
 
@@ -574,7 +396,7 @@ EditorRouteGroups::add (RouteGroup* group)
                focus = true;
        }
 
-       group->FlagsChanged.connect (flags_connection, boost::bind (&EditorRouteGroups::flags_changed, this, _1, group));
+       group->PropertyChanged.connect (_property_changed_connections, MISSING_INVALIDATOR, ui_bind (&EditorRouteGroups::property_changed, this, group, _1), gui_context());
 
        if (focus) {
                TreeViewColumn* col = _display.get_column (0);
@@ -590,54 +412,62 @@ EditorRouteGroups::add (RouteGroup* group)
 void
 EditorRouteGroups::groups_changed ()
 {
-       ENSURE_GUI_THREAD (*this, &EditorRouteGroups::groups_changed)
+       ENSURE_GUI_THREAD (*this, &EditorRouteGroups::groups_changed);
+
+       _in_rebuild = true;
 
        /* just rebuild the while thing */
 
        _model->clear ();
 
-       {
-               TreeModel::Row row;
-               row = *(_model->append());
-               row[_columns.is_visible] = true;
-               row[_columns.text] = (_("-all-"));
-               row[_columns.routegroup] = 0;
-       }
-
        if (_session) {
                _session->foreach_route_group (sigc::mem_fun (*this, &EditorRouteGroups::add));
        }
+
+       _in_rebuild = false;
 }
 
 void
-EditorRouteGroups::flags_changed (void* src, RouteGroup* group)
+EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange& change)
 {
-        ENSURE_GUI_THREAD (*this, &EditorRouteGroups::flags_changed, src, group)
-
        _in_row_change = true;
 
-        Gtk::TreeModel::Children children = _model->children();
+       Gtk::TreeModel::Children children = _model->children();
 
        for(Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) {
                if (group == (*iter)[_columns.routegroup]) {
-                       (*iter)[_columns.is_visible] = !group->is_hidden();
                        (*iter)[_columns.text] = group->name();
-                       (*iter)[_columns.gain] = group->property(RouteGroup::Gain);
-                       (*iter)[_columns.record] = group->property(RouteGroup::RecEnable);
-                       (*iter)[_columns.mute] = group->property(RouteGroup::Mute);
-                       (*iter)[_columns.solo] = group->property(RouteGroup::Solo);
-                       (*iter)[_columns.select] = group->property(RouteGroup::Select);
-                       (*iter)[_columns.edits] = group->property(RouteGroup::Edit);
+                       (*iter)[_columns.gain] = group->is_gain ();
+                       (*iter)[_columns.gain_relative] = group->is_relative ();
+                       (*iter)[_columns.mute] = group->is_mute ();
+                       (*iter)[_columns.solo] = group->is_solo ();
+                       (*iter)[_columns.record] = group->is_recenable ();
+                       (*iter)[_columns.select] = group->is_select ();
+                       (*iter)[_columns.edits] = group->is_edit ();
+                       (*iter)[_columns.active_state] = group->is_route_active ();
+                       (*iter)[_columns.is_visible] = !group->is_hidden();
                }
        }
 
        _in_row_change = false;
 
-       _editor->_group_tabs->set_dirty ();
+       if (change.contains (Properties::name) || change.contains (Properties::active)) {
+               _editor->_group_tabs->set_dirty ();
+       }
+
+       for (TrackViewList::const_iterator i = _editor->get_track_views().begin(); i != _editor->get_track_views().end(); ++i) {
+               if ((*i)->route_group() == group) {
+                       if (group->is_hidden ()) {
+                               _editor->hide_track_in_display (*i);
+                       } else {
+                               _editor->_routes->show_track_in_display (**i);
+                       }
+               }
+       }
 }
 
 void
-EditorRouteGroups::name_edit (const Glib::ustring& path, const Glib::ustring& new_text)
+EditorRouteGroups::name_edit (const std::string& path, const std::string& new_text)
 {
        RouteGroup* group;
        TreeIter iter;
@@ -665,68 +495,82 @@ EditorRouteGroups::clear ()
 void
 EditorRouteGroups::set_session (Session* s)
 {
-       EditorComponent::set_session (s);
+       SessionHandlePtr::set_session (s);
 
        if (_session) {
-               _session->route_group_added.connect (_session_connections, boost::bind (&EditorRouteGroups::add, this, _1));
-               _session->route_group_removed.connect (_session_connections, boost::bind (&EditorRouteGroups::groups_changed, this));
+
+               RouteGroup& arg (_session->all_route_group());
+
+               arg.PropertyChanged.connect (all_route_groups_changed_connection, MISSING_INVALIDATOR, ui_bind (&EditorRouteGroups::all_group_changed, this, _1), gui_context());
+
+               _session->route_group_added.connect (_session_connections, MISSING_INVALIDATOR, ui_bind (&EditorRouteGroups::add, this, _1), gui_context());
+               _session->route_group_removed.connect (
+                       _session_connections, MISSING_INVALIDATOR, boost::bind (&EditorRouteGroups::groups_changed, this), gui_context()
+                       );
+               _session->route_groups_reordered.connect (
+                       _session_connections, MISSING_INVALIDATOR, boost::bind (&EditorRouteGroups::groups_changed, this), gui_context()
+                       );
        }
 
+       PBD::PropertyChange pc;
+       pc.add (Properties::select);
+       pc.add (Properties::active);
+       all_group_changed (pc);
+
        groups_changed ();
 }
 
-struct CollectSorter {
-    bool operator () (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
-               return a->order_key (N_ ("editor")) < b->order_key (N_ ("editor"));
-       }
-};
-
-/** Collect all members of a RouteGroup so that they are together in the Editor.
- *  @param g Group to collect.
- */
 void
-EditorRouteGroups::collect (RouteGroup* g)
+EditorRouteGroups::run_new_group_dialog ()
 {
-       boost::shared_ptr<RouteList> routes = g->route_list ();
-       routes->sort (CollectSorter ());
-       int const N = routes->size ();
-
-       RouteList::iterator i = routes->begin ();
-       TrackViewList::const_iterator j = _editor->get_track_views().begin();
-
-       int diff = 0;
-       int coll = -1;
-       while (i != routes->end() && j != _editor->get_track_views().end()) {
-
-               RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*j);
-               if (rtv) {
-
-                       boost::shared_ptr<Route> r = rtv->route ();
-                       int const k = r->order_key (N_ ("editor"));
-
-                       if (*i == r) {
+       RouteList rl;
 
-                               if (coll == -1) {
-                                       coll = k;
-                                       diff = N - 1;
-                               } else {
-                                       --diff;
-                               }
+       return _editor->_group_tabs->run_new_group_dialog (rl);
+}
 
-                               r->set_order_key (N_ ("editor"), coll);
+void
+EditorRouteGroups::all_group_toggled ()
+{
+       if (_session) {
+               _session->all_route_group().set_select (_all_group_active_button.get_active());
+       }
+}
 
-                               ++coll;
-                               ++i;
+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);
+       }
+}
 
-                       } else {
+/** 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.
+ */
+void
+EditorRouteGroups::row_deleted (Gtk::TreeModel::Path const &)
+{
+       if (_in_rebuild) {
+               /* We need to ignore this in cases where we're not doing a drag-and-drop
+                  re-order.
+               */
+               return;
+       }
 
-                               r->set_order_key (N_ ("editor"), k + diff);
+       /* Re-write the session's route group list so that the new order is preserved */
 
-                       }
-               }
+       list<RouteGroup*> new_list;
 
-               ++j;
+       Gtk::TreeModel::Children children = _model->children();
+       for (Gtk::TreeModel::Children::iterator i = children.begin(); i != children.end(); ++i) {
+               new_list.push_back ((*i)[_columns.routegroup]);
        }
 
-       _editor->_routes->sync_order_keys ("");
+       _session->reorder_route_groups (new_list);
 }
+
+