diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-08-30 09:48:53 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-08-30 09:48:53 +0000 |
| commit | 7d32cf3813b7145b98c86b59867092e04aa2621a (patch) | |
| tree | dbb2d319f55e2c287b51a7071a236dadd6d83ca3 /gtk2_ardour/group_tabs.h | |
| parent | 9b7ae4cccc8507bc3e74e909b738a5b87a2b717b (diff) | |
Give route groups their own colour, settable from the route
group dialogue. Americanise spelling of color in a few
places to avoid confusion. Fixes #4224. Addresses parts
of #2650 and #4064.
git-svn-id: svn://localhost/ardour2/branches/3.0@10030 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/group_tabs.h')
| -rw-r--r-- | gtk2_ardour/group_tabs.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gtk2_ardour/group_tabs.h b/gtk2_ardour/group_tabs.h index 7362067251..ed4a24709f 100644 --- a/gtk2_ardour/group_tabs.h +++ b/gtk2_ardour/group_tabs.h @@ -28,7 +28,7 @@ namespace ARDOUR { class Editor; -/** Parent class for tabs which represent route groups as coloured tabs; +/** Parent class for tabs which represent route groups as colored tabs; * Currently used on the left-hand side of the editor and at the top of the mixer. */ class GroupTabs : public CairoWidget, public ARDOUR::SessionHandlePtr @@ -46,6 +46,10 @@ public: void run_new_group_dialog (ARDOUR::RouteList const &); + static void set_group_color (ARDOUR::RouteGroup *, Gdk::Color); + static std::string group_gui_id (ARDOUR::RouteGroup *); + static Gdk::Color group_color (ARDOUR::RouteGroup *); + protected: struct Tab { @@ -53,7 +57,7 @@ protected: double from; double to; - Gdk::Color colour; ///< colour + Gdk::Color color; ///< color ARDOUR::RouteGroup* group; ///< route group }; @@ -117,4 +121,7 @@ private: double _drag_min; ///< minimum position for drag double _drag_max; ///< maximum position for drag double _drag_first; ///< first mouse pointer position during drag + + /** colors that have been used for new route group tabs */ + static std::list<Gdk::Color> _used_colors; }; |