From dea90e3b8bdf8f5bbc9a8f031d95be3425eeb41d Mon Sep 17 00:00:00 2001
From: Fabrice CARUSO <fabrice.caruso@free.fr>
Date: Wed, 9 Oct 2019 17:29:17 +0200
Subject: [PATCH] Video ScreenSaver options : OMX still visible on every
 platform + UI -> Changed defaut on/off switch images.

---
 .../src/guis/GuiVideoScreensaverOptions.cpp   | 11 ++--
 resources/off.svg                             | 60 ++++++++++++++++++-
 resources/on.svg                              | 55 ++++++++++++++++-
 3 files changed, 118 insertions(+), 8 deletions(-)

diff --git a/es-app/src/guis/GuiVideoScreensaverOptions.cpp b/es-app/src/guis/GuiVideoScreensaverOptions.cpp
index 4bed3da29..cf61ffcee 100644
--- a/es-app/src/guis/GuiVideoScreensaverOptions.cpp
+++ b/es-app/src/guis/GuiVideoScreensaverOptions.cpp
@@ -19,13 +19,11 @@ GuiVideoScreensaverOptions::GuiVideoScreensaverOptions(Window* window, const cha
 		PowerSaver::updateTimeouts();
 	});
 
-//#ifdef _RPI_
+#ifdef _RPI_
 	auto ss_omx = std::make_shared<SwitchComponent>(mWindow);
 	ss_omx->setState(Settings::getInstance()->getBool("ScreenSaverOmxPlayer"));
 	addWithLabel(_("USE OMX PLAYER FOR SCREENSAVER"), ss_omx);
 	addSaveFunc([ss_omx, this] { Settings::getInstance()->setBool("ScreenSaverOmxPlayer", ss_omx->getState()); });
-//#endif
-
 	ss_omx->setOnChangedCallback([this, ss_omx, window]()
 	{
 		if (Settings::getInstance()->setBool("ScreenSaverOmxPlayer", ss_omx->getState()))
@@ -35,7 +33,8 @@ GuiVideoScreensaverOptions::GuiVideoScreensaverOptions(Window* window, const cha
 			pw->pushGui(new GuiVideoScreensaverOptions(pw, _("VIDEO SCREENSAVER").c_str()));
 		}
 	});
-
+#endif
+	   
 	// Render Video Game Name as subtitles
 	auto ss_info = std::make_shared< OptionListComponent<std::string> >(mWindow, _("SHOW GAME INFO"), false);
 	std::vector<std::string> info_type;
@@ -49,9 +48,9 @@ GuiVideoScreensaverOptions::GuiVideoScreensaverOptions(Window* window, const cha
 
 	bool advancedOptions = true;
 
-//#ifdef _RPI_
+#ifdef _RPI_
 	advancedOptions = !Settings::getInstance()->getBool("ScreenSaverOmxPlayer");
-//#endif
+#endif
 
 	if (advancedOptions)
 	{
diff --git a/resources/off.svg b/resources/off.svg
index 0f6c8a8b8..5a293cd40 100644
--- a/resources/off.svg
+++ b/resources/off.svg
@@ -1 +1,59 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="43.916" height="21.959"><path fill="#fff" d="M29.291 15.69h1.934v-4.113h5.42v-1.479h-5.42V7.704h5.729V6.225h-7.662v9.465zm-9.481 0h1.936v-4.113h5.416v-1.479h-5.416V7.704h5.725V6.225h-7.66v9.465zm-7.432-1.217c-2.166 0-3.404-1.435-3.404-3.517 0-2.083 1.238-3.518 3.404-3.518 2.167 0 3.406 1.435 3.406 3.518 0 2.082-1.239 3.517-3.406 3.517m0 1.483c3.896 0 5.419-2.335 5.419-5s-1.522-4.997-5.419-4.997c-3.896 0-5.416 2.332-5.416 4.997s1.52 5 5.416 5"/><path fill="#fff" d="M39.664 1.5a2.754 2.754 0 0 1 2.752 2.752v13.455a2.754 2.754 0 0 1-2.752 2.752H4.252A2.754 2.754 0 0 1 1.5 17.707V4.252A2.754 2.754 0 0 1 4.252 1.5h35.412m0-1.5H4.252A4.265 4.265 0 0 0 0 4.252v13.455a4.265 4.265 0 0 0 4.252 4.252h35.412a4.264 4.264 0 0 0 4.252-4.252V4.252A4.265 4.265 0 0 0 39.664 0z"/></svg>
\ No newline at end of file
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="43.916"
+   height="21.959"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="off.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="8.1063848"
+     inkscape:cx="-38.179781"
+     inkscape:cy="10.9795"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6" />
+  <path
+     inkscape:connector-curvature="0"
+     d="m 10.433336,3.2447139 c -3.9517024,0 -7.1666696,3.4606288 -7.1666696,7.7142851 0,4.253654 3.2149672,7.714288 7.1666696,7.714288 3.9517,0 7.166664,-3.460634 7.166664,-7.714288 0,-4.2536563 -3.214964,-7.7142851 -7.166664,-7.7142851 z m 0,13.8857201 C 7.2721164,17.130434 4.7,14.361768 4.7,10.958999 c 0,-3.402771 2.5721164,-6.1714279 5.733336,-6.1714279 3.161214,0 5.733328,2.7686569 5.733328,6.1714279 0,3.402769 -2.572114,6.171435 -5.733328,6.171435 z"
+     id="path2-2"
+     style="fill:#ffffff;stroke-width:0.74354357" />
+  <path
+     inkscape:connector-curvature="0"
+     d="M 33.366664,0.159 H 10.433336 C 4.9006664,0.159 0.4,5.0035711 0.4,10.958999 0.4,16.914434 4.9006664,21.759 10.433336,21.759 H 33.366664 C 38.899336,21.759 43.4,16.914434 43.4,10.958999 43.4,5.0035711 38.899336,0.159 33.366664,0.159 Z m 0,20.057147 H 10.433336 c -4.742186,0 -8.6000024,-4.1526 -8.6000024,-9.257148 0,-5.1045428 3.8578164,-9.2571425 8.6000024,-9.2571425 h 22.933328 c 4.742186,0 8.6,4.1525997 8.6,9.2571425 0,5.104548 -3.857814,9.257148 -8.6,9.257148 z"
+     id="path4-6"
+     style="fill:#ffffff;stroke-width:0.74354357" />
+</svg>
diff --git a/resources/on.svg b/resources/on.svg
index 01702df8f..726d7bf46 100644
--- a/resources/on.svg
+++ b/resources/on.svg
@@ -1 +1,54 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="43.916" height="21.959"><g fill="#fff"><path d="M15.754 7.461c-2.319 0-3.643 1.434-3.643 3.518 0 2.083 1.325 3.521 3.643 3.521 2.32 0 3.644-1.437 3.645-3.521 0-2.084-1.325-3.518-3.645-3.518z"/><path d="M39.664 0H4.252A4.265 4.265 0 0 0 0 4.252v13.455a4.265 4.265 0 0 0 4.252 4.252h35.412a4.264 4.264 0 0 0 4.252-4.252V4.252A4.265 4.265 0 0 0 39.664 0zm-23.91 15.979c-4.168 0-5.796-2.334-5.796-5 0-2.669 1.628-5.001 5.796-5.001 4.17 0 5.798 2.332 5.798 5.001 0 2.665-1.628 5-5.798 5zm18.203-.264h-2.332L25.72 8.602h-.027v7.113h-1.988V6.244h2.373l5.865 7.114h.027V6.244h1.987v9.471z"/></g></svg>
\ No newline at end of file
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="43.916"
+   height="21.959"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="on.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="716"
+     inkscape:window-height="405"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="8.1063848"
+     inkscape:cx="-18.133854"
+     inkscape:cy="10.9795"
+     inkscape:window-x="2144"
+     inkscape:window-y="126"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg8" />
+  <path
+     inkscape:connector-curvature="0"
+     d="M 10.433337,21.759 H 33.366664 C 38.899337,21.759 43.4,16.91443 43.4,10.959 43.4,5.003571 38.899337,0.159 33.366663,0.159 H 10.433337 C 4.9006667,0.159 0.4,5.003571 0.4,10.959 c 0,5.95543 4.5006667,10.8 10.033337,10.8 z M 33.366664,3.2447141 c 3.9517,0 7.166673,3.4606284 7.166673,7.7142859 0,4.253657 -3.214973,7.714287 -7.166673,7.714287 -3.9517,0 -7.166663,-3.46063 -7.166663,-7.714287 0,-4.2536575 3.214963,-7.7142859 7.166663,-7.7142859 z"
+     id="path6"
+     style="fill:#ffffff;stroke-width:0.74354357" />
+</svg>