Give group and meter point buttons controllable visibility.

[ardour.git] / gtk2_ardour / editor_route_groups.h

diff --git a/gtk2_ardour/editor_route_groups.h b/gtk2_ardour/editor_route_groups.h
index e5d583cfba69371bff0fa6241bd31a3374c22f1b..e413565e351ab85918e884dc78414eb6e778bda6 100644 (file)
--- 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,36 @@ 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 (is_visible);
+                       add (text);
                        add (gain);
-                       add (record);
+                       add (gain_relative);
                        add (mute);
                        add (solo);
+                       add (record);
                        add (select);
                        add (edits);
-                       add (text);
+                       add (active_state);
+                       add (is_visible);
                        add (routegroup);
                 }
 
-               Gtk::TreeModelColumn<bool> is_visible;
+               Gtk::TreeModelColumn<std::string> text;
                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> select;
                Gtk::TreeModelColumn<bool> edits;
-               Gtk::TreeModelColumn<std::string> text;
+               Gtk::TreeModelColumn<bool> active_state;
+               Gtk::TreeModelColumn<bool> is_visible;
                Gtk::TreeModelColumn<ARDOUR::RouteGroup*> routegroup;
        };
 
@@ -64,7 +69,7 @@ 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);
        void groups_changed ();
@@ -73,15 +78,18 @@ private:
        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;
+        Gtkmm2ext::StatefulToggleButton _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;
 };