X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_route_groups.cc;h=bdbbb5d908f6c921c249e2fd1dc02513d901fe88;hb=c46cd91d0eca0e060d3efed5162c8a5205567274;hp=98a38b9b004507704ab428bf0e4bad1cddba75d4;hpb=1d42ed077e555a83a93bac436547e7c378ee0c00;p=ardour.git

diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc
index 98a38b9b00..bdbbb5d908 100644
--- a/gtk2_ardour/editor_route_groups.cc
+++ b/gtk2_ardour/editor_route_groups.cc
@@ -26,9 +26,13 @@
 
 #include "fix_carbon.h"
 
+#include <gtkmm/stock.h>
+
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/cell_renderer_color_selector.h"
 
+#include "widgets/tooltips.h"
+
 #include "ardour/route_group.h"
 #include "ardour/route.h"
 #include "ardour/session.h"
@@ -41,26 +45,25 @@
 #include "gui_thread.h"
 #include "keyboard.h"
 #include "marker.h"
-#include "prompter.h"
 #include "route_group_dialog.h"
 #include "route_time_axis.h"
 #include "time_axis_view.h"
-#include "tooltips.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;
+using namespace ArdourWidgets;
 using namespace PBD;
 using namespace Gtk;
 using Gtkmm2ext::Keyboard;
 
 struct ColumnInfo {
-    int         index;
-    const char* label;
-    const char* tooltip;
+	int         index;
+	const char* label;
+	const char* tooltip;
 };
 
 EditorRouteGroups::EditorRouteGroups (Editor* e)
@@ -75,7 +78,7 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
 	TreeViewColumn* color_column = manage (new TreeViewColumn ("", *color_renderer));
 
 	color_column->add_attribute (color_renderer->property_color(), _columns.gdkcolor);
-	
+
 	_display.append_column (*color_column);
 
 	_display.append_column ("", _columns.text);
@@ -138,7 +141,7 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
 	CellRendererText* name_cell = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (1));
 	name_cell->property_editable() = true;
 	name_cell->signal_edited().connect (sigc::mem_fun (*this, &EditorRouteGroups::name_edit));
-	
+
 	for (int i = 1; ci[i].index >= 0; ++i) {
 		CellRendererToggle* active_cell = dynamic_cast <CellRendererToggle*> (_display.get_column_cell_renderer (i));
 
@@ -244,12 +247,12 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
 
 	if (iter) {
 		group = (*iter)[_columns.routegroup];
-	} 
+	}
 
 	if (Keyboard::is_context_menu_event (ev)) {
 		_editor->_group_tabs->get_menu(group)->popup (1, ev->time);
 		return true;
-	} 
+	}
 
 	if (!p) {
 		/* cancel selection */
@@ -262,7 +265,7 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
 	group = (*iter)[_columns.routegroup];
 
 	switch (GPOINTER_TO_UINT (column->get_data (X_("colnum")))) {
-	case 0: 
+	case 0:
 		c =  (*iter)[_columns.gdkcolor];
 		color_dialog.get_colorsel()->set_previous_color (c);
 		color_dialog.get_colorsel()->set_current_color (c);
@@ -274,10 +277,10 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
 			c = color_dialog.get_colorsel()->get_current_color();
 			GroupTabs::set_group_color (group, gdk_color_to_rgba (c));
 			break;
-			
+
 		default:
 			break;
-			
+
 		}
 
 		color_dialog.hide ();
@@ -301,7 +304,7 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
 		ret = true;
 		break;
 
-		
+
 	case 3:
 		val = (*iter)[_columns.active_state];
 		group->set_active (!val, this);
@@ -380,21 +383,22 @@ EditorRouteGroups::row_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel
 	plist.add (Properties::name, string ((*iter)[_columns.text]));
 
 	bool val = (*iter)[_columns.gain];
-	plist.add (Properties::gain, val);
+	plist.add (Properties::group_gain, val);
 	val = (*iter)[_columns.gain_relative];
-	plist.add (Properties::relative, val);
+	plist.add (Properties::group_relative, val);
 	val = (*iter)[_columns.mute];
-	plist.add (Properties::mute, val);
+	plist.add (Properties::group_mute, val);
 	val = (*iter)[_columns.solo];
-	plist.add (Properties::solo, val);
+	plist.add (Properties::group_solo, val);
 	val = (*iter)[_columns.record];
-	plist.add (Properties::recenable, val);
+	plist.add (Properties::group_recenable, val);
 	val = (*iter)[_columns.monitoring];
-	plist.add (Properties::monitoring, val);
+	plist.add (Properties::group_monitoring, val);
 	val = (*iter)[_columns.select];
-	plist.add (Properties::select, val);
+	plist.add (Properties::group_select, val);
 	val = (*iter)[_columns.active_shared];
-	plist.add (Properties::route_active, val);
+	plist.add (Properties::group_route_active, val);
+
 	val = (*iter)[_columns.active_state];
 	plist.add (Properties::active, val);
 	val = (*iter)[_columns.is_visible];
@@ -423,11 +427,11 @@ EditorRouteGroups::add (RouteGroup* group)
 	row[_columns.active_shared] = group->is_route_active ();
 	row[_columns.active_state] = group->is_active ();
 	row[_columns.is_visible] = !group->is_hidden();
-	
+
 	Gdk::Color c;
 	set_color_from_rgba (c, GroupTabs::group_color (group));
 	row[_columns.gdkcolor] = c;
-	
+
 	_in_row_change = true;
 
 	row[_columns.routegroup] = group;
@@ -505,7 +509,7 @@ EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange&)
 			break;
 		}
 	}
-	
+
 	_in_row_change = false;
 
 	for (TrackViewList::const_iterator i = _editor->get_track_views().begin(); i != _editor->get_track_views().end(); ++i) {
@@ -562,7 +566,7 @@ EditorRouteGroups::set_session (Session* s)
 	}
 
 	PBD::PropertyChange pc;
-	pc.add (Properties::select);
+	pc.add (Properties::group_select);
 	pc.add (Properties::active);
 
 	groups_changed ();
@@ -571,9 +575,7 @@ EditorRouteGroups::set_session (Session* s)
 void
 EditorRouteGroups::run_new_group_dialog ()
 {
-	RouteList rl;
-
-	return _editor->_group_tabs->run_new_group_dialog (rl);
+	return _editor->_group_tabs->run_new_group_dialog (0, false);
 }
 
 /** Called when a model row is deleted, but also when the model is