From fef25aade186b63f38a6f5fee38e1ca4af1f5b83 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 16 Oct 2021 22:23:14 +0200 Subject: [PATCH] icons: rename radiotext icons Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/363512dac2225c2758516fbddcf4ea264e5ed18e Author: vanhofen Date: 2021-10-16 (Sat, 16 Oct 2021) Origin message was: ------------------ - icons: rename radiotext icons ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/icons/status/channel/Makefile.am | 6 +++--- .../channel/{radiotextget.png => radiotext_get.png} | Bin .../channel/{radiotextoff.png => radiotext_off.png} | Bin .../{radiotextwait.png => radiotext_wait.png} | Bin src/gui/infoviewer_bb.cpp | 6 +++--- src/gui/widget/icons.h | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) rename data/icons/status/channel/{radiotextget.png => radiotext_get.png} (100%) rename data/icons/status/channel/{radiotextoff.png => radiotext_off.png} (100%) rename data/icons/status/channel/{radiotextwait.png => radiotext_wait.png} (100%) diff --git a/data/icons/status/channel/Makefile.am b/data/icons/status/channel/Makefile.am index b06a574fb..5fa7a314b 100644 --- a/data/icons/status/channel/Makefile.am +++ b/data/icons/status/channel/Makefile.am @@ -8,9 +8,9 @@ install_DATA = \ dd.png \ dd_avail.png \ dd_gray.png \ - radiotextget.png \ - radiotextoff.png \ - radiotextwait.png \ + radiotext_get.png \ + radiotext_off.png \ + radiotext_wait.png \ res_000.png \ res_1080.png \ res_1280.png \ diff --git a/data/icons/status/channel/radiotextget.png b/data/icons/status/channel/radiotext_get.png similarity index 100% rename from data/icons/status/channel/radiotextget.png rename to data/icons/status/channel/radiotext_get.png diff --git a/data/icons/status/channel/radiotextoff.png b/data/icons/status/channel/radiotext_off.png similarity index 100% rename from data/icons/status/channel/radiotextoff.png rename to data/icons/status/channel/radiotext_off.png diff --git a/data/icons/status/channel/radiotextwait.png b/data/icons/status/channel/radiotext_wait.png similarity index 100% rename from data/icons/status/channel/radiotextwait.png rename to data/icons/status/channel/radiotext_wait.png diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 0749a6876..85c7eeec6 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -190,7 +190,7 @@ void CInfoViewerBB::getBBIconInfo() break; case CInfoViewerBB::ICON_RT: if (isRadioMode && g_settings.radiotext_enable) - iconView = checkBBIcon(NEUTRINO_ICON_RADIOTEXTGET, &w, &h); + iconView = checkBBIcon(NEUTRINO_ICON_RADIOTEXT_GET, &w, &h); break; case CInfoViewerBB::ICON_DD: if( g_settings.infobar_show_dd_available ) @@ -562,9 +562,9 @@ void CInfoViewerBB::showIcon_RadioText(bool rt_available) std::string rt_icon; if (rt_available) - rt_icon = (g_Radiotext->S_RtOsd) ? NEUTRINO_ICON_RADIOTEXTGET : NEUTRINO_ICON_RADIOTEXTWAIT; + rt_icon = (g_Radiotext->S_RtOsd) ? NEUTRINO_ICON_RADIOTEXT_GET : NEUTRINO_ICON_RADIOTEXT_WAIT; else - rt_icon = NEUTRINO_ICON_RADIOTEXTOFF; + rt_icon = NEUTRINO_ICON_RADIOTEXT_OFF; showBBIcons(CInfoViewerBB::ICON_RT, rt_icon); } diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index 88518f741..0231b7455 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -254,9 +254,9 @@ #define NEUTRINO_ICON_DD "dd" #define NEUTRINO_ICON_DD_AVAIL "dd_avail" #define NEUTRINO_ICON_DD_GREY "dd_gray" -#define NEUTRINO_ICON_RADIOTEXTGET "radiotextget" -#define NEUTRINO_ICON_RADIOTEXTOFF "radiotextoff" -#define NEUTRINO_ICON_RADIOTEXTWAIT "radiotextwait" +#define NEUTRINO_ICON_RADIOTEXT_GET "radiotext_get" +#define NEUTRINO_ICON_RADIOTEXT_OFF "radiotext_off" +#define NEUTRINO_ICON_RADIOTEXT_WAIT "radiotext_wait" #define NEUTRINO_ICON_RESOLUTION_000 "res_000" #define NEUTRINO_ICON_RESOLUTION_288 "res_288" #define NEUTRINO_ICON_RESOLUTION_352 "res_352" @@ -275,7 +275,7 @@ #define NEUTRINO_ICON_RESOLUTION_HD "res_hd" #define NEUTRINO_ICON_RESOLUTION_SD "res_sd" #define NEUTRINO_ICON_RESOLUTION_UHD "res_uhd" -#define NEUTRINO_ICON_SCRAMBLED "ca" +#define NEUTRINO_ICON_SCRAMBLED "ca" #define NEUTRINO_ICON_SCRAMBLED_GREY "ca_gray" #define NEUTRINO_ICON_SUBT "subt" #define NEUTRINO_ICON_SUBT_GREY "subt_gray"