From febb25e1f1a31e30550604be29200347d4ffe4f6 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Fri, 9 Sep 2022 22:43:15 +0200
Subject: [PATCH] yWeb: rework screenshot menu; add lcd4linux screenshot

Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/8c26bf1f4d6d9776451f10513d9c99caa204379f
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-09-09 (Fri, 09 Sep 2022)

Origin message was:
------------------
- yWeb: rework screenshot menu; add lcd4linux screenshot
---
 data/y-web/Makefile.am                        |  4 +-
 data/y-web/Y_Boxcontrol_Menue.yhtm            | 28 ++++++---
 ....yhtm => Y_Tools_Screenshot_GraphLCD.yhtm} |  0
 data/y-web/Y_Tools_Screenshot_LCD4Linux.yhtm  | 57 +++++++++++++++++++
 data/y-web/Y_Tools_tvshot.yhtm                | 51 -----------------
 data/y-web/Y_Version.txt                      |  2 +-
 data/y-web/languages/Deutsch                  |  2 -
 data/y-web/languages/English                  |  2 -
 8 files changed, 79 insertions(+), 67 deletions(-)
 rename data/y-web/{Y_Tools_Glcd_Screenshot.yhtm => Y_Tools_Screenshot_GraphLCD.yhtm} (100%)
 create mode 100644 data/y-web/Y_Tools_Screenshot_LCD4Linux.yhtm
 delete mode 100644 data/y-web/Y_Tools_tvshot.yhtm

diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am
index 687018328..7fc85862b 100644
--- a/data/y-web/Makefile.am
+++ b/data/y-web/Makefile.am
@@ -64,13 +64,13 @@ install_DATA =	channels.js \
 		Y_Tools_Boxcontrol.yhtm \
 		Y_Tools_Check_Install.yhtm \
 		Y_Tools_Cmd.yhtm \
-		Y_Tools_Glcd_Screenshot.yhtm \
 		Y_Tools_Info_Menue.yhtm \
 		Y_Tools_Installer.yhtm \
 		Y_Tools_Menue.yhtm \
 		Y_Tools_Rcsim.yhtm \
 		Y_Tools_Screenshot.yhtm  \
-		Y_Tools_tvshot.yhtm \
+		Y_Tools_Screenshot_GraphLCD.yhtm \
+		Y_Tools_Screenshot_LCD4Linux.yhtm  \
 		Y_User.css \
 		Y_Version.txt \
 		Y_Wait.yhtm \
diff --git a/data/y-web/Y_Boxcontrol_Menue.yhtm b/data/y-web/Y_Boxcontrol_Menue.yhtm
index 41e12534c..16a7aa09d 100644
--- a/data/y-web/Y_Boxcontrol_Menue.yhtm
+++ b/data/y-web/Y_Boxcontrol_Menue.yhtm
@@ -155,17 +155,27 @@ function epg_plus_popup() {
 				<li>
 					<a target="work" title="{=L:bc.menue.remote_desc=}" href="Y_Tools_Rcsim.yhtm">{=L:bc.menue.remote=}</a>
 				</li>
-				{=if-equal:{=ini-get:%(CONFIGDIR)/neutrino.conf;glcd_enable;0=}~1~
 				<li>
-					<a target="work" title="{=L:bc.menue.glcd_screenshot_desc=}" href="Y_Tools_Glcd_Screenshot.yhtm">{=L:bc.menue.glcd_screenshot=}</a>
-				</li>
-				~=}
-				<li>
-					<a target="work" title="OSD-{=L:bc.menue.screenshot=}" href="Y_Tools_Screenshot.yhtm?osd=1&rc={=ini-get:%(CONFIGDIR)/Y-Web.conf;screenshot_rc;false=}">OSD-{=L:bc.menue.screenshot=}</a>
-				</li>
-				<li>
-					<a target="work" title="TV-{=L:bc.menue.screenshot=}" href="Y_Tools_Screenshot.yhtm?video=1&rc={=ini-get:%(CONFIGDIR)/Y-Web.conf;screenshot_rc;false=}">TV-{=L:bc.menue.screenshot=}</a>
+					{=L:bc.menue.screenshot=}
 				</li>
+				<ul style="margin-left: 1em">
+					<li>
+						<a target="work" title="OSD-{=L:bc.menue.screenshot=}" href="Y_Tools_Screenshot.yhtm?osd=1&rc={=ini-get:/var/tuxbox/config/Y-Web.conf;screenshot_rc;false=}">OSD</a>
+					</li>
+					<li>
+						<a target="work" title="TV-{=L:bc.menue.screenshot=}" href="Y_Tools_Screenshot.yhtm?video=1&rc={=ini-get:/var/tuxbox/config/Y-Web.conf;screenshot_rc;false=}">TV</a>
+					</li>
+					{=if-equal:{=ini-get:/var/tuxbox/config/neutrino.conf;lcd4l_screenshots;0=}~1~
+					<li>
+						<a target="work" title="LCD4Linux-{=L:bc.menue.screenshot=}" href="Y_Tools_Screenshot_LCD4Linux.yhtm">LCD4Linux</a>
+					</li>
+					~=}
+					{=if-equal:{=ini-get:/var/tuxbox/config/neutrino.conf;glcd_enable;0=}~1~
+					<li>
+						<a target="work" title="GraphLCD-{=L:bc.menue.screenshot=}" href="Y_Tools_Glcd_Screenshot.yhtm">GraphLCD</a>
+					</li>
+					~=}
+				</ul>
 				<li>
 					<a target="work" href="Y_Timer_List.yhtm">{=L:live.timer=}</a>
 				</li>
diff --git a/data/y-web/Y_Tools_Glcd_Screenshot.yhtm b/data/y-web/Y_Tools_Screenshot_GraphLCD.yhtm
similarity index 100%
rename from data/y-web/Y_Tools_Glcd_Screenshot.yhtm
rename to data/y-web/Y_Tools_Screenshot_GraphLCD.yhtm
diff --git a/data/y-web/Y_Tools_Screenshot_LCD4Linux.yhtm b/data/y-web/Y_Tools_Screenshot_LCD4Linux.yhtm
new file mode 100644
index 000000000..d24caacbb
--- /dev/null
+++ b/data/y-web/Y_Tools_Screenshot_LCD4Linux.yhtm
@@ -0,0 +1,57 @@
+
+{=include-block:Y_NI_Blocks.txt;head=}
+<script type="text/javascript" src="/Y_Baselib.js"></script>
+<script type="text/javascript" src="/prototype.js"></script>
+<script type="text/javascript">
+//<![CDATA[
+var interval;
+
+function do_showshot() {
+	$('shot').src = "/tmp/lcd4linux.png?"+Math.random();
+	$('shot').show();
+}
+
+function do_reload(){
+	if (document.getElementById("checkReload").checked)
+		interval = setInterval(do_showshot, document.getElementById("inputReload").value + "000");
+	else
+		clearInterval(interval);
+}
+//]]>
+</script>
+</head>
+<body onload="do_showshot();">
+<div class="work_box" id="work_box">
+	<div class="work_box_head"><div class="work_box_head_h2">
+	{=var-set:menu=LCD4Linux-{=L:bc.menue.screenshot=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	<div class="work_box_body">
+		<div id="screenshot_header">
+		<div id="buttons" style="display: block">
+			<div class="right">
+				Reload: <input type="number" value="15" id="inputReload" min="1" max="180" title="{=L:bc.screenshot.reload_desc=}" disabled /> <input id="checkReload" name="checkReload" type="checkbox" />
+			</div>
+			<div class="clear"></div>
+		</div>
+		</div>
+		<table cellpadding="0" class="screenshot">
+		<tr>
+			<td class="shot">
+				<img id="shot" src="" style="display: none" />
+			</td>
+		</tr>
+		</table>
+	</div>
+</div>
+<script>
+document.getElementById('checkReload').onclick = function() {
+	if (this.checked ) {
+		interval = setInterval(do_showshot, document.getElementById("inputReload").value + "000");
+		document.getElementById("inputReload").disabled = false;
+	} else {
+		clearInterval(interval);
+		document.getElementById("inputReload").disabled = true;
+	}
+};
+</script>
+</body>
+</html>
diff --git a/data/y-web/Y_Tools_tvshot.yhtm b/data/y-web/Y_Tools_tvshot.yhtm
deleted file mode 100644
index 08c5e9733..000000000
--- a/data/y-web/Y_Tools_tvshot.yhtm
+++ /dev/null
@@ -1,51 +0,0 @@
-{=include-block:Y_Blocks.txt;head=}
-<script type="text/javascript" src="/Y_Baselib.js"></script>
-<script type="text/javascript" src="/prototype.js"></script>
-<script type="text/javascript">
-//<![CDATA[
-function do_snapshot(){
-	loadSyncURL("/control/screenshot");
-	window.setTimeout("do_showshot();", 3500);
-}
-function do_showshot(){
-	$('statusline').hide();
-	$('buttons').show();
-	$('shot').src = "/tmp/screenshot.png?"+Math.random();
-	$('shot').show();
-}
-function do_snapshot_again(){
-	$('buttons').hide();
-	$('statusline').show();
-	window.setTimeout('do_snapshot()', 100);
-}
-function do_clearshot(){
-	$('shot').hide();
-	loadSyncURL("/control/exec?Y_Tools&tvshot_clear");
-}
-//]]>
-</script>
-</head>
-<body onload="do_snapshot();">
-<div class="work_box">
-	<div class="work_box_head">
-		<div class="work_box_head_h2">
-			{=var-set:menu={=L:bc.menue.tv_screenshot=}=}
-			{=include-block:Y_Blocks.txt;work_menu=}
-		</div>
-	</div>
-	<div class="work_box_body">
-		<div style="height:30px;">
-		<span id="buttons" style="display: none;">
-			<button name="snapshot" ytype="shot" onclick="do_snapshot_again();">{=L:bc.tv.shot=}</button>
-			<button name="clearshot" ytype="clearshot" onclick="do_clearshot();">{=L:bc.tv.delete_shot=}</button>
-		</span>
-		<span id="statusline">
-			<img border="0" src="/images/wait.gif" width="20" height="20" alt="wait"/>
-			{=L:bc.tv.shap_wait_text=}
-		</span>
-		</div>
-		<img id="shot" src="" style="display: none; width: 100%; margin: 1em 0"/>
-	</div>
-</div>
-</body>
-</html>
diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt
index 4946c8c4d..008dfac46 100644
--- a/data/y-web/Y_Version.txt
+++ b/data/y-web/Y_Version.txt
@@ -1,3 +1,3 @@
-version=2.9.1.01
+version=2.9.1.02
 date=06.09.2022
 info=NI-Neutrino
diff --git a/data/y-web/languages/Deutsch b/data/y-web/languages/Deutsch
index ef9fc7ac5..6be891c21 100644
--- a/data/y-web/languages/Deutsch
+++ b/data/y-web/languages/Deutsch
@@ -84,8 +84,6 @@ bc.menue.messages_desc=Nachricht an die Box senden
 bc.menue.messages=Nachrichten
 bc.menue.remote_desc=Fernbedienung
 bc.menue.remote=Fernbedienung
-bc.menue.glcd_screenshot_desc=GLCD Screenshot erstellen
-bc.menue.glcd_screenshot=GLCD Screenshot
 bc.menue.screenshot=Screenshot
 
 bc.menue.decrease_volume=Lautst&auml;rke verringern
diff --git a/data/y-web/languages/English b/data/y-web/languages/English
index 9e071fc30..d49839424 100644
--- a/data/y-web/languages/English
+++ b/data/y-web/languages/English
@@ -84,8 +84,6 @@ bc.menue.messages_desc=send Messages to box
 bc.menue.messages=Messages
 bc.menue.remote_desc=Web-based Remote Control
 bc.menue.remote=Remote
-bc.menue.glcd_screenshot_desc=take a GLCD screenshot
-bc.menue.glcd_screenshot=GLCD Screenshot
 bc.menue.screenshot=Screenshot
 
 bc.menue.decrease_volume=decrease volumen