X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_route_groups.h;h=504082305222d711c7b6c4b15ad27959bf63e4b2;hb=a083dbcd959209e1f4b722f6a0c600bcf6450483;hp=e413565e351ab85918e884dc78414eb6e778bda6;hpb=3f6ec53ba3f30d4dc8ceeb0b44752eec0d4a2d21;p=ardour.git

diff --git a/gtk2_ardour/editor_route_groups.h b/gtk2_ardour/editor_route_groups.h
index e413565e35..5040823052 100644
--- a/gtk2_ardour/editor_route_groups.h
+++ b/gtk2_ardour/editor_route_groups.h
@@ -32,36 +32,39 @@ public:
 	}
 
 	void clear ();
-	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;
 	};
 
@@ -71,13 +74,11 @@ 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 ();
 	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;
@@ -85,11 +86,11 @@ private:
 	Gtk::TreeView _display;
 	Gtk::ScrolledWindow _scroller;
 	Gtk::VBox _display_packer;
-        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;
 };