From 1a458c74a090e7e867d20aba435ebfa71c969aae Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Thu, 10 Jul 2014 00:35:55 +0300
Subject: [PATCH] [Summary] Improving FADER per Igor's request

---
 gtk2_ardour/ui/mixer_gain_meter.xml |   4 +-
 gtk2_ardour/ui/mixer_strip.xml      | 312 ++++++++++++++--------------
 2 files changed, 161 insertions(+), 155 deletions(-)

diff --git a/gtk2_ardour/ui/mixer_gain_meter.xml b/gtk2_ardour/ui/mixer_gain_meter.xml
index c231036c76..77cb984ed2 100644
--- a/gtk2_ardour/ui/mixer_gain_meter.xml
+++ b/gtk2_ardour/ui/mixer_gain_meter.xml
@@ -21,9 +21,11 @@
           width="17"
           height="187"/>
     <icon source="mixer_strip_meter_marks.png" x="22" y="18"/>
-    <Fader id="gain_slider" bgnormal="#380000" bgactive="#6A0000"
+    <Fader id="gain_slider" bgnormal="#303030" bgactive="#545454"
            adjustment="gain_adjustment"
            facesource="slider_controller_fader.png"
+           activefacesource="slider_controller_active_fader.png"
+           underlaysource="slider_controller_fader_underlay.png"
            handlesource="slider_controller_fader_handle.png"
            activehandlesource="slider_controller_fader_handle.png"
            minposx="10"
diff --git a/gtk2_ardour/ui/mixer_strip.xml b/gtk2_ardour/ui/mixer_strip.xml
index a035f814ac..fb1c5f24df 100644
--- a/gtk2_ardour/ui/mixer_strip.xml
+++ b/gtk2_ardour/ui/mixer_strip.xml
@@ -1,162 +1,166 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <RouteUI>
-  <VBox>
-    <EventBox id="color_palette_home" borderwidth="1" visible="false">
-      <VBox>
-        <iconbutton id="color_palette_button"
-                    width="95"
-                    height="17"
-                    normalicon="inspector_color_close"
-                    activeicon="inspector_color_open"/>
-        <VBox id="color_buttons_home">
-          <HBox>
-            <iconbutton id="color_button_1"
-                        width="19"
-                        height="19"
-                        normalicon="inspector_color_1"
-                        activeicon="inspector_color_1_active"
-                        prelighticon="inspector_color_1_prelight"/>
-            <iconbutton id="color_button_2"
-                        width="19"
-                        height="19"
-                        normalicon="inspector_color_2"
-                        activeicon="inspector_color_2_active"
-                        prelighticon="inspector_color_2_prelight"/>
-            <iconbutton id="color_button_3"
-                        width="19"
-                        height="19"
-                        normalicon="inspector_color_3"
-                        activeicon="inspector_color_3_active"
-                        prelighticon="inspector_color_3_prelight"/>
-            <iconbutton id="color_button_4"
-                        width="19"
-                        height="19"
-                        normalicon="inspector_color_4"
-                        activeicon="inspector_color_4_active"
-                        prelighticon="inspector_color_4_prelight"/>
-            <iconbutton id="color_button_5"
-                        width="19"
-                        height="19"
-                        normalicon="inspector_color_5"
-                        activeicon="inspector_color_5_active"
-                        prelighticon="inspector_color_5_prelight"/>
-          </HBox>
-          <HBox>
-            <iconbutton id="color_button_6"
-                        width="19"
-                        height="19"
-                        normalicon="inspector_color_6"
-                        activeicon="inspector_color_6_active"
-                        prelighticon="inspector_color_6_prelight"/>
-            <iconbutton id="color_button_7"
-                        width="19"
-                        height="19"
-                        normalicon="inspector_color_7"
-                        activeicon="inspector_color_7_active"
-                        prelighticon="inspector_color_7_prelight"/>
-            <iconbutton id="color_button_8"
-                        width="19"
-                        height="19"
-                        normalicon="inspector_color_8"
-                        activeicon="inspector_color_8_active"
-                        prelighticon="inspector_color_8_prelight"/>
-            <iconbutton id="color_button_9"
-                        width="19"
-                        height="19"
-                        normalicon="inspector_color_9"
-                        activeicon="inspector_color_9_active"
-                        prelighticon="inspector_color_9_prelight"/>
-            <iconbutton id="color_button_10"
-                        width="19"
-                        height="19"
-                        normalicon="inspector_color_10"
-                        activeicon="inspector_color_10_active"
-                        prelighticon="inspector_color_10_prelight"/>
-          </HBox>
-          <HBox>
-            <iconbutton id="color_button_11"
-                        width="19"
-                        height="19"
-                        normalicon="inspector_color_11"
-                        activeicon="inspector_color_11_active"
-                        prelighticon="inspector_color_11_prelight"/>
-            <iconbutton id="color_button_12"
-                        width="19"
-                        height="19"
-                        normalicon="inspector_color_12"
-                        activeicon="inspector_color_12_active"
-                        prelighticon="inspector_color_12_prelight"/>
-            <iconbutton id="color_button_13"
-                        width="19"
-                        height="19"
-                        normalicon="inspector_color_13"
-                        activeicon="inspector_color_13_active"
-                        prelighticon="inspector_color_13_prelight"/>
-            <iconbutton id="color_button_14"
-                        width="19"
-                        height="19"
-                        normalicon="inspector_color_14"
-                        activeicon="inspector_color_14_active"
-                        prelighticon="inspector_color_14_prelight"/>
-            <iconbutton id="color_button_15"
-                        width="19"
-                        height="19"
-                        normalicon="inspector_color_15"
-                        activeicon="inspector_color_15_active"
-                        prelighticon="inspector_color_15_prelight"/>
-          </HBox>
-        </VBox>
-      </VBox>
-    </EventBox>
-    <VBox box.pack="end">
-      <EventBox id="panners_home" width="57" height="60"/>
-      <HBox id="level_meter_home"/>
-      <Vbox>
-        <HBox id="gain_meter_home"/>
-        <!--RouteUI-->
-        <HBox id="invert_button_box" visible="false"/>
-        <EventBox bgnormal="#000000" width="50">
-          <VBox borderwidth="1" spacing="1">
-            <HBox spacing="1">
-              <iconbutton id="rec_enable_button"
-                          width="28"
-                          height="20"
-                          normalicon="mixer_record"
-                          activeicon="mixer_record_active"
-                          prelighticon="mixer_record_prelight"/>
-              <iconbutton id="monitor_input_button"
-                          width="28"
-                          height="20"
-                          normalicon="mixer_monitor_input"
-                          activeicon="mixer_monitor_input_active"
-                          prelighticon="mixer_monitor_input_prelight"/>
+  <EventBox bgnormal="#383838" bgactive="#545454">
+    <VBox>
+      <EventBox id="color_palette_home" borderwidth="1" visible="false">
+        <VBox>
+          <iconbutton id="color_palette_button"
+                      width="95"
+                      height="17"
+                      normalicon="inspector_color_close"
+                      activeicon="inspector_color_open"/>
+          <VBox id="color_buttons_home">
+            <HBox>
+              <iconbutton id="color_button_1"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_1"
+                          activeicon="inspector_color_1_active"
+                          prelighticon="inspector_color_1_prelight"/>
+              <iconbutton id="color_button_2"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_2"
+                          activeicon="inspector_color_2_active"
+                          prelighticon="inspector_color_2_prelight"/>
+              <iconbutton id="color_button_3"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_3"
+                          activeicon="inspector_color_3_active"
+                          prelighticon="inspector_color_3_prelight"/>
+              <iconbutton id="color_button_4"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_4"
+                          activeicon="inspector_color_4_active"
+                          prelighticon="inspector_color_4_prelight"/>
+              <iconbutton id="color_button_5"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_5"
+                          activeicon="inspector_color_5_active"
+                          prelighticon="inspector_color_5_prelight"/>
             </HBox>
-            <HBox spacing="1">
-              <iconbutton id="mute_button"
-                          width="28"
-                          height="20"
-                          normalicon="mixer_mute"
-                          activeicon="mixer_mute_active"
-                          prelighticon="mixer_mute_prelight"/>
-              <iconbutton id="solo_button"
-                          width="28"
-                          height="20"
-                          normalicon="mixer_solo"
-                          activeicon="mixer_solo_active"
-                          prelighticon="mixer_solo_prelight"/>
+            <HBox>
+              <iconbutton id="color_button_6"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_6"
+                          activeicon="inspector_color_6_active"
+                          prelighticon="inspector_color_6_prelight"/>
+              <iconbutton id="color_button_7"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_7"
+                          activeicon="inspector_color_7_active"
+                          prelighticon="inspector_color_7_prelight"/>
+              <iconbutton id="color_button_8"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_8"
+                          activeicon="inspector_color_8_active"
+                          prelighticon="inspector_color_8_prelight"/>
+              <iconbutton id="color_button_9"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_9"
+                          activeicon="inspector_color_9_active"
+                          prelighticon="inspector_color_9_prelight"/>
+              <iconbutton id="color_button_10"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_10"
+                          activeicon="inspector_color_10_active"
+                          prelighticon="inspector_color_10_prelight"/>
+            </HBox>
+            <HBox>
+              <iconbutton id="color_button_11"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_11"
+                          activeicon="inspector_color_11_active"
+                          prelighticon="inspector_color_11_prelight"/>
+              <iconbutton id="color_button_12"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_12"
+                          activeicon="inspector_color_12_active"
+                          prelighticon="inspector_color_12_prelight"/>
+              <iconbutton id="color_button_13"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_13"
+                          activeicon="inspector_color_13_active"
+                          prelighticon="inspector_color_13_prelight"/>
+              <iconbutton id="color_button_14"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_14"
+                          activeicon="inspector_color_14_active"
+                          prelighticon="inspector_color_14_prelight"/>
+              <iconbutton id="color_button_15"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_15"
+                          activeicon="inspector_color_15_active"
+                          prelighticon="inspector_color_15_prelight"/>
             </HBox>
-            <Button id="name_button"
-                    width="57"
-                    height="28"/>
           </VBox>
-        </EventBox>
-        <Button id="show_sends_button"  visible="false" noshowall="true"/>
-        <Button id="monitor_disk_button"  visible="false" noshowall="true"/>
-        <Button id="comment_button"  visible="false" noshowall="true"/>
-        <Button id="midi_input_enable_button"  visible="false" noshowall="true"/>
-        <Button id="group_button" text="Grp" visible="false" noshowall="true"/>
-      </Vbox>
+        </VBox>
+      </EventBox>
+      <VBox box.pack="end">
+        <EventBox id="panners_home" bgnormal="#383838" bgactive="#545454" width="57" height="60"/>
+        <HBox id="level_meter_home"/>
+        <Vbox>
+          <HBox id="gain_meter_home"/>
+          <!--RouteUI-->
+          <HBox id="invert_button_box" visible="false"/>
+          <EventBox bgnormal="#000000" width="50">
+            <EventBox borderwidth="1" bgnormal="#383838" bgactive="#545454">
+              <VBox spacing="1">
+                <HBox spacing="1">
+                  <iconbutton id="rec_enable_button"
+                              width="28"
+                              height="20"
+                              normalicon="mixer_record"
+                              activeicon="mixer_record_active"
+                              prelighticon="mixer_record_prelight"/>
+                  <iconbutton id="monitor_input_button"
+                              width="28"
+                              height="20"
+                              normalicon="mixer_monitor_input"
+                              activeicon="mixer_monitor_input_active"
+                              prelighticon="mixer_monitor_input_prelight"/>
+                </HBox>
+                <HBox spacing="1">
+                  <iconbutton id="mute_button"
+                              width="28"
+                              height="20"
+                              normalicon="mixer_mute"
+                              activeicon="mixer_mute_active"
+                              prelighticon="mixer_mute_prelight"/>
+                  <iconbutton id="solo_button"
+                              width="28"
+                              height="20"
+                              normalicon="mixer_solo"
+                              activeicon="mixer_solo_active"
+                              prelighticon="mixer_solo_prelight"/>
+                </HBox>
+                <Button id="name_button"
+                        width="57"
+                        height="28"/>
+              </VBox>
+            </EventBox>
+          </EventBox>
+          <Button id="show_sends_button"  visible="false" noshowall="true"/>
+          <Button id="monitor_disk_button"  visible="false" noshowall="true"/>
+          <Button id="comment_button"  visible="false" noshowall="true"/>
+          <Button id="midi_input_enable_button"  visible="false" noshowall="true"/>
+          <Button id="group_button" text="Grp" visible="false" noshowall="true"/>
+        </Vbox>
+      </VBox>
     </VBox>
-  </VBox>
+  </EventBox>
 </RouteUI>