Deere: implement new 'play_latched' CO

3 files changed, 71 insertions, 28 deletions

diff --git a/res/skins/Deere/deck_controls_row.xml b/res/skins/Deere/deck_controls_row.xml
index 99c6899948..7e076dcdbe 100644
--- a/res/skins/Deere/deck_controls_row.xml
+++ b/res/skins/Deere/deck_controls_row.xml
@@ -38,7 +38,7 @@
             <Layout>stacked</Layout>
             <SizePolicy>me,me</SizePolicy>
             <Children>
-              <Template src="skin:left_right_2state_button.xml">
+              <Template src="skin:left_right_display_2state_button.xml">
                 <SetVariable name="TooltipId">play_cue_set</SetVariable>
                 <SetVariable name="ObjectName">PlayToggle</SetVariable>
                 <SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable>
@@ -46,6 +46,14 @@
                 <SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
                 <SetVariable name="left_connection_control"><Variable name="group"/>,play</SetVariable>
                 <SetVariable name="right_connection_control"><Variable name="group"/>,cue_set</SetVariable>
+                <SetVariable name="display_connection_control"><Variable name="group"/>,play_latched</SetVariable>
+              </Template>
+              <Template src="skin:left_2state_button.xml">
+                <SetVariable name="ObjectName">PreviewIndicator</SetVariable>
+                <SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable>
+                <SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
+                <SetVariable name="left_connection_control"><Variable name="group"/>,play</SetVariable>
               </Template>
               <Template src="skin:left_2state_button.xml">
                 <SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable>
diff --git a/res/skins/Deere/deck_small.xml b/res/skins/Deere/deck_small.xml
index 2addce9989..4af0cd5dbf 100644
--- a/res/skins/Deere/deck_small.xml
+++ b/res/skins/Deere/deck_small.xml
@@ -174,26 +174,56 @@
                 </Children>
               </WidgetGroup><!-- DeckTextRowSmall -->
 
-              <WidgetGroup><!-- Play button + play_indicator -->
-                <ObjectName>PlayGutterSmall</ObjectName>
-                <Layout>stacked</Layout>
-                <SizePolicy>f,me</SizePolicy>
+              <WidgetGroup><!-- Cue + Play button -->
+                <ObjectName>PlayCueContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <Size>32min,46f</Size>
                 <Children>
-                  <Template src="skin:left_right_2state_button.xml">
-                    <SetVariable name="TooltipId">play_cue_default</SetVariable>
-                    <SetVariable name="ObjectName">PlayToggle</SetVariable>
-                    <SetVariable name="MinimumSize">24,30</SetVariable>
-                    <SetVariable name="MaximumSize">24,</SetVariable>
-                    <SetVariable name="SizePolicy">f,me</SetVariable>
-                    <SetVariable name="left_connection_control"><Variable name="group"/>,play</SetVariable>
-                    <SetVariable name="right_connection_control"><Variable name="group"/>,cue_default</SetVariable>
-                  </Template>
-                  <Template src="skin:left_2state_button.xml">
-                    <SetVariable name="MinimumSize">24,30</SetVariable>
-                    <SetVariable name="MaximumSize">24,</SetVariable>
-                    <SetVariable name="SizePolicy">f,me</SetVariable>
-                    <SetVariable name="left_connection_control"><Variable name="group"/>,play_indicator</SetVariable>
+
+                  <Template src="skin:left_right_display_2state_button.xml">
+                    <SetVariable name="TooltipId">cue_default_cue_gotoandstop</SetVariable>
+                    <SetVariable name="ObjectName">DeckCue</SetVariable>
+                    <SetVariable name="MinimumSize">30,21</SetVariable>
+                    <SetVariable name="MaximumSize">30,21</SetVariable>
+                    <SetVariable name="SizePolicy">f,f</SetVariable>
+                    <SetVariable name="LeftClickIsPushButton">true</SetVariable>
+                    <SetVariable name="state_0_text">CUE</SetVariable>
+                    <SetVariable name="state_1_text">CUE</SetVariable>
+                    <SetVariable name="left_connection_control"><Variable name="group"/>,cue_default</SetVariable>
+                    <SetVariable name="right_connection_control"><Variable name="group"/>,cue_gotoandstop</SetVariable>
+                    <SetVariable name="display_connection_control"><Variable name="group"/>,cue_indicator</SetVariable>
                   </Template>
+
+                  <WidgetGroup><!-- Play button + preview indicator + play_indicator -->
+                    <Layout>stacked</Layout>
+                    <SizePolicy>f,me</SizePolicy>
+                    <Children>
+                      <Template src="skin:left_right_display_2state_button.xml">
+                        <SetVariable name="TooltipId">play_cue_default</SetVariable>
+                        <SetVariable name="ObjectName">PlayToggle</SetVariable>
+                        <SetVariable name="MinimumSize">30,21</SetVariable>
+                        <SetVariable name="MaximumSize">30,21</SetVariable>
+                        <SetVariable name="SizePolicy">f,f</SetVariable>
+                        <SetVariable name="left_connection_control"><Variable name="group"/>,play</SetVariable>
+                        <SetVariable name="right_connection_control"><Variable name="group"/>,cue_set</SetVariable>
+                        <SetVariable name="display_connection_control"><Variable name="group"/>,play_latched</SetVariable>
+                      </Template>
+                      <Template src="skin:left_2state_button.xml">
+                        <SetVariable name="ObjectName">PreviewIndicator</SetVariable>
+                        <SetVariable name="MinimumSize">30,21</SetVariable>
+                        <SetVariable name="MaximumSize">30,21</SetVariable>
+                        <SetVariable name="SizePolicy">f,f</SetVariable>
+                        <SetVariable name="left_connection_control"><Variable name="group"/>,play</SetVariable>
+                      </Template>
+                      <Template src="skin:left_2state_button.xml">
+                        <SetVariable name="MinimumSize">30,21</SetVariable>
+                        <SetVariable name="MaximumSize">30,21</SetVariable>
+                        <SetVariable name="SizePolicy">f,f</SetVariable>
+                        <SetVariable name="left_connection_control"><Variable name="group"/>,play_indicator</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup>
+
                 </Children>
               </WidgetGroup><!-- PlayGutterSmall -->
 
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index c636bb3545..9651608e66 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -96,13 +96,6 @@
   padding: 3px;
   qproperty-layoutAlignment: 'AlignBottom';
 }
-#PlayGutterSmall {
-  padding: 3px;
-  background-color: none;
-  qproperty-layoutAlignment: 'AlignBottom'; /*
-  border-left: 1px solid #222;
-  background-color: #664988;  */
-}
 
 #MixerBorder {
   background-color: #222;
@@ -1630,13 +1623,25 @@ WPushButton[value="2"]:hover,
   border: 1px solid transparent;
 }
 
-#PlayToggle[value="0"] {
+WPushButton#PlayToggle[value="0"] {
   image: url(skin:/icon/ic_play_48px.svg) no-repeat center center;
+  background-color: transparent;
 }
 
-#PlayToggle[value="1"] {
+WPushButton#PlayToggle[value="1"] {
   image: url(skin:/icon/ic_pause_48px.svg) no-repeat center center;
 }
+WPushButton#PreviewIndicator {
+  background-color: transparent;
+}
+/* Blue border for Play buttons when previewing from
+  Cue or Hotcue */
+WPushButton#PreviewIndicator[value="1"] {
+  border: 2px solid #0080BE;
+}
+WPushButton#PreviewIndicator[value="0"] {
+  border: none;
+}
 
 #ToolbarButton[value="1"] {
     color: #D2D2D2;