mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 23:13:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

- yWeb: add pip to screenshot page

Browse Source
This commit is contained in:
vanhofen
2023-01-29 21:33:33 +01:00
committed by Thilo Graf
parent 4bc58e90ca
commit 181a129616
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
data/y-web/Y_Tools_Screenshot.yhtm
View File

@@ -8,16 +8,22 @@
//<![CDATA[ //<![CDATA[
var enableOSD; var enableOSD;
var enableVideo; var enableVideo;
var enablePiP;
var interval; var interval;
function checkEnable() { function checkEnable() {
enableOSD = (document.getElementById('checkOSD').checked == true) ? 1 : 0; enableOSD = (document.getElementById('checkOSD').checked == true) ? 1 : 0;
enableVideo = (document.getElementById('checkVideo').checked == true) ? 1 : 0; enableVideo = (document.getElementById('checkVideo').checked == true) ? 1 : 0;
enablePiP = (document.getElementById('checkPiP').checked == true) ? 1 : 0;
if (enableOSD == 0 && enableVideo == 0) { if (enableOSD == 0 && enableVideo == 0) {
alert("{=L:bc.screenshot.checkenable=}"); alert("{=L:bc.screenshot.checkenable=}");
return false; return false;
} }
if (enableVideo == 0 && enablePiP == 1) {
alert(unescape("{=L:bc.screenshot.checkpip=}"));
return false;
}
return true; return true;
} }
function rcsim(_key) { function rcsim(_key) {
@@ -48,12 +54,16 @@ function do_snapshot() {
if ("{=var-get:grab=}" != "") if ("{=var-get:grab=}" != "")
{ {
var pip_opts = "";
if (enableVideo == 1 && enablePiP == 1)
pip_opts = "-x 1 ";
if (enableOSD == 1 && enableVideo == 1) if (enableOSD == 1 && enableVideo == 1)
stb_exec_tools("fbshot grab -q -p /tmp/"+filename+".png"); stb_exec_tools("fbshot grab -q -p "+pip_opts+"/tmp/"+filename+".png");
else if (enableVideo == 1)
stb_exec_tools("fbshot grab -q -p -v "+pip_opts+"/tmp/"+filename+".png");
else if (enableOSD == 1) else if (enableOSD == 1)
stb_exec_tools("fbshot grab -q -p -o /tmp/"+filename+".png"); stb_exec_tools("fbshot grab -q -p -o /tmp/"+filename+".png");
else if (enableVideo == 1)
stb_exec_tools("fbshot grab -q -p -v /tmp/"+filename+".png");
} }
else if ("{=var-get:fbshot=}" != "" && enableVideo == 0) else if ("{=var-get:fbshot=}" != "" && enableVideo == 0)
stb_exec_tools("fbshot fbshot /tmp/"+filename+".png"); stb_exec_tools("fbshot fbshot /tmp/"+filename+".png");
@@ -119,6 +129,9 @@ function do_reload(){
{=L:filename=}: <input type="text" value="screenshot" id="filename" size="10" /> {=L:filename=}: <input type="text" value="screenshot" id="filename" size="10" />
OSD: <input id="checkOSD" name="checkOSD" type="checkbox" {=if-empty:{=osd=}~~checked="checked"=} /> OSD: <input id="checkOSD" name="checkOSD" type="checkbox" {=if-empty:{=osd=}~~checked="checked"=} />
TV: <input id="checkVideo" name="checkVideo" type="checkbox" {=if-empty:{=video=}~~checked="checked"=} /> TV: <input id="checkVideo" name="checkVideo" type="checkbox" {=if-empty:{=video=}~~checked="checked"=} />
{=if-empty:{=var-get:grab=}~~
PiP: <input id="checkPiP" name="checkPiP" type="checkbox" {=if-empty:{=pip=}~~checked="checked"=} />
=}
</form> </form>
</div> </div>
<div class="clear"></div> <div class="clear"></div>

4
data/y-web/Y_Version.txt
View File

@@ -1,3 +1,3 @@
version=2.9.2 version=2.9.3
date=14.01.2023 date=14.01.2023
info=Tuxbox-Neutrino info=Neutrino-Webinterface

1
data/y-web/languages/Deutsch
View File

@@ -126,6 +126,7 @@ bc.screenshot.create=Schnappschuss
bc.screenshot.delete=Schnappschuss l&ouml;schen bc.screenshot.delete=Schnappschuss l&ouml;schen
bc.screenshot.wait_text=Schnappschuss wird erstellt bc.screenshot.wait_text=Schnappschuss wird erstellt
bc.screenshot.checkenable=OSD und/oder TV muss aktiviert sein! bc.screenshot.checkenable=OSD und/oder TV muss aktiviert sein!
bc.screenshot.checkpip=F%FCr PiP muss TV aktiviert sein!
bc.screenshot.reload_desc=Reload-Intervall in Sekunden bc.screenshot.reload_desc=Reload-Intervall in Sekunden
# ===== Boxcontrol - Others # ===== Boxcontrol - Others

1
data/y-web/languages/English
View File

@@ -126,6 +126,7 @@ bc.screenshot.create=Screenshot
bc.screenshot.delete=Delete screenshot bc.screenshot.delete=Delete screenshot
bc.screenshot.wait_text=Create screenshot bc.screenshot.wait_text=Create screenshot
bc.screenshot.checkenable=OSD and/or TV must be enabled! bc.screenshot.checkenable=OSD and/or TV must be enabled!
bc.screenshot.checkpip=PiP requires TV enabled!
bc.screenshot.reload_desc=Reload interval in seconds bc.screenshot.reload_desc=Reload interval in seconds
# ===== Boxcontrol - Others # ===== Boxcontrol - Others