extra track header buttons are now ArdourButtons

git-svn-id: svn://localhost/ardour2/branches/3.0@10550 d708f5d6-7413-0410-9779-e7cbd77b26cf

6 files changed, 36 insertions, 20 deletions

diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf
index f0a6e225d1..34708bf772 100644
--- a/gtk2_ardour/ardour3_ui_default.conf
+++ b/gtk2_ardour/ardour3_ui_default.conf
@@ -607,21 +607,37 @@
     <Option name="mouse mode button: text" value="c7c7d8ff"/>
     <Option name="mouse mode button: text active" value="000000ff"/>
     <Option name="mouse mode button: text mid" value="000000ff"/>
-    <Option name="zoom button: border start" value="32baaeff"/>
-    <Option name="zoom button: border end" value="268e85ff"/>
+    <Option name="zoom button: border start" value="b7b7d2ff"/>
+    <Option name="zoom button: border end" value="000000ff"/>
     <Option name="zoom button: border start selected" value="9a908eff"/>
     <Option name="zoom button: border end selected" value="675c5bff"/>
-    <Option name="zoom button: fill start" value="216b84ff"/>
-    <Option name="zoom button: fill end" value="13404fff"/>
-    <Option name="zoom button: fill start active" value="3fceffff"/>
-    <Option name="zoom button: fill end active" value="27809eff"/>
+    <Option name="zoom button: fill start" value="5d5856ff"/>
+    <Option name="zoom button: fill end" value="564d48ff"/>
+    <Option name="zoom button: fill start active" value="4d4d4dff"/>
+    <Option name="zoom button: fill end active" value="121212ff"/>
     <Option name="zoom button: fill start mid" value="5d5856ff"/>
     <Option name="zoom button: fill end mid" value="564d48ff"/>
     <Option name="zoom button: led" value="4f3300ff"/>
     <Option name="zoom button: led active" value="ffa500ff"/>
     <Option name="zoom button: led mid" value="b87700ff"/>
     <Option name="zoom button: text" value="c7c7d8ff"/>
-    <Option name="zoom button: text active" value="000000ff"/>
+    <Option name="zoom button: text active" value="c8c8d9ff"/>
     <Option name="zoom button: text mid" value="000000ff"/>
+    <Option name="route button: border start" value="b7b7d2ff"/>
+    <Option name="route button: border end" value="000000ff"/>
+    <Option name="route button: border start selected" value="9a908eff"/>
+    <Option name="route button: border end selected" value="675c5bff"/>
+    <Option name="route button: fill start" value="5d5856ff"/>
+    <Option name="route button: fill end" value="564d48ff"/>
+    <Option name="route button: fill start active" value="4d4d4dff"/>
+    <Option name="route button: fill end active" value="121212ff"/>
+    <Option name="route button: fill start mid" value="5d5856ff"/>
+    <Option name="route button: fill end mid" value="564d48ff"/>
+    <Option name="route button: led" value="4f3300ff"/>
+    <Option name="route button: led active" value="ffa500ff"/>
+    <Option name="route button: led mid" value="b87700ff"/>
+    <Option name="route button: text" value="c7c7d8ff"/>
+    <Option name="route button: text active" value="c8c8d9ff"/>
+    <Option name="route button: text mid" value="000000ff"/>
   </Canvas>
 </Ardour>
diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc
index 5f6e1f8dc0..3b5539c18b 100644
--- a/gtk2_ardour/ardour_button.cc
+++ b/gtk2_ardour/ardour_button.cc
@@ -473,6 +473,8 @@ ArdourButton::on_button_release_event (GdkEventButton *ev)
 		unset_active_state ();
 	}
 
+	signal_clicked ();
+
 	if (_act_on_release) {
 		if (_action) {
 			Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (_action);
diff --git a/gtk2_ardour/ardour_button.h b/gtk2_ardour/ardour_button.h
index 892c98cbff..8da31a1066 100644
--- a/gtk2_ardour/ardour_button.h
+++ b/gtk2_ardour/ardour_button.h
@@ -78,6 +78,7 @@ class ArdourButton : public CairoWidget
 	void set_distinct_led_click (bool yn);
 
 	sigc::signal<void> signal_led_clicked;
+	sigc::signal<void> signal_clicked;
 
 	boost::shared_ptr<PBD::Controllable> get_controllable() { return binding_proxy.get_controllable(); }
  	void set_controllable (boost::shared_ptr<PBD::Controllable> c);
diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index ac0fb81bdd..06ae244816 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -186,4 +186,5 @@ BUTTON_VARS(PluginBypassButton, "plugin bypass button")
 BUTTON_VARS(PunchButton, "punch button")
 BUTTON_VARS(MouseModeButton, "mouse mode button")
 BUTTON_VARS(ZoomButton, "zoom button")
+BUTTON_VARS(RouteButton, "route button")
 
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 6933429766..a19ec1339f 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -159,17 +159,13 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 
 	ignore_toggle = false;
 
-	route_group_button.set_name ("TrackGroupButton");
-	playlist_button.set_name ("TrackPlaylistButton");
-	automation_button.set_name ("TrackAutomationButton");
-
-	route_group_button.unset_flags (Gtk::CAN_FOCUS);
-	playlist_button.unset_flags (Gtk::CAN_FOCUS);
-	automation_button.unset_flags (Gtk::CAN_FOCUS);
+	route_group_button.set_name ("route button");
+	playlist_button.set_name ("route button");
+	automation_button.set_name ("route button");
 
  	route_group_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::route_group_click), false);
-	playlist_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::playlist_click));
-	automation_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::automation_click));
+	playlist_button.signal_clicked.connect (sigc::mem_fun(*this, &RouteTimeAxisView::playlist_click));
+	automation_button.signal_clicked.connect (sigc::mem_fun(*this, &RouteTimeAxisView::automation_click));
 
 	if (is_track()) {
 
diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index 6ace603538..da64b23498 100644
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -38,6 +38,7 @@
 #include "ardour/playlist.h"
 #include "ardour/types.h"
 
+#include "ardour_button.h"
 #include "ardour_dialog.h"
 #include "route_ui.h"
 #include "enums.h"
@@ -254,10 +255,9 @@ protected:
 
 	Gtk::HBox   other_button_hbox;
 	Gtk::Table  button_table;
-	Gtk::Button processor_button;
-	Gtk::Button route_group_button;
-	Gtk::Button playlist_button;
-	Gtk::Button automation_button;
+	ArdourButton route_group_button;
+	ArdourButton playlist_button;
+	ArdourButton automation_button;
 
 	Gtk::Menu           subplugin_menu;
 	Gtk::Menu*          automation_action_menu;