kunterbunte Monitor-Sektion

reduce color diversity and clean up color definitions of
the monitor section: mute, solo: use mixer-colors, prefix all MS-colors
with "monitor section"

3 files changed, 28 insertions, 44 deletions

diff --git a/gtk2_ardour/dark.colors b/gtk2_ardour/dark.colors
index c78e566d99..c46d60ac0c 100644
--- a/gtk2_ardour/dark.colors
+++ b/gtk2_ardour/dark.colors
@@ -228,6 +228,7 @@
     <ColorAlias name="marker drag line" alias="color 44"/>
     <ColorAlias name="marker label" alias="color 4"/>
     <ColorAlias name="marker track" alias="color 31"/>
+    <ColorAlias name="master monitor section button: fill active" alias="color 42"/>
     <ColorAlias name="measure line bar" alias="color 13"/>
     <ColorAlias name="measure line beat" alias="color 33"/>
     <ColorAlias name="meter background bottom" alias="color 46"/>
@@ -257,9 +258,6 @@
     <ColorAlias name="midi device: led active" alias="color 17"/>
     <ColorAlias name="midi frame base" alias="color 87"/>
     <ColorAlias name="midi input button: fill active" alias="color 48"/>
-    <ColorAlias name="monitor section button: fill active" alias="color 42"/>
-    <ColorAlias name="monitor processors toggle: fill active" alias="color 42"/>
-    <ColorAlias name="monitor processors present: fill" alias="color 20"/>
     <ColorAlias name="midi input button: led active" alias="color 4"/>
     <ColorAlias name="midi meter color0" alias="color 52"/>
     <ColorAlias name="midi meter color1" alias="color 53"/>
@@ -290,33 +288,23 @@
     <ColorAlias name="mixer strip name button: led active" alias="color 8"/>
     <ColorAlias name="monitor button: fill active" alias="color 68"/>
     <ColorAlias name="monitor button: led active" alias="color 9"/>
-    <ColorAlias name="monitor knob" alias="color 60"/>
-    <ColorAlias name="monitor knob: arc end" alias="color 70"/>
-    <ColorAlias name="monitor knob: arc start" alias="color 16"/>
-    <ColorAlias name="monitor section cut: fill" alias="color 71"/>
-    <ColorAlias name="monitor section cut: fill active" alias="color 8"/>
-    <ColorAlias name="monitor section cut: led active" alias="color 37"/>
-    <ColorAlias name="monitor section dim: fill" alias="color 71"/>
-    <ColorAlias name="monitor section dim: fill active" alias="color 72"/>
-    <ColorAlias name="monitor section dim: led active" alias="color 37"/>
-    <ColorAlias name="monitor section invert: fill" alias="color 71"/>
-    <ColorAlias name="monitor section invert: fill active" alias="color 35"/>
-    <ColorAlias name="monitor section invert: led active" alias="color 37"/>
+    <ColorAlias name="monitor section knob" alias="color 60"/>
+    <ColorAlias name="monitor section knob: arc end" alias="color 70"/>
+    <ColorAlias name="monitor section knob: arc start" alias="color 16"/>
     <ColorAlias name="monitor section mono: fill" alias="color 71"/>
     <ColorAlias name="monitor section mono: fill active" alias="color 73"/>
     <ColorAlias name="monitor section mono: led active" alias="color 37"/>
+    <ColorAlias name="monitor section dim: fill" alias="color 71"/>
+    <ColorAlias name="monitor section dim: fill active" alias="color 72"/>
+    <ColorAlias name="monitor section dim: led active" alias="color 37"/>
     <ColorAlias name="monitor section solo model: fill" alias="color 71"/>
     <ColorAlias name="monitor section solo model: fill active" alias="color 42"/>
     <ColorAlias name="monitor section solo model: led active" alias="color 8"/>
-    <ColorAlias name="monitor section solo: fill" alias="color 71"/>
-    <ColorAlias name="monitor section solo: fill active" alias="color 12"/>
-    <ColorAlias name="monitor section solo: led active" alias="color 8"/>
-    <ColorAlias name="monitor solo exclusive: fill" alias="color 71"/>
-    <ColorAlias name="monitor solo exclusive: fill active" alias="color 20"/>
-    <ColorAlias name="monitor solo exclusive: led active" alias="color 8"/>
-    <ColorAlias name="monitor solo override: fill" alias="color 71"/>
-    <ColorAlias name="monitor solo override: fill active" alias="color 42"/>
-    <ColorAlias name="monitor solo override: led active" alias="color 8"/>
+    <ColorAlias name="monitor section solo option: fill" alias="color 71"/>
+    <ColorAlias name="monitor section solo option: fill active" alias="color 42"/>
+    <ColorAlias name="monitor section solo option: led active" alias="color 8"/>
+    <ColorAlias name="monitor section processors toggle: fill active" alias="color 42"/>
+    <ColorAlias name="monitor section processors present: fill" alias="color 20"/>
     <ColorAlias name="mono panner bg" alias="color 67"/>
     <ColorAlias name="mono panner fill" alias="color 74"/>
     <ColorAlias name="mono panner outline" alias="color 70"/>
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 2b21f3ef29..ebeb40b51e 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -502,7 +502,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 		if (monitor_section_button == 0) {
 			Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMonitorSection");
 			monitor_section_button = manage (new ArdourButton);
-			monitor_section_button->set_name ("monitor section button");
+			monitor_section_button->set_name ("master monitor section button");
 			monitor_section_button->set_related_action (act);
 			set_tooltip (monitor_section_button, _("Show/Hide Monitoring Section"));
 			mute_solo_table.attach (*monitor_section_button, 1, 2, 0, 1);
diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc
index 605a96464b..e508bf0909 100644
--- a/gtk2_ardour/monitor_section.cc
+++ b/gtk2_ardour/monitor_section.cc
@@ -166,7 +166,7 @@ MonitorSection::MonitorSection (Session* s)
 
 	/* Solo option buttons */
 	exclusive_solo_button.set_text (_("Excl. Solo"));
-	exclusive_solo_button.set_name (X_("monitor solo exclusive"));
+	exclusive_solo_button.set_name (X_("monitor section solo option"));
 	set_tooltip (&exclusive_solo_button, _("Exclusive solo means that only 1 solo is active at a time"));
 
 	act = ActionManager::get_action (X_("Monitor"), X_("toggle-exclusive-solo"));
@@ -175,7 +175,7 @@ MonitorSection::MonitorSection (Session* s)
 	}
 
 	solo_mute_override_button.set_text (_("Solo » Mute"));
-	solo_mute_override_button.set_name (X_("monitor solo override"));
+	solo_mute_override_button.set_name (X_("monitor section solo option"));
 	set_tooltip (&solo_mute_override_button, _("If enabled, solo will override mute\n(a soloed & muted track or bus will be audible)"));
 
 	act = ActionManager::get_action (X_("Monitor"), X_("toggle-mute-overrides-solo"));
@@ -185,7 +185,7 @@ MonitorSection::MonitorSection (Session* s)
 
 	/* Processor Box hide/shos */
 	toggle_processorbox_button.set_text (_("Processors"));
-	toggle_processorbox_button.set_name (X_("monitor processors toggle"));
+	toggle_processorbox_button.set_name (X_("monitor section processors toggle"));
 	set_tooltip (&toggle_processorbox_button, _("Allow to add monitor effect processors"));
 
 	proctoggle = ToggleAction::create ();
@@ -200,12 +200,11 @@ MonitorSection::MonitorSection (Session* s)
 	/* Solo Boost Knob */
 
 	solo_boost_control = new ArdourKnob ();
-	solo_boost_control->set_name("monitor knob");
+	solo_boost_control->set_name("monitor section knob");
 	solo_boost_control->set_size_request (PX_SCALE(36), PX_SCALE(36));
 	set_tooltip (*solo_boost_control, _("Gain increase for soloed signals (0dB is normal)"));
 
 	solo_boost_display = new ArdourDisplay ();
-	solo_boost_display->set_name("monitor section cut");
 	solo_boost_display->set_size_request (PX_SCALE(68), PX_SCALE(20));
 	solo_boost_display->add_controllable_preset(_("0 dB"), 0.0);
 	solo_boost_display->add_controllable_preset(_("3 dB"), 3.0);
@@ -217,12 +216,12 @@ MonitorSection::MonitorSection (Session* s)
 	/* Solo (SiP) cut */
 
 	solo_cut_control = new ArdourKnob ();
-	solo_cut_control->set_name ("monitor knob");
+	solo_cut_control->set_name ("monitor section knob");
 	solo_cut_control->set_size_request (PX_SCALE(36), PX_SCALE(36));
 	set_tooltip (*solo_cut_control, _("Gain reduction non-soloed signals\nA value above -inf dB causes \"solo-in-front\""));
 
 	solo_cut_display = new ArdourDisplay ();
-	solo_cut_display->set_name("monitor section cut");
+	solo_cut_display->set_name("monitor section dropdown"); // XXX
 	solo_cut_display->set_size_request (PX_SCALE(68), PX_SCALE(20));
 	solo_cut_display->add_controllable_preset(_("0 dB"), 0.0);
 	solo_cut_display->add_controllable_preset(_("-6 dB"), -6.0);
@@ -235,12 +234,11 @@ MonitorSection::MonitorSection (Session* s)
 	/* Dim */
 
 	dim_control = new ArdourKnob (ArdourKnob::default_elements, ArdourKnob::Detent);
-	dim_control->set_name ("monitor knob");
+	dim_control->set_name ("monitor section knob");
 	dim_control->set_size_request (PX_SCALE(36), PX_SCALE(36));
 	set_tooltip (*dim_control, _("Gain reduction to use when dimming monitor outputs"));
 
 	dim_display = new ArdourDisplay ();
-	dim_display->set_name("monitor section cut");
 	dim_display->set_size_request (PX_SCALE(68), PX_SCALE(20));
 	dim_display->add_controllable_preset(_("0 dB"), 0.0);
 	dim_display->add_controllable_preset(_("-3 dB"), -3.0);
@@ -252,8 +250,7 @@ MonitorSection::MonitorSection (Session* s)
 
 	// mute button
 	cut_all_button.set_text (_("Mute"));
-	cut_all_button.set_name ("monitor section cut");
-	cut_all_button.set_name (X_("monitor section cut"));
+	cut_all_button.set_name ("mute button");
 	cut_all_button.set_size_request (-1, PX_SCALE(30));
 	cut_all_button.show ();
 
@@ -283,11 +280,10 @@ MonitorSection::MonitorSection (Session* s)
 	/* Gain */
 
 	gain_control = new ArdourKnob (ArdourKnob::default_elements, ArdourKnob::Detent);
-	gain_control->set_name("monitor knob");
+	gain_control->set_name("monitor section knob");
 	gain_control->set_size_request (PX_SCALE(60), PX_SCALE(60));
 
 	gain_display = new ArdourDisplay ();
-	gain_display->set_name("monitor section cut");
 	gain_display->set_size_request (PX_SCALE(68), PX_SCALE(20));
 	gain_display->add_controllable_preset(_("0 dB"), 0.0);
 	gain_display->add_controllable_preset(_("-3 dB"), -3.0);
@@ -301,7 +297,7 @@ MonitorSection::MonitorSection (Session* s)
 
 	output_button = new ArdourButton ();
 	output_button->set_text (_("Output"));
-	output_button->set_name (X_("monitor section cut"));
+	output_button->set_name (X_("monitor section cut")); // XXX
 	output_button->set_text_ellipsize (Pango::ELLIPSIZE_MIDDLE);
 	output_button->set_layout_ellipsize_width (PX_SCALE(128) * PANGO_SCALE);
 
@@ -518,9 +514,9 @@ MonitorSection::update_processor_box ()
 	bool show_processor_box = proctoggle->get_active ();
 
 	if (count_processors () > 0 && !show_processor_box) {
-		toggle_processorbox_button.set_name (X_("monitor processors present"));
+		toggle_processorbox_button.set_name (X_("monitor section processors present"));
 	} else {
-		toggle_processorbox_button.set_name (X_("monitor processors toggle"));
+		toggle_processorbox_button.set_name (X_("monitor section processors toggle"));
 	}
 
 	if (insert_box->is_visible() == show_processor_box) {
@@ -626,10 +622,10 @@ MonitorSection::set_session (Session* s)
 
 MonitorSection::ChannelButtonSet::ChannelButtonSet ()
 {
-	cut.set_name (X_("monitor section cut"));
+	cut.set_name (X_("mute button"));
 	dim.set_name (X_("monitor section dim"));
-	solo.set_name (X_("monitor section solo"));
-	invert.set_name (X_("monitor section invert"));
+	solo.set_name (X_("solo button"));
+	invert.set_name (X_("invert button"));
 
 	cut.unset_flags (Gtk::CAN_FOCUS);
 	dim.unset_flags (Gtk::CAN_FOCUS);