mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 01:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

icons: rename NEUTRINO_ICON_SCRAMBLED2 => NEUTRINO_ICON_SCRAMBLED

Browse Source 
Origin commit data
------------------
Commit: da9d58fddf
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-10-16 (Sat, 16 Oct 2021)

Origin message was:
------------------
- icons: rename NEUTRINO_ICON_SCRAMBLED2 => NEUTRINO_ICON_SCRAMBLED
This commit is contained in:
vanhofen
2021-10-16 22:15:33 +02:00
parent 89d5b8105c
commit e855bd8d1c
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/icons/status/channel/Makefile.am
View File

@@ -3,8 +3,8 @@ installdir = $(ICONSDIR)
install_DATA = \ install_DATA = \
16_9.png \ 16_9.png \
16_9_gray.png \ 16_9_gray.png \
ca2.png \ ca.png \
ca2_gray.png \ ca_gray.png \
dd.png \ dd.png \
dd_avail.png \ dd_avail.png \
dd_gray.png \ dd_gray.png \

0
data/icons/status/channel/ca2.png → data/icons/status/channel/ca.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 367 B

After

Width:  |  Height:  |  Size: 367 B

0
data/icons/status/channel/ca2_gray.png → data/icons/status/channel/ca_gray.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 327 B

After

Width:  |  Height:  |  Size: 327 B

10
src/gui/infoviewer_bb.cpp
View File

@@ -206,7 +206,7 @@ void CInfoViewerBB::getBBIconInfo()
break; break;
case CInfoViewerBB::ICON_CA: case CInfoViewerBB::ICON_CA:
if (g_settings.infobar_casystem_display == 2) if (g_settings.infobar_casystem_display == 2)
iconView = checkBBIcon(NEUTRINO_ICON_SCRAMBLED2, &w, &h); iconView = checkBBIcon(NEUTRINO_ICON_SCRAMBLED, &w, &h);
break; break;
case CInfoViewerBB::ICON_TUNER: case CInfoViewerBB::ICON_TUNER:
if (CFEManager::getInstance()->getEnabledCount() > 1 && g_settings.infobar_show_tuner == 1 && !isTSMode && !IS_WEBCHAN(g_InfoViewer->get_current_channel_id())) if (CFEManager::getInstance()->getEnabledCount() > 1 && g_settings.infobar_show_tuner == 1 && !isTSMode && !IS_WEBCHAN(g_InfoViewer->get_current_channel_id()))
@@ -672,17 +672,17 @@ void CInfoViewerBB::showIcon_CA()
#if 0 #if 0
if (CNeutrinoApp::getInstance()->getMode() != NeutrinoModes::mode_radio) { if (CNeutrinoApp::getInstance()->getMode() != NeutrinoModes::mode_radio) {
if (scrambledNoSig) if (scrambledNoSig)
sIcon = NEUTRINO_ICON_SCRAMBLED2_BLANK; sIcon = NEUTRINO_ICON_SCRAMBLED_BLANK;
else { else {
if (fta) if (fta)
sIcon = NEUTRINO_ICON_SCRAMBLED2_GREY; sIcon = NEUTRINO_ICON_SCRAMBLED_GREY;
else else
sIcon = (scrambledErr) ? NEUTRINO_ICON_SCRAMBLED2_RED : NEUTRINO_ICON_SCRAMBLED2; sIcon = (scrambledErr) ? NEUTRINO_ICON_SCRAMBLED_RED : NEUTRINO_ICON_SCRAMBLED;
} }
} }
else else
#endif #endif
sIcon = (fta) ? NEUTRINO_ICON_SCRAMBLED2_GREY : NEUTRINO_ICON_SCRAMBLED2; sIcon = (fta) ? NEUTRINO_ICON_SCRAMBLED_GREY : NEUTRINO_ICON_SCRAMBLED;
showBBIcons(CInfoViewerBB::ICON_CA, sIcon); showBBIcons(CInfoViewerBB::ICON_CA, sIcon);
} }

4
src/gui/widget/icons.h
View File

@@ -275,8 +275,8 @@
#define NEUTRINO_ICON_RESOLUTION_HD "res_hd" #define NEUTRINO_ICON_RESOLUTION_HD "res_hd"
#define NEUTRINO_ICON_RESOLUTION_SD "res_sd" #define NEUTRINO_ICON_RESOLUTION_SD "res_sd"
#define NEUTRINO_ICON_RESOLUTION_UHD "res_uhd" #define NEUTRINO_ICON_RESOLUTION_UHD "res_uhd"
#define NEUTRINO_ICON_SCRAMBLED2 "ca2" #define NEUTRINO_ICON_SCRAMBLED "ca"
#define NEUTRINO_ICON_SCRAMBLED2_GREY "ca2_gray" #define NEUTRINO_ICON_SCRAMBLED_GREY "ca_gray"
#define NEUTRINO_ICON_SUBT "subt" #define NEUTRINO_ICON_SUBT "subt"
#define NEUTRINO_ICON_SUBT_GREY "subt_gray" #define NEUTRINO_ICON_SUBT_GREY "subt_gray"
#define NEUTRINO_ICON_TUNER "tuner" #define NEUTRINO_ICON_TUNER "tuner"