Various UI tweaks.

Refactor comments dialog into Route_UI so it can be shared by tracks and strips.
Make Color and Comments selections consistent in the menus
Refine the color displays at the top of each mixer strip
Correctly color the number displays on tracks

1 files changed, 17 insertions, 0 deletions

diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index 245101f616..9c2c6618ac 100644
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -25,6 +25,8 @@
 #include "pbd/xml++.h"
 #include "pbd/signals.h"
 
+#include <gtkmm/textview.h>
+
 #include "gtkmm2ext/widget_state.h"
 
 #include "ardour/ardour.h"
@@ -51,6 +53,7 @@ namespace Gtk {
 
 class BindableToggleButton;
 class ArdourButton;
+class ArdourWindow;
 
 class RouteUI : public virtual AxisView
 {
@@ -227,7 +230,21 @@ class RouteUI : public virtual AxisView
 	 */
 	static PBD::Signal1<void, boost::shared_ptr<ARDOUR::Route> > BusSendDisplayChanged;
 
+	void comment_editor_done_editing ();
+	void setup_comment_editor ();
+	void open_comment_editor ();
+	void toggle_comment_editor ();
+
+	gint comment_key_release_handler (GdkEventKey*);
+	void comment_changed (void *src);
+	void comment_edited ();
+	bool ignore_comment_edit;
+
    protected:
+
+	ArdourWindow*  comment_window;
+	Gtk::TextView* comment_area;
+
 	PBD::ScopedConnectionList route_connections;
 	bool self_destruct;