Merge pull request #2616 from ronso0/passthrough-cover

show Passthrough cover on track overview

11 files changed, 58 insertions, 143 deletions

diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index c4fd52d031..68c6284b11 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -831,6 +831,13 @@ WOverview {
   text-transform: none;
 }
 
+/* Passthrough label on overview waveform */
+WOverview #PassthroughLabel {
+  font-size: 16px;
+  font-weight: bold;
+  color: #73b3f7;
+}
+
 /* Start spacing for Deck overview row (small waveform, option grid) */
 #OptionGrid, #ButtonGrid {
   background-color: #333333;
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index ae5c52703c..f346e41d95 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -261,6 +261,13 @@ WCoverArtMenu,
   #FxButtonLabel {
     qproperty-alignment: 'AlignLeft | AlignVCenter';
     }
+
+/* Passthrough label on overview waveform */
+WOverview #PassthroughLabel {
+  font-weight: bold;
+  color: #d09300;
+}
+
 /************** font colors **************************************************/
 /************** font settings *************************************************/
 
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index d767bdfaa6..dee3f8b43f 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -18,6 +18,13 @@ WOverview {
   font-family: "Ubuntu";
 }
 
+/* Passthrough label on overview waveform */
+WOverview #PassthroughLabel {
+  font-size: 12px;
+  font-weight: bold;
+  color: #55F764;
+}
+
 WBeatSpinBox,
 /* For some mysterious reason #DlgAutoDJ QSpinBox
 wouldn't style the respective spinbox in Shade (anymore),
diff --git a/res/skins/Shade/style_dark.qss b/res/skins/Shade/style_dark.qss
index 335b2ba9f1..ee1030c412 100644
--- a/res/skins/Shade/style_dark.qss
+++ b/res/skins/Shade/style_dark.qss
@@ -91,6 +91,11 @@ WCoverArtMenu::item {
   background-color: #3F3041;
 }
 
+/* Passthrough label on overview waveform */
+WOverview #PassthroughLabel {
+  color: #00aaff;
+}
+
 
 
 #LibraryContainer QTableView:focus,
diff --git a/res/skins/Shade/style_summer_sunset.qss b/res/skins/Shade/style_summer_sunset.qss
index d76bebff83..a4d870191c 100644
--- a/res/skins/Shade/style_summer_sunset.qss
+++ b/res/skins/Shade/style_summer_sunset.qss
@@ -88,6 +88,11 @@ WCoverArtMenu::item {
   background-color: #706633;
 }
 
+/* Passthrough label on overview waveform */
+WOverview #PassthroughLabel {
+  color: #FF9900;
+}
+
 #DlgMissing > QPushButton:enabled,
 #DlgHidden > QPushButton:enabled,
 #DlgAutoDJ > QPushButton:enabled,
diff --git a/res/skins/Tango/deck_row_overview_left.xml b/res/skins/Tango/deck_row_overview_left.xml
index 5566594b5e..54ad9df023 100644
--- a/res/skins/Tango/deck_row_overview_left.xml
+++ b/res/skins/Tango/deck_row_overview_left.xml
@@ -33,46 +33,12 @@ Variables:
 
           <Template src="skin:vinyl_controls_left.xml"/>
 
-          <WidgetGroup><!-- Vinyl Controls toggles -->
-            <Size>15f,50f</Size>
-            <Layout>vertical</Layout>
-            <Children>
-              <WidgetGroup><!-- Vinyl Controls toggle with passthrough -->
-                <Size>15f,50f</Size>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <Template src="skin:button_2state.xml">
-                    <SetVariable name="ObjectName">VinylTogglerLeftPassthrough</SetVariable>
-                    <SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
-                    <SetVariable name="Size">15f,50f</SetVariable>
-                    <SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-              <WidgetGroup><!-- Vinyl Controls toggle without passthrough -->
-                <Size>15f,50f</Size>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <Template src="skin:button_2state.xml">
-                    <SetVariable name="ObjectName">VinylTogglerLeft</SetVariable>
-                    <SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
-                    <SetVariable name="Size">15f,50f</SetVariable>
-                    <SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
-                  <Transform><Not/></Transform>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-            </Children>
-          </WidgetGroup><!-- /Vinyl Controls toggles -->
+          <Template src="skin:button_2state.xml">
+            <SetVariable name="ObjectName">VinylTogglerLeft</SetVariable>
+            <SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
+            <SetVariable name="Size">15f,50f</SetVariable>
+            <SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
+          </Template>
 
           <!-- Small Cover/Spinny when explicitly set 'small' -->
           <WidgetGroup>
diff --git a/res/skins/Tango/deck_row_overview_right.xml b/res/skins/Tango/deck_row_overview_right.xml
index 2cd23ac866..9fe2c01ae4 100644
--- a/res/skins/Tango/deck_row_overview_right.xml
+++ b/res/skins/Tango/deck_row_overview_right.xml
@@ -71,46 +71,12 @@ Variables:
             </Connection>
           </WidgetGroup><!-- / Small Cover/Spinny 2 -->
 
-          <WidgetGroup><!-- Vinyl Controls toggles -->
-            <Size>15f,50f</Size>
-            <Layout>vertical</Layout>
-            <Children>
-              <WidgetGroup><!-- Vinyl Controls toggle with passthrough -->
-                <Size>15f,50f</Size>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <Template src="skin:button_2state.xml">
-                    <SetVariable name="ObjectName">VinylTogglerRightPassthrough</SetVariable>
-                    <SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
-                    <SetVariable name="Size">15f,50f</SetVariable>
-                    <SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-              <WidgetGroup><!-- Vinyl Controls toggle without passthrough -->
-                <Size>15f,50f</Size>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <Template src="skin:button_2state.xml">
-                    <SetVariable name="ObjectName">VinylTogglerRight</SetVariable>
-                    <SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
-                    <SetVariable name="Size">15f,50f</SetVariable>
-                    <SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
-                  <Transform><Not/></Transform>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-            </Children>
-          </WidgetGroup><!-- /Vinyl Controls toggles -->
+          <Template src="skin:button_2state.xml">
+            <SetVariable name="ObjectName">VinylTogglerLeft</SetVariable>
+            <SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
+            <SetVariable name="Size">15f,50f</SetVariable>
+            <SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
+          </Template>
 
           <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
 
diff --git a/res/skins/Tango/deck_row_transport_left.xml b/res/skins/Tango/deck_row_transport_left.xml
index 1210b6c247..9a692220ca 100644
--- a/res/skins/Tango/deck_row_transport_left.xml
+++ b/res/skins/Tango/deck_row_transport_left.xml
@@ -207,18 +207,6 @@ Variables:
             <Children>
               <!-- index 0 due to bug -->
               <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-
-              <!-- Block Play button if passthrough is active,
-                  show speaker icon instead -->
-              <WidgetGroup>
-                <ObjectName>PassthroughPlayCover</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>me,me</SizePolicy>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
               <!-- Play -->
               <Template src="skin:button_2state_right_display.xml">
                 <SetVariable name="ObjectName">PlayCue</SetVariable>
@@ -276,26 +264,6 @@ Variables:
                 <Children>
                   <!-- index 0 due to bug -->
                   <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-                  <!-- Block Play button if passthrough is active,
-                      show speaker icon instead -->
-                  <WidgetGroup>
-                    <ObjectName>PassthroughPlayCover</ObjectName>
-                    <Layout>vertical</Layout>
-                    <SizePolicy>me,me</SizePolicy>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
-                  <WidgetGroup>
-                    <ObjectName>Spacer33</ObjectName>
-                    <Layout>vertical</Layout>
-                    <SizePolicy>me,me</SizePolicy>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
                   <!-- Play -->
                   <Template src="skin:button_2state_right_display.xml">
                     <SetVariable name="ObjectName">PlayCue</SetVariable>
diff --git a/res/skins/Tango/deck_row_transport_right.xml b/res/skins/Tango/deck_row_transport_right.xml
index 3a024a4d40..5de0fec015 100644
--- a/res/skins/Tango/deck_row_transport_right.xml
+++ b/res/skins/Tango/deck_row_transport_right.xml
@@ -24,26 +24,6 @@ Variables:
         <Children>
           <!-- index 0 due to bug -->
           <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-          <!-- Block Play button if passthrough is active,
-              show speaker icon instead -->
-          <WidgetGroup>
-            <ObjectName>PassthroughPlayCover</ObjectName>
-            <Layout>vertical</Layout>
-            <SizePolicy>me,me</SizePolicy>
-            <Connection>
-              <ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-          <WidgetGroup>
-            <ObjectName>Spacer33</ObjectName>
-            <Layout>vertical</Layout>
-            <SizePolicy>me,me</SizePolicy>
-            <Connection>
-              <ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
           <!-- Play -->
           <Template src="skin:button_2state_right_display.xml">
             <SetVariable name="ObjectName">PlayCue</SetVariable>
@@ -89,17 +69,6 @@ Variables:
             <Children>
               <!-- index 0 due to bug -->
               <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
-              <!-- Block Play button if passthrough is active,
-                  show speaker icon instead -->
-              <WidgetGroup>
-                <ObjectName>PassthroughPlayCover</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>me,me</SizePolicy>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
               <!-- Play -->
               <Template src="skin:button_2state_right_display.xml">
                 <SetVariable name="ObjectName">PlayCue</SetVariable>
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index 43270a8bb0..b708eb1414 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -2070,6 +2070,12 @@ WTrackProperty#SamplerTitle_mini {
  ######  Misc  ##################################################
 ##############################################################*/
 
+/* Passthrough label on overview waveform */
+WOverview #PassthroughLabel {
+  font-weight: bold;
+  color: #ff8f00;
+}
+
 QToolTip,
 #LibraryContainer QMenu,
 WBeatSpinBox QMenu,
diff --git a/res/skins/default.qss b/res/skins/default.qss
index e9a35ed663..18a6e16e77 100644
--- a/res/skins/default.qss
+++ b/res/skins/default.qss
@@ -53,6 +53,15 @@ WColorPicker QPushButton[checked="true"] {
   qproperty-icon: url(:/images/ic_checkmark.svg);
 }
 
+/* Passthrough label on overview waveform */
+WOverview #PassthroughLabel {
+  margin-left: 4px;
+  font-family: "Open Sans";
+  font-weight: bold;
+  font-size: 18px;
+  color: #ff8800;
+}
+
 /* Clear button */
 #SearchClearButton {
   background: none;