- infoviewer.cpp: more suitable icons for tuner

data/icons/Makefile.am

@@ -185,6 +185,8 @@ install_DATA = \
 	suomi.png \
 	svenska.png \
 	timer.png \
+	tuner_1.png \
+	tuner_2.png \
 	up.png \
 	upnp.png \
 	via_green.png \

src/gui/infoviewer.cpp

@@ -488,11 +488,18 @@ void CInfoViewer::paintshowButtonBar()
 
 void CInfoViewer::showIcon_Tuner() const
 {
-	//FIXME test
 	int tuner_x = BoxEndX - 2 - (((g_settings.casystem_display !=2) ? 0:icon_crypt_width )+ icon_xres_width + 2*icon_large_width + 3*icon_small_width + ((g_settings.casystem_display !=2) ?5:6)*2);
 	int tuner = 1 + CFEManager::getInstance()->getLiveFE()->getNumber();
-	char icon_name[3];
+	const char *icon_name = NULL;
-	snprintf(icon_name, 3, "%d", tuner);
+	switch (tuner) {
+		case 2:
+			icon_name = NEUTRINO_ICON_TUNER_2;
+			break;
+		case 1:
+		default:
+			icon_name = NEUTRINO_ICON_TUNER_1;
+			break;
+	}
 	frameBuffer->paintIcon(icon_name, tuner_x, BBarY, InfoHeightY_Info);
 }
 

src/gui/widget/icons.h

@@ -110,6 +110,8 @@
 #define NEUTRINO_ICON_SHELL		"shell"
 #define NEUTRINO_ICON_STREAMING		"streaming"
 #define NEUTRINO_ICON_TIMER		"timer"
+#define NEUTRINO_ICON_TUNER_1		"tuner_1"
+#define NEUTRINO_ICON_TUNER_2		"tuner_2"
 #define NEUTRINO_ICON_UPDATE		"softupdate"
 #define NEUTRINO_ICON_UPNP		"upnp"
 #define NEUTRINO_ICON_VIDEO		"video"