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 000000000..e5c1a75fb Binary files /dev/null and b/data/icons/status/channel/res_2160.png differ diff --git a/data/icons/status/channel/res_uhd.png b/data/icons/status/channel/res_uhd.png new file mode 100644 index 000000000..250127a90 Binary files /dev/null and b/data/icons/status/channel/res_uhd.png differ 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"