Tango, Deere, LateNight: add AutoDJ indicator to tool bar

6 files changed, 263 insertions, 3 deletions

diff --git a/res/skins/Deere/tool_bar.xml b/res/skins/Deere/tool_bar.xml
index 639971cf87..7643d6a0c9 100644
--- a/res/skins/Deere/tool_bar.xml
+++ b/res/skins/Deere/tool_bar.xml
@@ -281,7 +281,7 @@
                 just displaying the AutoDJ status here.
               -->
               <Template src="skin:statuslight_3state.xml">
-                <SetVariable name="TooltipId"></SetVariable>
+                <SetVariable name="TooltipId">FIXME</SetVariable>
                 <SetVariable name="Tooltip">Auto DJ active</SetVariable>
                 <SetVariable name="ObjectName">AutoDjNotification</SetVariable>
                 <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
diff --git a/res/skins/LateNight/classic/style/autodj_status.svg b/res/skins/LateNight/classic/style/autodj_status.svg
new file mode 100644
index 0000000000..624f3cc92e
--- /dev/null
+++ b/res/skins/LateNight/classic/style/autodj_status.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="30"
+   height="22"
+   version="1.1"
+   id="svg18">
+  <metadata
+     id="metadata24">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs22" />
+  <path
+     d="m 12,4 c -0.554,0 -1,0.446 -1,1 v 3 h 8 V 5 C 19,4.446 18.554,4 18,4 Z m 1.25,1.5 C 13.66421,5.5 14,5.83579 14,6.25 14,6.66421 13.66421,7 13.25,7 12.83579,7 12.5,6.66421 12.5,6.25 12.5,5.83579 12.83579,5.5 13.25,5.5 Z m 3.5,0 c 0.41421,0 0.75,0.33579 0.75,0.75 C 17.5,6.66421 17.16421,7 16.75,7 16.33579,7 16,6.66421 16,6.25 16,5.83579 16.33579,5.5 16.75,5.5 Z"
+     color="#000001"
+     id="path2"
+     style="fill:#e86317;fill-opacity:1" />
+  <rect
+     x="12"
+     y="15"
+     width="2"
+     height="3"
+     rx="1"
+     ry="1"
+     id="rect4"
+     style="fill:#e86317;fill-opacity:1" />
+  <rect
+     x="16"
+     y="15"
+     width="2"
+     height="3"
+     rx="1"
+     ry="1"
+     id="rect6"
+     style="fill:#e86317;fill-opacity:1" />
+  <rect
+     x="8"
+     y="9"
+     width="2"
+     height="5"
+     rx="1"
+     ry="1"
+     color="#000001"
+     id="rect8"
+     style="fill:#e86317;fill-opacity:1" />
+  <path
+     d="m 11,9 v 6.4219 c 0,0.32317 0.223,0.57812 0.5,0.57812 h 7 c 0.277,0 0.5,-0.25496 0.5,-0.57812 V 9 h -7.5 z"
+     color="#000001"
+     id="path10"
+     style="fill:#e86317;fill-opacity:1" />
+  <rect
+     x="20"
+     y="9"
+     width="2"
+     height="5"
+     rx="1"
+     ry="1"
+     color="#000001"
+     id="rect12"
+     style="fill:#e86317;fill-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/autodj_status.svg b/res/skins/LateNight/palemoon/style/autodj_status.svg
new file mode 100644
index 0000000000..624f3cc92e
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/autodj_status.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="30"
+   height="22"
+   version="1.1"
+   id="svg18">
+  <metadata
+     id="metadata24">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs22" />
+  <path
+     d="m 12,4 c -0.554,0 -1,0.446 -1,1 v 3 h 8 V 5 C 19,4.446 18.554,4 18,4 Z m 1.25,1.5 C 13.66421,5.5 14,5.83579 14,6.25 14,6.66421 13.66421,7 13.25,7 12.83579,7 12.5,6.66421 12.5,6.25 12.5,5.83579 12.83579,5.5 13.25,5.5 Z m 3.5,0 c 0.41421,0 0.75,0.33579 0.75,0.75 C 17.5,6.66421 17.16421,7 16.75,7 16.33579,7 16,6.66421 16,6.25 16,5.83579 16.33579,5.5 16.75,5.5 Z"
+     color="#000001"
+     id="path2"
+     style="fill:#e86317;fill-opacity:1" />
+  <rect
+     x="12"
+     y="15"
+     width="2"
+     height="3"
+     rx="1"
+     ry="1"
+     id="rect4"
+     style="fill:#e86317;fill-opacity:1" />
+  <rect
+     x="16"
+     y="15"
+     width="2"
+     height="3"
+     rx="1"
+     ry="1"
+     id="rect6"
+     style="fill:#e86317;fill-opacity:1" />
+  <rect
+     x="8"
+     y="9"
+     width="2"
+     height="5"
+     rx="1"
+     ry="1"
+     color="#000001"
+     id="rect8"
+     style="fill:#e86317;fill-opacity:1" />
+  <path
+     d="m 11,9 v 6.4219 c 0,0.32317 0.223,0.57812 0.5,0.57812 h 7 c 0.277,0 0.5,-0.25496 0.5,-0.57812 V 9 h -7.5 z"
+     color="#000001"
+     id="path10"
+     style="fill:#e86317;fill-opacity:1" />
+  <rect
+     x="20"
+     y="9"
+     width="2"
+     height="5"
+     rx="1"
+     ry="1"
+     color="#000001"
+     id="rect12"
+     style="fill:#e86317;fill-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/toolbar.xml b/res/skins/LateNight/toolbar.xml
index 48091a4cb7..b7b2a6a701 100644
--- a/res/skins/LateNight/toolbar.xml
+++ b/res/skins/LateNight/toolbar.xml
@@ -120,6 +120,26 @@
 
       <WidgetGroup><Size>me,min</Size></WidgetGroup>
 
+      <WidgetGroup><Size>7f,1min</Size></WidgetGroup>
+
+      <StatusLight>
+        <TooltipId>FIXME</TooltipId>
+        <Tooltip>AutoDJ active</Tooltip>
+        <ObjectName>AutoDjStatus</ObjectName>
+        <Size>30f,22f</Size>
+        <NumberPos>3</NumberPos>
+        <PathStatusLight1>skin:<Variable name="StyleScheme"/>/style/autodj_status.svg</PathStatusLight1>
+        <PathStatusLight2>skin:<Variable name="StyleScheme"/>/style/autodj_status.svg</PathStatusLight2>
+        <PathStatusLight3>skin:<Variable name="StyleScheme"/>/style/autodj_status.svg</PathStatusLight3>
+        <Connection>
+          <ConfigKey>[AutoDJ],enabled</ConfigKey>
+        </Connection>
+        <Connection>
+          <ConfigKey>[AutoDJ],enabled</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </StatusLight>
+
       <WidgetGroup>
         <ObjectName>ClockWidget</ObjectName>
         <Layout>horizontal</Layout>
diff --git a/res/skins/Tango/graphics/autodj_status.svg b/res/skins/Tango/graphics/autodj_status.svg
new file mode 100644
index 0000000000..1484f83d3e
--- /dev/null
+++ b/res/skins/Tango/graphics/autodj_status.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="14"
+   height="22"
+   version="1.1"
+   id="svg18">
+  <metadata
+     id="metadata24">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs22" />
+  <path
+     d="M 4,4 C 3.446,4 3,4.446 3,5 v 3 h 8 V 5 C 11,4.446 10.554,4 10,4 Z M 5.25,5.5 C 5.66421,5.5 6,5.83579 6,6.25 6,6.66421 5.66421,7 5.25,7 4.83579,7 4.5,6.66421 4.5,6.25 4.5,5.83579 4.83579,5.5 5.25,5.5 Z m 3.5,0 C 9.16421,5.5 9.5,5.83579 9.5,6.25 9.5,6.66421 9.16421,7 8.75,7 8.33579,7 8,6.66421 8,6.25 8,5.83579 8.33579,5.5 8.75,5.5 Z"
+     color="#000001"
+     id="path2"
+     style="fill:#e86317;fill-opacity:1" />
+  <rect
+     x="4"
+     y="15"
+     width="2"
+     height="3"
+     rx="1"
+     ry="1"
+     id="rect4"
+     style="fill:#e86317;fill-opacity:1" />
+  <rect
+     x="8"
+     y="15"
+     width="2"
+     height="3"
+     rx="1"
+     ry="1"
+     id="rect6"
+     style="fill:#e86317;fill-opacity:1" />
+  <rect
+     x="0"
+     y="9"
+     width="2"
+     height="5"
+     rx="1"
+     ry="1"
+     color="#000001"
+     id="rect8"
+     style="fill:#e86317;fill-opacity:1" />
+  <path
+     d="m 3,9 v 6.4219 c 0,0.32317 0.223,0.57812 0.5,0.57812 h 7 c 0.277,0 0.5,-0.25496 0.5,-0.57812 V 9 H 3.5 Z"
+     color="#000001"
+     id="path10"
+     style="fill:#e86317;fill-opacity:1" />
+  <rect
+     x="12"
+     y="9"
+     width="2"
+     height="5"
+     rx="1"
+     ry="1"
+     color="#000001"
+     id="rect12"
+     style="fill:#e86317;fill-opacity:1" />
+</svg>
diff --git a/res/skins/Tango/topbar.xml b/res/skins/Tango/topbar.xml
index 34367255e0..4f913c972b 100644
--- a/res/skins/Tango/topbar.xml
+++ b/res/skins/Tango/topbar.xml
@@ -140,7 +140,25 @@ Description:
         <SizePolicy>me,min</SizePolicy>
         <Children>
 
-          <WidgetGroup><Size>10me,1min</Size></WidgetGroup>
+          <StatusLight>
+            <TooltipId>FIXME</TooltipId>
+            <Tooltip>AutoDJ active</Tooltip>
+            <ObjectName>AutoDjStatus</ObjectName>
+            <Size>14f,22f</Size>
+            <NumberPos>3</NumberPos>
+            <PathStatusLight1>skin:graphics/autodj_status.svg</PathStatusLight1>
+            <PathStatusLight2>skin:graphics/autodj_status.svg</PathStatusLight2>
+            <PathStatusLight3>skin:graphics/autodj_status.svg</PathStatusLight3>
+            <Connection>
+              <ConfigKey>[AutoDJ],enabled</ConfigKey>
+            </Connection>
+            <Connection>
+              <ConfigKey>[AutoDJ],enabled</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </StatusLight>
+
+          <WidgetGroup><Size>0me,1min</Size></WidgetGroup>
 
           <WidgetGroup><!-- Skin toggles, hidden with maximized library -->
             <Layout>horizontal</Layout>
@@ -269,7 +287,7 @@ Description:
             </Children>
           </WidgetGroup><!-- /Recording button & recording duration label -->
 
-          <WidgetGroup><Size>10f,1min</Size></WidgetGroup>
+          <WidgetGroup><Size>7f,1min</Size></WidgetGroup>
 
           <Template src="skin:button_5state_display.xml">
             <SetVariable name="TooltipId">broadcast_enabled</SetVariable>