From 9983c27d79ddb5bd4dabeef2775ba0ab876c5223 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 10 Apr 2012 19:34:46 +0000 Subject: [PATCH] yweb: add screenshot to boxcontrol git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2212 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/1fb1709a3bf518bb3107d186864edf9973352340 Author: vanhofen Date: 2012-04-10 (Tue, 10 Apr 2012) Origin message was: ------------------ - yweb: add screenshot to boxcontrol git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2212 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/nhttpd/web/Y_Boxcontrol_Menue.yhtm | 5 ++- src/nhttpd/web/Y_Tools_remote_osd.yhtm | 2 +- src/nhttpd/web/Y_Tools_tvshot.yhtm | 51 ++++++++++++++++++++++++++ src/nhttpd/web/languages/Deutsch | 11 +++++- src/nhttpd/web/languages/English | 7 ++++ src/nhttpd/web/languages/Portuguese | 7 ++++ src/nhttpd/web/scripts/Y_Tools.sh | 1 + 7 files changed, 80 insertions(+), 4 deletions(-) create mode 100644 src/nhttpd/web/Y_Tools_tvshot.yhtm diff --git a/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm b/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm index 90802d838..601953b9a 100644 --- a/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm +++ b/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm @@ -91,10 +91,13 @@ function init(){
  • {=L:bc.menue.lcd_screenshot=}
    • =} ~=} + {=if-equal:{=global-var-get:boxtype=}~coolstream~ +
  • {=L:bc.menue.tv_screenshot=}
    • + ~=} {=if-equal:{=var-get:fbshot=}~true~
  • {=L:bc.menue.osd_screenshot=}
    • ~ -
  • {=L:bc.menue.osd_screenshot=}
    • =} {=if-equal:{=var-get:dboxshot=}~true~
  • {=L:bc.menue.remote_osd=}
    • diff --git a/src/nhttpd/web/Y_Tools_remote_osd.yhtm b/src/nhttpd/web/Y_Tools_remote_osd.yhtm index 6cd7140c8..6fe14f882 100644 --- a/src/nhttpd/web/Y_Tools_remote_osd.yhtm +++ b/src/nhttpd/web/Y_Tools_remote_osd.yhtm @@ -30,7 +30,7 @@ function do_clearshot2(){
    {=var-set:help_url=Help-BoxControl-Remote_OSD=}{=var-set:menu={=L:bc.menue.remote_osd=}=}{=include-block:Y_Blocks.txt;work_menu=}
    -
    +
    wait diff --git a/src/nhttpd/web/Y_Tools_tvshot.yhtm b/src/nhttpd/web/Y_Tools_tvshot.yhtm new file mode 100644 index 000000000..08c5e9733 --- /dev/null +++ b/src/nhttpd/web/Y_Tools_tvshot.yhtm @@ -0,0 +1,51 @@ +{=include-block:Y_Blocks.txt;head=} + + + + + +
    +
    +
    + {=var-set:menu={=L:bc.menue.tv_screenshot=}=} + {=include-block:Y_Blocks.txt;work_menu=} +
    +
    +
    +
    + + + wait + {=L:bc.tv.shap_wait_text=} + +
    + +
    +
    + + diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch index f6cbdb8d0..4586571d3 100644 --- a/src/nhttpd/web/languages/Deutsch +++ b/src/nhttpd/web/languages/Deutsch @@ -79,12 +79,14 @@ bc.menue.messages_desc=Nachricht an die Box senden bc.menue.messages=Nachrichten bc.menue.remote_desc=Fernbedinung bc.menue.remote=Fernbedienung -bc.menue.lcd_screenshot_desc=lcd screenshot machen +bc.menue.lcd_screenshot_desc=LCD Screenshot erstellen bc.menue.lcd_screenshot=LCD Screenshot bc.menue.lcd_screenshot_desc_ni=lcshot nicht installiert in /bin oder /var/bin -bc.menue.osd_screenshot_desc=osd screenshot machen +bc.menue.osd_screenshot_desc=OSD Screenshot erstellen bc.menue.osd_screenshot=OSD Screenshot bc.menue.osd_screenshot_desc_ni=fbshot nicht installiert in /bin oder /var/bin +bc.menue.tv_screenshot_desc=TV Screenshot erstellen +bc.menue.tv_screenshot=TV Screenshot bc.menue.remote_osd_desc=Fernbedienung und On Screen Display bc.menue.remote_osd=Fernbed. & OSD bc.menue.remote_osd_desc_ni=dboxshot nicht installiert in /bin oder /var/bin @@ -130,6 +132,11 @@ bc.osd.shot=Schnappschuss bc.osd.delete_shots=Schnappschuss löschen bc.osd.shap_wait_text=Schnappschuss wird erstellt +======== Boxcontrol - TV-Screenshot +bc.tv.shot=Schnappschuss +bc.tv.delete_shot=Schnappschuss löschen +bc.tv.shap_wait_text=Schnappschuss wird erstellt + ========= Boxcontrol - Others bc.channels=Sender diff --git a/src/nhttpd/web/languages/English b/src/nhttpd/web/languages/English index a2df906c1..cec1fb334 100644 --- a/src/nhttpd/web/languages/English +++ b/src/nhttpd/web/languages/English @@ -87,6 +87,8 @@ bc.menue.lcd_screenshot_desc_ni=lcshot not installed at /bin or /var/bin bc.menue.osd_screenshot_desc=make osd screenshot bc.menue.osd_screenshot=OSD Screenshot bc.menue.osd_screenshot_desc_ni=fbshot not installed at /bin or /var/bin +bc.menue.tv_screenshot_desc=make tv screenshot +bc.menue.tv_screenshot=TV Screenshot bc.menue.remote_osd_desc=remote and osd bc.menue.remote_osd=Remote & OSD bc.menue.remote_osd_desc_ni=dboxshot not installed at /bin or /var/bin @@ -132,6 +134,11 @@ bc.osd.shot=Shot bc.osd.delete_shots=Delete shots bc.osd.shap_wait_text=Take Snapshot +======== Boxcontrol - TV-Screenshot +bc.tv.shot=Shot +bc.tv.delete_shot=Delete shot +bc.tv.shap_wait_text=Take Snapshot + ========= Boxcontrol - Others bc.channels=Channels diff --git a/src/nhttpd/web/languages/Portuguese b/src/nhttpd/web/languages/Portuguese index e7633d183..afa3c0913 100644 --- a/src/nhttpd/web/languages/Portuguese +++ b/src/nhttpd/web/languages/Portuguese @@ -87,6 +87,8 @@ bc.menue.lcd_screenshot_desc_ni=lcshot não se encontra instalado em /bin ou /va bc.menue.osd_screenshot_desc=fazer um osd screenshot bc.menue.osd_screenshot=OSD Screenshot bc.menue.osd_screenshot_desc_ni=fbshot não se encontra instalado em /bin ou /var/bin +bc.menue.tv_screenshot_desc=frazer um tv screenshot +bc.menue.tv_screenshot=TV Screenshot bc.menue.remote_osd_desc=remote e osd bc.menue.remote_osd=Remote & OSD bc.menue.remote_osd_desc_ni=dboxshot não se encontra instalado em /bin ou /var/bin @@ -132,6 +134,11 @@ bc.osd.shot=Shot bc.osd.delete_shots=Apagar shots bc.osd.shap_wait_text=Fazer Snapshot +======== Boxcontrol - TV-Screenshot +bc.tv.shot=Shot +bc.tv.delete_shot=Apagar shots +bc.tv.shap_wait_text=Frazer Snapshot + ========= Boxcontrol - Others bc.channels=Canais diff --git a/src/nhttpd/web/scripts/Y_Tools.sh b/src/nhttpd/web/scripts/Y_Tools.sh index 7182cc195..4d22e473e 100755 --- a/src/nhttpd/web/scripts/Y_Tools.sh +++ b/src/nhttpd/web/scripts/Y_Tools.sh @@ -565,6 +565,7 @@ case "$1" in lcshot) shift 1; do_lcshot $* ;; fbshot) shift 1; do_fbshot $* ;; fbshot_clear) do_fbshot_clear ;; + tvshot_clear) rm -f /tmp/screenshot.png ;; get_update_version_dbox) wget -O /tmp/version.txt "http://www.yjogol.com/download/Y_Version.txt" ;; get_update_version_coolstream) wget -O /tmp/version.txt "http://www.yjogol.com/download/coolstream/Y_Version.txt" ;; settings_backup_restore) shift 1; do_settings_backup_restore $* ;;