X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Feditor_route_groups.h;h=504082305222d711c7b6c4b15ad27959bf63e4b2;hb=01d99870ffdefa1a76093c95250f355db11609d1;hp=e5d583cfba69371bff0fa6241bd31a3374c22f1b;hpb=6e8a5fa13598bfb2b76a673b431b98fa94cbdebe;p=ardour.git

diff --git a/gtk2_ardour/editor_route_groups.h b/gtk2_ardour/editor_route_groups.h
index e5d583cfba..5040823052 100644
--- a/gtk2_ardour/editor_route_groups.h
+++ b/gtk2_ardour/editor_route_groups.h
@@ -17,6 +17,7 @@
 
 */
 
+#include "gtkmm2ext/stateful_button.h"
 #include "editor_component.h"
 
 class EditorRouteGroups : public EditorComponent, public ARDOUR::SessionHandlePtr
@@ -31,32 +32,39 @@ public:
 	}
 
 	void clear ();
-        Gtk::ToggleButton& all_group_active_button() { return _all_group_active_button; }
 
 private:
 
         struct Columns : public Gtk::TreeModel::ColumnRecord {
 
                 Columns () {
+			add (gdkcolor);
+			add (text);
 			add (is_visible);
 			add (gain);
-			add (record);
+			add (gain_relative);
 			add (mute);
 			add (solo);
+			add (record);
+			add (monitoring);
 			add (select);
-			add (edits);
-			add (text);
+			add (active_shared);
+			add (active_state);
 			add (routegroup);
                 }
 
+	        Gtk::TreeModelColumn<Gdk::Color> gdkcolor;
+	        Gtk::TreeModelColumn<std::string> text;
 	        Gtk::TreeModelColumn<bool> is_visible;
 		Gtk::TreeModelColumn<bool> gain;
-		Gtk::TreeModelColumn<bool> record;
+		Gtk::TreeModelColumn<bool> gain_relative;
 		Gtk::TreeModelColumn<bool> mute;
 		Gtk::TreeModelColumn<bool> solo;
+		Gtk::TreeModelColumn<bool> record;
+		Gtk::TreeModelColumn<bool> monitoring;
 		Gtk::TreeModelColumn<bool> select;
-		Gtk::TreeModelColumn<bool> edits;
-	        Gtk::TreeModelColumn<std::string> text;
+		Gtk::TreeModelColumn<bool> active_shared;
+		Gtk::TreeModelColumn<bool> active_state;
 	        Gtk::TreeModelColumn<ARDOUR::RouteGroup*> routegroup;
 	};
 
@@ -64,24 +72,25 @@ private:
 
 	void add (ARDOUR::RouteGroup *);
 	void row_change (const Gtk::TreeModel::Path&,const Gtk::TreeModel::iterator&);
-	void name_edit (const Glib::ustring&, const Glib::ustring&);
+	void name_edit (const std::string&, const std::string&);
 	void button_clicked ();
-	gint button_press_event (GdkEventButton* ev);
+	bool button_press_event (GdkEventButton* ev);
 	void groups_changed ();
 	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;
 	Glib::RefPtr<Gtk::TreeSelection> _selection;
 	Gtk::TreeView _display;
 	Gtk::ScrolledWindow _scroller;
 	Gtk::VBox _display_packer;
-        Gtk::ToggleButton _all_group_active_button;
 	bool _in_row_change;
-	PBD::ScopedConnection property_changed_connection;
+	bool _in_rebuild;
+	PBD::ScopedConnectionList _property_changed_connections;
+	PBD::ScopedConnection all_route_groups_changed_connection;
+	Gtk::ColorSelectionDialog color_dialog;
 };