From 1526735d7925bf07f7a6c3378a87bf559e11050a Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 26 Aug 2010 23:25:44 +0000 Subject: some (unfinished) work on incorporating Ben's rev 6919 changes regarding track selection; make newly selected tracks show the current range selection; fix crashes related to meter display; remove "all" group from main group tab display and just put it down in its own button (totally incomplete); minor cleanups git-svn-id: svn://localhost/ardour2/branches/3.0@7696 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor_route_groups.cc | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'gtk2_ardour/editor_route_groups.cc') diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc index 2f9f27ae2c..d4ab4542ea 100644 --- a/gtk2_ardour/editor_route_groups.cc +++ b/gtk2_ardour/editor_route_groups.cc @@ -47,8 +47,9 @@ using namespace Gtk; using Gtkmm2ext::Keyboard; EditorRouteGroups::EditorRouteGroups (Editor* e) - : EditorComponent (e), - _in_row_change (false) + : EditorComponent (e) + , _all_group_active_button (_("\"all\" group")) + , _in_row_change (false) { _model = ListStore::create (_columns); @@ -135,7 +136,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); @@ -158,8 +158,11 @@ EditorRouteGroups::EditorRouteGroups (Editor* e) 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); + _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); } void @@ -418,14 +421,6 @@ EditorRouteGroups::groups_changed () _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)); } -- cgit v1.2.3