X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Feditor_route_groups.h;h=94ab3658f3e08a2e8d97dd16d82991a3eb3fad30;hb=0bf7323df3e28f108fea525549ba2f8edbfc432d;hp=ea3a7f2b852a4a85830bc2f76849d8cb45f58111;hpb=84e10e93d148e0b81d6a84592855753339b5a617;p=ardour.git

diff --git a/gtk2_ardour/editor_route_groups.h b/gtk2_ardour/editor_route_groups.h
index ea3a7f2b85..94ab3658f3 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,36 +32,42 @@ public:
 	}
 
 	void clear ();
-        Gtk::ToggleButton& all_group_active_button() { return _all_group_active_button; }
+	Gtkmm2ext::StatefulToggleButton& 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 (gain_relative);
 			add (mute);
 			add (solo);
 			add (record);
+			add (monitoring);
 			add (select);
 			add (edits);
+			add (active_shared);
 			add (active_state);
-			add (is_visible);
 			add (routegroup);
                 }
 
+	        Gtk::TreeModelColumn<Gdk::Color> gdkcolor;
 	        Gtk::TreeModelColumn<std::string> text;
+	        Gtk::TreeModelColumn<bool> is_visible;
 		Gtk::TreeModelColumn<bool> gain;
 		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<bool> active_shared;
 		Gtk::TreeModelColumn<bool> active_state;
-	        Gtk::TreeModelColumn<bool> is_visible;
 	        Gtk::TreeModelColumn<ARDOUR::RouteGroup*> routegroup;
 	};
 
@@ -70,7 +77,7 @@ private:
 	void row_change (const Gtk::TreeModel::Path&,const Gtk::TreeModel::iterator&);
 	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 ();
@@ -84,11 +91,12 @@ private:
 	Gtk::TreeView _display;
 	Gtk::ScrolledWindow _scroller;
 	Gtk::VBox _display_packer;
-        Gtk::ToggleButton _all_group_active_button;
+        Gtkmm2ext::StatefulToggleButton _all_group_active_button;
 	bool _in_row_change;
 	bool _in_rebuild;
 	PBD::ScopedConnectionList _property_changed_connections;
 	PBD::ScopedConnection all_route_groups_changed_connection;
+	Gtk::ColorSelectionDialog color_dialog;
 };