more show() stuff, and replaced strip->show_all(); untill its actually finished

[ardour.git] / gtk2_ardour / editor_edit_groups.cc

diff --git a/gtk2_ardour/editor_edit_groups.cc b/gtk2_ardour/editor_edit_groups.cc
index e15da94f0ccbc13a2a04ecaff72c8b60bcac6006..20179f84c65b923fb0294d4555b5a90286c5b864 100644 (file)
--- a/gtk2_ardour/editor_edit_groups.cc
+++ b/gtk2_ardour/editor_edit_groups.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cstdlib>
@@ -38,6 +37,7 @@
 
 using namespace sigc;
 using namespace ARDOUR;
+using namespace PBD;
 using namespace Gtk;
 
 void
@@ -118,7 +118,7 @@ Editor::edit_group_list_button_press_event (GdkEventButton* ev)
                if (edit_group_list_menu == 0) {
                        build_edit_group_list_menu ();
                }
-               edit_group_list_menu->popup (1, 0);
+               edit_group_list_menu->popup (1, ev->time);
                return true;
        }
 
@@ -149,20 +149,20 @@ Editor::edit_group_list_button_press_event (GdkEventButton* ev)
 
        case 1:
                if ((iter = group_model->get_iter (path))) {
-                       bool visible = (*iter)[group_columns.is_visible];
-                       (*iter)[group_columns.is_visible] = !visible;
+                       bool active = (*iter)[group_columns.is_active];
+                       (*iter)[group_columns.is_active] = !active;
                        return true;
                }
                break;
-
+               
        case 2:
                if ((iter = group_model->get_iter (path))) {
-                       bool active = (*iter)[group_columns.is_active];
-                       (*iter)[group_columns.is_active] = !active;
+                       bool visible = (*iter)[group_columns.is_visible];
+                       (*iter)[group_columns.is_visible] = !visible;
                        return true;
                }
                break;
-               
+
        default:
                break;
        }
@@ -218,7 +218,10 @@ Editor::add_edit_group (RouteGroup* group)
        row[group_columns.is_active] = group->is_active();
        row[group_columns.is_visible] = !group->is_hidden();
 
+       in_edit_group_row_change = true;
+
        row[group_columns.routegroup] = group;
+
        if (!group->name().empty()) {
                row[group_columns.text] = group->name();
        } else {
@@ -233,6 +236,8 @@ Editor::add_edit_group (RouteGroup* group)
                CellRendererText* name_cell = dynamic_cast<CellRendererText*>(edit_group_display.get_column_cell_renderer (0));
                edit_group_display.set_cursor (group_model->get_path (row), *col, *name_cell, true);
        }
+
+       in_edit_group_row_change = false;
 }
 
 void
@@ -242,7 +247,6 @@ Editor::edit_groups_changed ()
 
        /* just rebuild the while thing */
 
-       edit_group_display.set_model (Glib::RefPtr<TreeModel>(0));
        group_model->clear ();
 
        {
@@ -255,7 +259,6 @@ Editor::edit_groups_changed ()
        }
 
        session->foreach_edit_group (mem_fun (*this, &Editor::add_edit_group));
-       edit_group_display.set_model (group_model);
 }
 
 void