- infoviewer: rework tuner icons

Conflicts:
	data/icons/status/channel/tuner_1.png
	data/icons/status/channel/tuner_2.png
	data/icons/status/channel/tuner_3.png
	data/icons/status/channel/tuner_4.png

Signed-off-by: Thilo Graf <dbt@novatux.de>

I think it's not an excellent idea to have many icons for all possible
tuner numbers. We should use one and only icon without any number
and paint a text over the icon. This should be possible with a simple
cc text object that contains a defined png-file file as background
and a digit as text.

data/icons/status/channel/Makefile.am

@@ -31,9 +31,36 @@ install_DATA = \
 	res_uhd.png \
 	subt.png \
 	subt_gray.png \
-	tuner_1.png \
-	tuner_2.png \
-	tuner_3.png \
-	tuner_4.png \
 	vtxt.png \
 	vtxt_gray.png
+
+install_DATA += \
+	tuner.png \
+	tuner_01.png \
+	tuner_02.png \
+	tuner_03.png \
+	tuner_04.png
+
+if ! BOXTYPE_CST
+install_DATA += \
+	tuner_05.png \
+	tuner_06.png \
+	tuner_07.png \
+	tuner_08.png \
+	tuner_09.png \
+	tuner_10.png \
+	tuner_11.png \
+	tuner_12.png \
+	tuner_13.png \
+	tuner_14.png \
+	tuner_15.png \
+	tuner_16.png \
+	tuner_17.png \
+	tuner_18.png \
+	tuner_19.png \
+	tuner_20.png \
+	tuner_21.png \
+	tuner_22.png \
+	tuner_23.png \
+	tuner_24.png
+endif

src/gui/infoviewer_bb.cpp

@@ -193,7 +193,7 @@ void CInfoViewerBB::getBBIconInfo()
 			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()))
-				iconView = checkBBIcon(NEUTRINO_ICON_TUNER_1, &w, &h);
+				iconView = checkBBIcon(NEUTRINO_ICON_TUNER, &w, &h);
 			break;
 		default:
 			break;
@@ -678,22 +678,13 @@ void CInfoViewerBB::showIcon_Tuner()
 		return;
 	}
 
-	std::string icon_name;
-	switch (CFEManager::getInstance()->getLiveFE()->getNumber()) {
-		case 1:
-			icon_name = NEUTRINO_ICON_TUNER_2;
-			break;
-		case 2:
-			icon_name = NEUTRINO_ICON_TUNER_3;
-			break;
-		case 3:
-			icon_name = NEUTRINO_ICON_TUNER_4;
-			break;
-		case 0:
-		default:
-			icon_name = NEUTRINO_ICON_TUNER_1;
-			break;
-	}
+	char icon_name[12];
+	snprintf(icon_name, sizeof(icon_name), "%s_%02d", NEUTRINO_ICON_TUNER, CFEManager::getInstance()->getLiveFE()->getNumber() + 1);
+
+	int w = 0, h = 0;
+	if (!checkBBIcon(icon_name, &w, &h))
+		snprintf(icon_name, sizeof(icon_name), "%s", NEUTRINO_ICON_TUNER);
+
 	showBBIcons(CInfoViewerBB::ICON_TUNER, icon_name);
 }
 

src/gui/widget/icons.h

@@ -273,10 +273,7 @@
 #define NEUTRINO_ICON_SCRAMBLED2_GREY	"ca2_gray"
 #define NEUTRINO_ICON_SUBT		"subt"
 #define NEUTRINO_ICON_SUBT_GREY		"subt_gray"
-#define NEUTRINO_ICON_TUNER_1		"tuner_1"
-#define NEUTRINO_ICON_TUNER_2		"tuner_2"
-#define NEUTRINO_ICON_TUNER_3		"tuner_3"
-#define NEUTRINO_ICON_TUNER_4		"tuner_4"
+#define NEUTRINO_ICON_TUNER		"tuner"
 #define NEUTRINO_ICON_VTXT		"vtxt"
 #define NEUTRINO_ICON_VTXT_GREY		"vtxt_gray"