From 5ae57414b0326823e80ddbaddd88cd39b05ea96c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 13 Oct 2017 14:04:37 +0200 Subject: [PATCH 1/3] remove some obsolete icons definitions Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c53b385df64c0c288a26b5a579a43326b60096d9 Author: vanhofen Date: 2017-10-13 (Fri, 13 Oct 2017) Origin message was: ------------------ - remove some obsolete icons definitions ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/widget/icons.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index f812fab86..d7cf2bf9c 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -312,10 +312,6 @@ //NI #define NEUTRINO_ICON_HINT_IMAGELOGO "hint_imagelogo" #define NEUTRINO_ICON_HINT_VTXT "hint_vtxt" -#define NEUTRINO_ICON_HINT_ICONSPKG0 "hint_iconsPKG0" -#define NEUTRINO_ICON_HINT_ICONSPKG1 "hint_iconsPKG1" -#define NEUTRINO_ICON_HINT_ICONSPKG2 "hint_iconsPKG2" -#define NEUTRINO_ICON_HINT_ICONSPKG3 "hint_iconsPKG3" #define NEUTRINO_ICON_HINT_LCD4L "hint_lcd4linux" #define NEUTRINO_ICON_HINT_FCM "hint_FritzCallMonitor" #define NEUTRINO_ICON_HINT_EMMRD "hint_emmrd" From d2d00f8d7ab6e720e9eb8582740b11e213530a06 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 13 Oct 2017 14:06:04 +0200 Subject: [PATCH 2/3] yWeb: enable grab to do screenshots Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/641346d84b05f48d843d7fd6bea78448512da6ae Author: vanhofen Date: 2017-10-13 (Fri, 13 Oct 2017) Origin message was: ------------------ - yWeb: enable grab to do screenshots ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/y-web/Y_Tools_Check_Install.yhtm | 6 ++++++ data/y-web/Y_Tools_Screenshot.yhtm | 7 +++++-- data/y-web/scripts/Y_Tools.sh | 11 +++++++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/data/y-web/Y_Tools_Check_Install.yhtm b/data/y-web/Y_Tools_Check_Install.yhtm index b99f2749a..b1794292a 100644 --- a/data/y-web/Y_Tools_Check_Install.yhtm +++ b/data/y-web/Y_Tools_Check_Install.yhtm @@ -77,6 +77,12 @@ function do_check(){ =} /*programs*/ + {=var-set:grab={=find-exec:grab=}=} + {=if-empty:{=var-get:grab=}~ + sLog_addRow(sLog_body, "red", "Programs: grab is not installed. OSD Screenshot is disabled. ", "failed"); + ~ + sLog_addRow(sLog_body, "green", "Programs: grab is installed at: {=var-get:grab=}. OSD Screenshot is enabled.", "ok"); + =} {=var-set:fbshot={=find-exec:fbshot=}=} {=if-empty:{=var-get:fbshot=}~ sLog_addRow(sLog_body, "red", "Programs: fbshot is not installed. OSD Screenshot is disabled. ", "failed"); diff --git a/data/y-web/Y_Tools_Screenshot.yhtm b/data/y-web/Y_Tools_Screenshot.yhtm index 689551751..a28cbe6ca 100644 --- a/data/y-web/Y_Tools_Screenshot.yhtm +++ b/data/y-web/Y_Tools_Screenshot.yhtm @@ -1,3 +1,4 @@ +{=var-set:grab={=find-exec:grab=}=} {=var-set:fbshot={=find-exec:fbshot=}=} {=include-block:Y_NI_Blocks.txt;head=} @@ -43,8 +44,10 @@ function do_snapshot() { filename = id("filename").value; } - if ("{=var-get:fbshot=}" != "" && enableVideo == 0) - dbox_exec_tools("fbshot fb /tmp/"+filename+".png"); + if ("{=var-get:grab=}" != "" && enableVideo == 0) + dbox_exec_tools("fbshot grab -p -o /tmp/"+filename+".png"); + else if ("{=var-get:fbshot=}" != "" && enableVideo == 0) + dbox_exec_tools("fbshot fbshot /tmp/"+filename+".png"); else loadSyncURL("/control/screenshot?name="+filename+"&osd="+enableOSD+"&video="+enableVideo); diff --git a/data/y-web/scripts/Y_Tools.sh b/data/y-web/scripts/Y_Tools.sh index c362d159f..b292c1a81 100755 --- a/data/y-web/scripts/Y_Tools.sh +++ b/data/y-web/scripts/Y_Tools.sh @@ -479,17 +479,24 @@ do_lcshot() } # ----------------------------------------------------------- # osd shot -# $1= fb | dbox bzw. leer +# $1= fbshot | grab | dbox bzw. leer # ----------------------------------------------------------- do_fbshot() { - if [ "$1" = "fb" ]; then + if [ "$1" = "fbshot" ]; then shift 1 if [ -e "$y_path_varbin/fbshot" ]; then $y_path_varbin/fbshot $* else fbshot $* fi + elif [ "$1" = "grab" ]; then + shift 1 + if [ -e "$y_path_varbin/grab" ]; then + $y_path_varbin/grab $* + else + grab $* + fi else shift 1 if [ -e "$y_path_varbin/dboxshot" ]; then From 0062a38203f16c0db7c02a6e70065694d3d15913 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 12 Oct 2017 00:36:45 +0200 Subject: [PATCH 3/3] add UHD icons to infoviewer Conflicts: src/gui/infoviewer_bb.cpp Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/db184e3abe617543a410b3a0f4cbbff4f80f300f Author: vanhofen Date: 2017-10-12 (Thu, 12 Oct 2017) Origin message was: ------------------ - add UHD icons to infoviewer Conflicts: src/gui/infoviewer_bb.cpp ------------------ This commit was generated by Migit --- data/icons/status/channel/Makefile.am | 2 ++ data/icons/status/channel/res_2160.png | Bin 0 -> 426 bytes data/icons/status/channel/res_uhd.png | Bin 0 -> 310 bytes src/gui/infoviewer_bb.cpp | 7 ++++++- src/gui/widget/icons.h | 2 ++ 5 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 data/icons/status/channel/res_2160.png create mode 100644 data/icons/status/channel/res_uhd.png diff --git a/data/icons/status/channel/Makefile.am b/data/icons/status/channel/Makefile.am index 13e953abc..94419ca0e 100644 --- a/data/icons/status/channel/Makefile.am +++ b/data/icons/status/channel/Makefile.am @@ -16,6 +16,7 @@ install_DATA = \ res_1280.png \ res_1440.png \ res_1920.png \ + res_2160.png \ res_288.png \ res_352.png \ res_382.png \ @@ -27,6 +28,7 @@ install_DATA = \ res_720.png \ res_hd.png \ res_sd.png \ + res_uhd.png \ subt.png \ subt_gray.png \ tuner_1.png \ diff --git a/data/icons/status/channel/res_2160.png b/data/icons/status/channel/res_2160.png new file mode 100644 index 0000000000000000000000000000000000000000..e5c1a75fbe72a3fe00c872edafe71ca4c3401d41 GIT binary patch literal 426 zcmV;b0agBqP)Xe8c3YyH8@1rbFE2+VvZqWzMYi@L5OYi&sSpp=T@I6ey^3QimV zSZhH9sY}jUkhaByHYARVM-}5^L|gW!U_%O?XxI14-? ziy0WWg+Z8+Vb&aw9`+JXUsv{rT-+k&W+&bsRs#wh_H=O!u{eD-bR%!GfxsSxeFabd zegDAFGeIboTP4dZf!pOY+q8_EhxclCWd|+oRB$;VcCvK+_xmsZrTkr+d)xY?qYIBv z(-SSFQqQ7@X-8WGf<8Hi_7>;qxTsiKGPDRNC@phHi&1{CxBdISlG?q^#vO*wggXou zz5jhS?q_B}{`&WS*S$74|JhVB$7;o@SK8|9%P*TS9$40`!nbB?#w@k>U2C@5PdON< z=Ki(*-;-FzNvl_>sfUG5i18L&Ikz}@+2o%UOcxf0o;!U-e>2cK44$rjF6*2UngAO? Bd%XYv literal 0 HcmV?d00001 diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 5aca22d9d..40320d8c4 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -611,6 +611,9 @@ void CInfoViewerBB::showIcon_Resolution() if (g_settings.infobar_show_res == 0) {//show resolution icon on infobar videoDecoder->getPictureInfo(xres, yres, framerate); switch (yres) { + case 2160: + icon_name = NEUTRINO_ICON_RESOLUTION_2160; + break; case 1920: icon_name = NEUTRINO_ICON_RESOLUTION_1920; break; @@ -658,7 +661,9 @@ void CInfoViewerBB::showIcon_Resolution() } if (g_settings.infobar_show_res == 1) {//show simple resolution icon on infobar videoDecoder->getPictureInfo(xres, yres, framerate); - if (yres > 704) + if (yres > 1088) + icon_name = NEUTRINO_ICON_RESOLUTION_UHD; + else if (yres > 704) icon_name = NEUTRINO_ICON_RESOLUTION_HD; else if (yres >= 288) icon_name = NEUTRINO_ICON_RESOLUTION_SD; diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index d7cf2bf9c..f24880fa4 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -151,6 +151,7 @@ #define NEUTRINO_ICON_LCD "lcd" #define NEUTRINO_ICON_VOLUME "volume" #define NEUTRINO_ICON_RCLOCK "rclock" +#define NEUTRINO_ICON_RESOLUTION_2160 "res_2160" #define NEUTRINO_ICON_RESOLUTION_1920 "res_1920" #define NEUTRINO_ICON_RESOLUTION_1080 "res_1080" #define NEUTRINO_ICON_RESOLUTION_1440 "res_1440" @@ -165,6 +166,7 @@ #define NEUTRINO_ICON_RESOLUTION_352 "res_352" #define NEUTRINO_ICON_RESOLUTION_288 "res_288" #define NEUTRINO_ICON_RESOLUTION_000 "res_000" +#define NEUTRINO_ICON_RESOLUTION_UHD "res_uhd" #define NEUTRINO_ICON_RESOLUTION_HD "res_hd" #define NEUTRINO_ICON_RESOLUTION_SD "res_sd" #define NEUTRINO_ICON_PERSONALIZE "personalize"