diff --git a/data/icons/status/channel/Makefile.am b/data/icons/status/channel/Makefile.am index bbb3ee71f..b06a574fb 100644 --- a/data/icons/status/channel/Makefile.am +++ b/data/icons/status/channel/Makefile.am @@ -3,8 +3,8 @@ installdir = $(ICONSDIR) install_DATA = \ 16_9.png \ 16_9_gray.png \ - ca2.png \ - ca2_gray.png \ + ca.png \ + ca_gray.png \ dd.png \ dd_avail.png \ dd_gray.png \ diff --git a/data/icons/status/channel/ca2.png b/data/icons/status/channel/ca.png similarity index 100% rename from data/icons/status/channel/ca2.png rename to data/icons/status/channel/ca.png diff --git a/data/icons/status/channel/ca2_gray.png b/data/icons/status/channel/ca_gray.png similarity index 100% rename from data/icons/status/channel/ca2_gray.png rename to data/icons/status/channel/ca_gray.png diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 068a9aada..27efd108b 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -189,7 +189,7 @@ void CInfoViewerBB::getBBIconInfo() break; case CInfoViewerBB::ICON_CA: if (g_settings.infobar_casystem_display == 2) - iconView = checkBBIcon(NEUTRINO_ICON_SCRAMBLED2, &w, &h); + iconView = checkBBIcon(NEUTRINO_ICON_SCRAMBLED, &w, &h); break; case CInfoViewerBB::ICON_TUNER: if (CFEManager::getInstance()->getEnabledCount() > 1 && g_settings.infobar_show_tuner == 1 && !isTSMode && !IS_WEBCHAN(g_InfoViewer->get_current_channel_id())) @@ -651,17 +651,17 @@ void CInfoViewerBB::showIcon_CA() #if 0 if (CNeutrinoApp::getInstance()->getMode() != NeutrinoModes::mode_radio) { if (scrambledNoSig) - sIcon = NEUTRINO_ICON_SCRAMBLED2_BLANK; + sIcon = NEUTRINO_ICON_SCRAMBLED_BLANK; else { if (fta) - sIcon = NEUTRINO_ICON_SCRAMBLED2_GREY; + sIcon = NEUTRINO_ICON_SCRAMBLED_GREY; else - sIcon = (scrambledErr) ? NEUTRINO_ICON_SCRAMBLED2_RED : NEUTRINO_ICON_SCRAMBLED2; + sIcon = (scrambledErr) ? NEUTRINO_ICON_SCRAMBLED_RED : NEUTRINO_ICON_SCRAMBLED; } } else #endif - sIcon = (fta) ? NEUTRINO_ICON_SCRAMBLED2_GREY : NEUTRINO_ICON_SCRAMBLED2; + sIcon = (fta) ? NEUTRINO_ICON_SCRAMBLED_GREY : NEUTRINO_ICON_SCRAMBLED; showBBIcons(CInfoViewerBB::ICON_CA, sIcon); } diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index e1e3aab28..34153e57f 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -274,8 +274,8 @@ #define NEUTRINO_ICON_RESOLUTION_HD "res_hd" #define NEUTRINO_ICON_RESOLUTION_SD "res_sd" #define NEUTRINO_ICON_RESOLUTION_UHD "res_uhd" -#define NEUTRINO_ICON_SCRAMBLED2 "ca2" -#define NEUTRINO_ICON_SCRAMBLED2_GREY "ca2_gray" +#define NEUTRINO_ICON_SCRAMBLED "ca" +#define NEUTRINO_ICON_SCRAMBLED_GREY "ca_gray" #define NEUTRINO_ICON_SUBT "subt" #define NEUTRINO_ICON_SUBT_GREY "subt_gray" #define NEUTRINO_ICON_TUNER "tuner"