projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
packaging tweaks for OS X
[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 40effb61c8293b43e390808a86a926523483a60d..94ab3658f3e08a2e8d97dd16d82991a3eb3fad30 100644
(file)
--- a/
gtk2_ardour/editor_route_groups.h
+++ b/
gtk2_ardour/editor_route_groups.h
@@
-39,7
+39,9
@@
private:
struct Columns : public Gtk::TreeModel::ColumnRecord {
Columns () {
struct Columns : public Gtk::TreeModel::ColumnRecord {
Columns () {
+ add (gdkcolor);
add (text);
add (text);
+ add (is_visible);
add (gain);
add (gain_relative);
add (mute);
add (gain);
add (gain_relative);
add (mute);
@@
-48,12
+50,14
@@
private:
add (monitoring);
add (select);
add (edits);
add (monitoring);
add (select);
add (edits);
+ add (active_shared);
add (active_state);
add (active_state);
- add (is_visible);
add (routegroup);
}
add (routegroup);
}
+ Gtk::TreeModelColumn<Gdk::Color> gdkcolor;
Gtk::TreeModelColumn<std::string> text;
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> gain;
Gtk::TreeModelColumn<bool> gain_relative;
Gtk::TreeModelColumn<bool> mute;
@@
-62,8
+66,8
@@
private:
Gtk::TreeModelColumn<bool> monitoring;
Gtk::TreeModelColumn<bool> select;
Gtk::TreeModelColumn<bool> edits;
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> active_state;
- Gtk::TreeModelColumn<bool> is_visible;
Gtk::TreeModelColumn<ARDOUR::RouteGroup*> routegroup;
};
Gtk::TreeModelColumn<ARDOUR::RouteGroup*> routegroup;
};
@@
-92,6
+96,7
@@
private:
bool _in_rebuild;
PBD::ScopedConnectionList _property_changed_connections;
PBD::ScopedConnection all_route_groups_changed_connection;
bool _in_rebuild;
PBD::ScopedConnectionList _property_changed_connections;
PBD::ScopedConnection all_route_groups_changed_connection;
+ Gtk::ColorSelectionDialog color_dialog;
};
};