more theming and layout tweaks. new faders that pre-light. fixed some spacing around mixer buttons. tweaked some colors (returned mutes to yellow). removed group button at bottom of mixer strip and replaced it with fader automation mode.

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

10 files changed, 102 insertions, 54 deletions

diff --git a/gtk2_ardour/ardour3_ui_dark.rc.in b/gtk2_ardour/ardour3_ui_dark.rc.in
index 33360fb568..2288c11ca8 100644
--- a/gtk2_ardour/ardour3_ui_dark.rc.in
+++ b/gtk2_ardour/ardour3_ui_dark.rc.in
@@ -201,7 +201,7 @@ style "default" = "medium_text"
 
 style "track_controls_inactive" 
 {
-	bg[NORMAL] =      { 0.60, 0.60, 0.66 }
+	bg[NORMAL] =      { 0.60, 0.20, 0.26 }
 	bg[ACTIVE] =      { 0.60, 0.60, 0.66 }
 	bg[INSENSITIVE] = { 0.60, 0.60, 0.66 }
 	bg[SELECTED] =    { 0.60, 0.60, 0.66 }
diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf
index f74f293fea..4a4518104d 100644
--- a/gtk2_ardour/ardour3_ui_default.conf
+++ b/gtk2_ardour/ardour3_ui_default.conf
@@ -149,8 +149,8 @@
     <Option name="button border" value="000000f0"/>
     <Option name="processor prefader: fill start" value="873c3cff"/>
     <Option name="processor prefader: fill end" value="542525ff"/>
-    <Option name="processor prefader: fill start active" value="873c3cff"/>
-    <Option name="processor prefader: fill end active" value="542525ff"/>
+    <Option name="processor prefader: fill start active" value="774c4cff"/>
+    <Option name="processor prefader: fill end active" value="603535ff"/>
     <Option name="processor prefader: led" value="26550eff"/>
     <Option name="processor prefader: led active" value="78cb4eff"/>
     <Option name="processor prefader: text" value="aaaaa3ff"/>
@@ -158,15 +158,15 @@
     <Option name="processor fader: fill start" value="5d90b0ff"/>
     <Option name="processor fader: fill end" value="154c6eff"/>
     <Option name="processor fader: fill start active" value="5d90b0ff"/>
-    <Option name="processor fader: fill end active" value="154d6fff"/>
+    <Option name="processor fader: fill end active" value="256d8fff"/>
     <Option name="processor fader: led" value="26550eff"/>
     <Option name="processor fader: led active" value="78cb4eff"/>
     <Option name="processor fader: text" value="aaaaa3ff"/>
     <Option name="processor fader: text active" value="eeeeecff"/>
-    <Option name="processor postfader: fill start" value="415947ff"/>
-    <Option name="processor postfader: fill end" value="202d23ff"/>
-    <Option name="processor postfader: fill start active" value="415947ff"/>
-    <Option name="processor postfader: fill end active" value="202d23ff"/>
+    <Option name="processor postfader: fill start" value="354537ff"/>
+    <Option name="processor postfader: fill end" value="202823ff"/>
+    <Option name="processor postfader: fill start active" value="466452ff"/>
+    <Option name="processor postfader: fill end active" value="254528ff"/>
     <Option name="processor postfader: led" value="26550eff"/>
     <Option name="processor postfader: led active" value="78cb4eff"/>
     <Option name="processor postfader: text" value="aaaaa3ff"/>
@@ -180,7 +180,7 @@
     <Option name="processor control button: text" value="ffffffff"/>
     <Option name="processor control button: text active" value="ffffffff"/>
     <Option name="monitor button: fill start" value="5f5a58ff"/>
-    <Option name="monitor button: fill end" value="3f3a38ff"/>
+    <Option name="monitor button: fill end" value="4f4a48ff"/>
     <Option name="monitor button: fill start active" value="553500ff"/>
     <Option name="monitor button: fill end active" value="e58505ff"/>
     <Option name="monitor button: led" value="660000ff"/>
@@ -204,7 +204,7 @@
     <Option name="solo safe: text" value="c7c7d8ff"/>
     <Option name="solo safe: text active" value="c8c8d9ff"/>
     <Option name="monitor section cut: fill start" value="5f5a58ff"/>
-    <Option name="monitor section cut: fill end" value="3f3a38ff"/>
+    <Option name="monitor section cut: fill end" value="4f4a48ff"/>
     <Option name="monitor section cut: fill start active" value="5f4943ff"/>
     <Option name="monitor section cut: fill end active" value="ffa500ff"/>
     <Option name="monitor section cut: led" value="473812ff"/>
@@ -212,14 +212,14 @@
     <Option name="monitor section cut: text" value="c7c7d8ff"/>
     <Option name="monitor section cut: text active" value="000000ff"/>
     <Option name="monitor section dim: fill start" value="5f5a58ff"/>
-    <Option name="monitor section dim: fill end" value="3f3a38ff"/>
+    <Option name="monitor section dim: fill end" value="4f4a48ff"/>
     <Option name="monitor section dim: fill start active" value="553500ff"/>
     <Option name="monitor section dim: fill end active" value="e58505ff"/>
     <Option name="monitor section dim: led active" value="78cb4eff"/>
     <Option name="monitor section dim: text" value="c8c8d9ff"/>
     <Option name="monitor section dim: text active" value="c8c8d9ff"/>
     <Option name="monitor section solo: fill start" value="5f5a58ff"/>
-    <Option name="monitor section solo: fill end" value="3f3a38ff"/>
+    <Option name="monitor section solo: fill end" value="4f4a48ff"/>
     <Option name="monitor section solo: fill start active" value="104506ff"/>
     <Option name="monitor section solo: fill end active" value="4dbb00ff"/>
     <Option name="monitor section solo: led" value="473812ff"/>
@@ -227,7 +227,7 @@
     <Option name="monitor section solo: text" value="00000000"/>
     <Option name="monitor section solo: text active" value="00000000"/>
     <Option name="monitor section invert: fill start" value="5f5a58ff"/>
-    <Option name="monitor section invert: fill end" value="3f3a38ff"/>
+    <Option name="monitor section invert: fill end" value="4f4a48ff"/>
     <Option name="monitor section invert: fill start active" value="222260ff"/>
     <Option name="monitor section invert: fill end active" value="4242d0ff"/>
     <Option name="monitor section invert: led" value="473812ff"/>
@@ -235,7 +235,7 @@
     <Option name="monitor section invert: text" value="00000000"/>
     <Option name="monitor section invert: text active" value="00000000"/>
     <Option name="monitor section mono: fill start" value="5f5a58ff"/>
-    <Option name="monitor section mono: fill end" value="3f3a38ff"/>
+    <Option name="monitor section mono: fill end" value="4f4a48ff"/>
     <Option name="monitor section mono: fill start active" value="222260ff"/>
     <Option name="monitor section mono: fill end active" value="3232c0ff"/>
     <Option name="monitor section mono: led" value="473812ff"/>
@@ -301,10 +301,10 @@
     <Option name="mute button: fill start" value="565659ff"/>
     <Option name="mute button: fill end" value="484853ff"/>
     <Option name="mute button: fill start active" value="5f4943ff"/>
-    <Option name="mute button: fill end active" value="ffa500ff"/>
+    <Option name="mute button: fill end active" value="ffff00ff"/>
     <Option name="mute button: led" value="00000000"/>
     <Option name="mute button: led active" value="00000000"/>
-    <Option name="mute button: text" value="bfbfbfff"/>
+    <Option name="mute button: text" value="bfbfafff"/>
     <Option name="mute button: text active" value="191919ff"/>
     <Option name="solo button: fill start" value="565659ff"/>
     <Option name="solo button: fill end" value="484853ff"/>
@@ -312,7 +312,7 @@
     <Option name="solo button: fill end active" value="4dbb00ff"/>
     <Option name="solo button: led" value="00000000"/>
     <Option name="solo button: led active" value="00000000"/>
-    <Option name="solo button: text" value="bfbfbfff"/>
+    <Option name="solo button: text" value="afbfafff"/>
     <Option name="solo button: text active" value="191919ff"/>
     <Option name="invert button: fill start" value="565659ff"/>
     <Option name="invert button: fill end" value="484853ff"/>
@@ -408,8 +408,8 @@
     <Option name="route button: fill end active" value="121212ff"/>
     <Option name="route button: led" value="4f3300ff"/>
     <Option name="route button: led active" value="ffa500ff"/>
-    <Option name="route button: text" value="c7c7d8ff"/>
-    <Option name="route button: text active" value="c8c8d9ff"/>
+    <Option name="route button: text" value="bfbfbfff"/>
+    <Option name="route button: text active" value="191919ff"/>
     <Option name="mixer strip button: fill start" value="565659ff"/>
     <Option name="mixer strip button: fill end" value="484853ff"/>
     <Option name="mixer strip button: fill start active" value="5f4943ff"/>
diff --git a/gtk2_ardour/ardour3_widget_list.rc b/gtk2_ardour/ardour3_widget_list.rc
index 63d402aca1..f969af002c 100644
--- a/gtk2_ardour/ardour3_widget_list.rc
+++ b/gtk2_ardour/ardour3_widget_list.rc
@@ -224,6 +224,7 @@ widget "*ParameterValueDisplay" style:highest "medium_bold_entry"
 widget "*PluginUIClickBox" style:highest "medium_bold_entry"
 widget "*PluginUIClickBox*" style:highest "medium_bold_entry"
 widget "*PluginSlider" style:highest "plugin_slider"
+widget "*GainFader" style:highest "plugin_slider"
 widget "*MixerTrackCommentArea" style:highest "option_entry"
 widget "*MixerPanZone" style:highest "pan_zone"
 widget "*LHSList" style:highest "treeview_display"
diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index bb9b0cf8d9..8561fbbfb5 100644
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -79,7 +79,7 @@ EditorRegions::EditorRegions (Editor* e)
 {
 	_display.set_size_request (100, -1);
 	_display.set_rules_hint (true);
-	_display.set_name ("LHSList");
+	_display.set_name ("EditGroupList");
 
 	/* Try to prevent single mouse presses from initiating edits.
 	   This relies on a hack in gtktreeview.c:gtk_treeview_button_press()
diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc
index e1a8bc6450..fb2e67a47b 100644
--- a/gtk2_ardour/editor_routes.cc
+++ b/gtk2_ardour/editor_routes.cc
@@ -223,7 +223,7 @@ EditorRoutes::EditorRoutes (Editor* e)
 	_display.get_selection()->set_mode (SELECTION_SINGLE);
 	_display.get_selection()->set_select_function (sigc::mem_fun (*this, &EditorRoutes::selection_filter));
 	_display.set_reorderable (true);
-	_display.set_name (X_("LHSList"));
+	_display.set_name (X_("EditGroupList"));
 	_display.set_rules_hint (true);
 	_display.set_size_request (100, -1);
 	_display.add_object_drag (_columns.route.index(), "routes");
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index fbfd769e1e..54519546d0 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -135,8 +135,8 @@ GainMeterBase::GainMeterBase (Session* s,
 	peak_display.set_label (_("-inf"));
 	peak_display.unset_flags (Gtk::CAN_FOCUS);
 
-	gain_automation_style_button.set_name ("MixerAutomationModeButton");
-	gain_automation_state_button.set_name ("MixerAutomationPlaybackButton");
+	gain_automation_style_button.set_name ("mixer strip button");
+	gain_automation_state_button.set_name ("mixer strip button");
 
 	ARDOUR_UI::instance()->set_tip (gain_automation_state_button, _("Fader automation mode"));
 	ARDOUR_UI::instance()->set_tip (gain_automation_style_button, _("Fader automation type"));
@@ -163,6 +163,16 @@ GainMeterBase::GainMeterBase (Session* s,
 	UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &GainMeterBase::on_theme_changed));
 	ColorsChanged.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), false));
 	DPIReset.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), true));
+	
+//	PBD::ScopedConnection _config_connection;
+//	Config->ParameterChanged.connect ( _config_connection, MISSING_INVALIDATOR, boost::bind(&GainMeterBase::set_flat_buttons, this, _1), gui_context() );
+}
+
+void
+GainMeterBase::set_flat_buttons ()
+{
+printf("set_flat_butt\n");
+//	gain_slider->set_flat_buttons( ARDOUR_UI::config()->flat_buttons.get() );
 }
 
 GainMeterBase::~GainMeterBase ()
@@ -771,10 +781,10 @@ GainMeterBase::gain_automation_style_changed ()
 {
 	switch (_width) {
 	case Wide:
-		gain_automation_style_button.set_label (astyle_string(_amp->gain_control()->alist()->automation_style()));
+		gain_automation_style_button.set_text (astyle_string(_amp->gain_control()->alist()->automation_style()));
 		break;
 	case Narrow:
-		gain_automation_style_button.set_label  (short_astyle_string(_amp->gain_control()->alist()->automation_style()));
+		gain_automation_style_button.set_text  (short_astyle_string(_amp->gain_control()->alist()->automation_style()));
 		break;
 	}
 }
@@ -788,10 +798,10 @@ GainMeterBase::gain_automation_state_changed ()
 
 	switch (_width) {
 	case Wide:
-		gain_automation_state_button.set_label (astate_string(_amp->gain_control()->alist()->automation_state()));
+		gain_automation_state_button.set_text (astate_string(_amp->gain_control()->alist()->automation_state()));
 		break;
 	case Narrow:
-		gain_automation_state_button.set_label (short_astate_string(_amp->gain_control()->alist()->automation_state()));
+		gain_automation_state_button.set_text (short_astate_string(_amp->gain_control()->alist()->automation_state()));
 		break;
 	}
 
@@ -861,13 +871,13 @@ GainMeter::GainMeter (Session* s, int fader_length)
 	, gain_display_box(true, 0)
 	, hbox(true, 2)
 {
-	gain_display_box.pack_start (gain_display, true, true);
+//	gain_display_box.pack_start (gain_display, true, true);
 
 	meter_metric_area.set_name ("AudioTrackMetrics");
 	set_size_request_to_display_given_text (meter_metric_area, "-127", 0, 0);
 
-	gain_automation_style_button.set_name ("MixerAutomationModeButton");
-	gain_automation_state_button.set_name ("MixerAutomationPlaybackButton");
+	gain_automation_style_button.set_name ("mixer strip button");
+	gain_automation_state_button.set_name ("mixer strip button");
 
 	ARDOUR_UI::instance()->set_tip (gain_automation_state_button, _("Fader automation mode"));
 	ARDOUR_UI::instance()->set_tip (gain_automation_style_button, _("Fader automation type"));
@@ -908,13 +918,13 @@ GainMeter::set_controls (boost::shared_ptr<Route> r,
 		hbox.remove (meter_alignment);
 	}
 
-	if (peak_display.get_parent()) {
-		gain_display_box.remove (peak_display);
-	}
+//	if (peak_display.get_parent()) {
+//		gain_display_box.remove (peak_display);
+//	}
 
-	if (gain_automation_state_button.get_parent()) {
-		fader_vbox->remove (gain_automation_state_button);
-	}
+//	if (gain_automation_state_button.get_parent()) {
+//		fader_vbox->remove (gain_automation_state_button);
+//	}
 
 	GainMeterBase::set_controls (r, meter, amp);
 
@@ -932,12 +942,12 @@ GainMeter::set_controls (boost::shared_ptr<Route> r,
 	   pack some route-dependent stuff.
 	*/
 
-	gain_display_box.pack_end (peak_display, true, true);
+//	gain_display_box.pack_end (peak_display, true, true);
 	hbox.pack_start (meter_alignment, true, true);
 
-	if (r && !r->is_hidden()) {
-		fader_vbox->pack_start (gain_automation_state_button, false, false, 0);
-	}
+//	if (r && !r->is_hidden()) {
+//		fader_vbox->pack_start (gain_automation_state_button, false, false, 0);
+//	}
 
 	setup_meters ();
 	hbox.show_all ();
diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index 4536bb691b..73144380dd 100644
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -38,6 +38,8 @@
 #include "ardour/types.h"
 #include "ardour/session_handle.h"
 
+#include "ardour_button.h"
+
 #include "gtkmm2ext/click_box.h"
 #include "gtkmm2ext/focus_entry.h"
 #include "gtkmm2ext/slider_controller.h"
@@ -81,6 +83,8 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
 	void set_meter_strip_name (const char * name);
 	void set_fader_name (const char * name);
 
+	void set_flat_buttons ();
+
 	virtual void setup_meters (int len=0);
 
 	boost::shared_ptr<PBD::Controllable> get_controllable();
@@ -114,8 +118,8 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
 
 	sigc::connection gain_watching;
 
-	Gtk::Button gain_automation_style_button;
-	Gtk::ToggleButton gain_automation_state_button;
+	ArdourButton gain_automation_style_button;
+	ArdourButton gain_automation_state_button;
 
 	Gtk::Menu gain_astate_menu;
 	Gtk::Menu gain_astyle_menu;
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 0e0bf893a0..5c6df5fa1d 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -242,7 +242,8 @@ MixerStrip::init ()
 
 	bottom_button_table.set_spacings (2);
 	bottom_button_table.set_homogeneous (true);
-	bottom_button_table.attach (group_button, 0, 1, 0, 1);
+//	bottom_button_table.attach (group_button, 0, 1, 0, 1);
+	bottom_button_table.attach (gpm.gain_automation_state_button, 0, 1, 0, 1);
 
 	name_button.set_name ("mixer strip button");
 	name_button.set_text (" "); /* non empty text, forces creation of the layout */
@@ -399,6 +400,14 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 
 	revert_to_default_display ();
 
+	if (gpm.gain_display.get_parent()) {
+		middle_button_table.remove (gpm.gain_display);
+	}
+
+	if (gpm.peak_display.get_parent()) {
+		middle_button_table.remove (gpm.peak_display);
+	}
+
 	if (solo_button->get_parent()) {
 		middle_button_table.remove (*solo_button);
 	}
@@ -538,6 +547,8 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 	}
 
 	gpm.reset_peak_display ();
+	gpm.gain_display.show ();
+	gpm.peak_display.show ();
 
 	width_button.show();
 	width_hide_box.show();
@@ -554,6 +565,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 	name_button.show();
 	_comment_button.show();
 	group_button.show();
+	gpm.gain_automation_state_button.show();
 
 	parameter_changed ("mixer-strip-visibility");
 
@@ -593,14 +605,24 @@ MixerStrip::set_width_enum (Width w, void* owner)
 
 	switch (w) {
 	case Wide:
+		if (!gpm.peak_display.get_parent()) {
+			middle_button_table.attach (gpm.peak_display,1,2,1,2);
+		}
+		if (gpm.gain_display.get_parent()) {
+			middle_button_table.remove (gpm.gain_display);
+		}
+		if (!gpm.gain_display.get_parent()) {
+			middle_button_table.attach (gpm.gain_display,0,1,1,2);
+		}
+
 		if (show_sends_button)  {
 			show_sends_button->set_text (_("Aux\nSends"));
 			show_sends_button->layout()->set_alignment (Pango::ALIGN_CENTER);
 		}
 
-		((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (
+		gpm.gain_automation_style_button.set_text (
 				gpm.astyle_string(gain_automation->automation_style()));
-		((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (
+		gpm.gain_automation_state_button.set_text (
 				gpm.astate_string(gain_automation->automation_state()));
 
 		if (_route->panner()) {
@@ -618,6 +640,17 @@ MixerStrip::set_width_enum (Width w, void* owner)
 		break;
 
 	case Narrow:
+		if (gpm.peak_display.get_parent()) {
+			middle_button_table.remove (gpm.peak_display);
+		}
+
+		if (gpm.gain_display.get_parent()) {
+			middle_button_table.remove (gpm.gain_display);
+		}
+		if (!gpm.gain_display.get_parent()) {
+			middle_button_table.attach (gpm.gain_display,0,2,1,2);
+		}
+
 		if (show_sends_button) {
 			show_sends_button->set_text (_("Snd"));
 		}
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 560c37bb1d..fc39115c33 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -123,7 +123,7 @@ Mixer_UI::Mixer_UI ()
 	group_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
 	group_display.get_column (0)->set_expand(true);
 	group_display.get_column (1)->set_expand(false);
-	group_display.set_name ("LHSList");
+	group_display.set_name ("EditGroupList");
 	group_display.get_selection()->set_mode (Gtk::SELECTION_SINGLE);
 	group_display.set_reorderable (true);
 	group_display.set_headers_visible (true);
@@ -1791,7 +1791,7 @@ Mixer_UI::setup_track_display ()
 	track_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
 	track_display.get_column (0)->set_expand(true);
 	track_display.get_column (1)->set_expand(false);
-	track_display.set_name (X_("LHSList"));
+	track_display.set_name (X_("EditGroupList"));
 	track_display.get_selection()->set_mode (Gtk::SELECTION_NONE);
 	track_display.set_reorderable (true);
 	track_display.set_headers_visible (true);
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 3ba36ea6aa..0fbbd83470 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -117,7 +117,7 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, Canvas& c
 	, playlist_action_menu (0)
 	, mode_menu (0)
 	, color_mode_menu (0)
-	, gm (sess, slider, slider_desensitised, true, 115)
+	, gm (sess, slider, slider_desensitised, true, 125)
 	, _ignore_set_layer_display (false)
 {
 }
@@ -205,11 +205,11 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
         }
 
 	controls_table.attach (route_group_button, 7, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-	Gtk::VBox* pad = manage (new Gtk::VBox);
-	pad->pack_start (gm.get_gain_slider(), false, false);
-	pad->pack_start (*manage (new Gtk::Label), true, true);
-	pad->show_all ();
-	controls_table.attach (*pad, 0, 5, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+//	Gtk::VBox* pad = manage (new Gtk::VBox);
+//	pad->pack_start (gm.get_gain_slider(), false, false);
+//	pad->pack_start (*manage (new Gtk::Label), true, true);
+//	pad->show_all ();
+	controls_table.attach (gm.get_gain_slider(), 0, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 3, 0);
 
 	ARDOUR_UI::instance()->set_tip(*solo_button,_("Solo"));
 	ARDOUR_UI::instance()->set_tip(*mute_button,_("Mute"));
@@ -261,7 +261,7 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 	route_group_menu = new RouteGroupMenu (_session, plist);
 
 	gm.get_gain_slider().signal_scroll_event().connect(sigc::mem_fun(*this, &RouteTimeAxisView::controls_ebox_scroll), false);
-	gm.get_gain_slider().set_name ("TrackGainFader");
+	gm.get_gain_slider().set_name ("GainFader");
 
 	gm.get_level_meter().signal_scroll_event().connect (sigc::mem_fun (*this, &RouteTimeAxisView::controls_ebox_scroll), false);