From ad562a518a9b94066b31b5028033a0818f6dbe90 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Mon, 14 May 2012 21:56:16 +0200
Subject: [PATCH] infoviewer.cpp: more suitable icons for tuner

Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/3b1d063c04e28743a85bebfa0cf4558f79515583
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-05-14 (Mon, 14 May 2012)

Origin message was:
------------------
- infoviewer.cpp: more suitable icons for tuner
---
 data/icons/Makefile.am |   2 ++
 data/icons/tuner_1.png | Bin 0 -> 183 bytes
 data/icons/tuner_2.png | Bin 0 -> 183 bytes
 src/gui/infoviewer.cpp |  13 ++++++++++---
 src/gui/widget/icons.h |   2 ++
 5 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 data/icons/tuner_1.png
 create mode 100644 data/icons/tuner_2.png

diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 3e5c281ab..5cdd35240 100644
--- a/data/icons/Makefile.am
+++ b/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 \
diff --git a/data/icons/tuner_1.png b/data/icons/tuner_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..41cc06b5fb5e25d4207b93dc19557b603673be77
GIT binary patch
literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;V{wqX6T`Z5GB1G~wg8_HSD@tK
zSy~VHJ?uczB|(0{3=Yq3q=7g|-tI089jvk*Kn`btM`SSr1Gg{;GcwGYBLNg-FY)ws
zWxvD9E5aeP`R&E6Kp|OA7sn8e>&YwrAOG;*{xD;jfYps2S;v&dQ?LFrGCWNZQBJ=<
RV;xW-gQu&X%Q~loCIHG6FOvWO

literal 0
HcmV?d00001

diff --git a/data/icons/tuner_2.png b/data/icons/tuner_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..7749a9993071174600d51e8c8e06df59526e753a
GIT binary patch
literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;V{wqX6T`Z5GB1G~wg8_H*R)iI
z!?UzrKGAyxk}e7I3ubV5b|VeMN%D4gVd!9$^#F1>3p^r=85p>QL70(Y)*K0-AbW|Y
zuPgf<R$dVflf(xhAa$~yE{-7_*OOQLKmOsr{b9y50jp^}vW_W@r(XSMWVpCZ*n8);
RGC`n122WQ%mvv4FO#qdfFf#xE

literal 0
HcmV?d00001

diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index de264832b..bb19b7183 100644
--- a/src/gui/infoviewer.cpp
+++ b/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];
-	snprintf(icon_name, 3, "%d", tuner);
+	const char *icon_name = NULL;
+	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);
 }
 
diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h
index 698d54011..1f7df6ae3 100644
--- a/src/gui/widget/icons.h
+++ b/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"