From 807dce94976a2f7d0da1d494eeab5ea487d78f93 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Thu, 30 Aug 2012 15:42:31 +0200 Subject: [PATCH] *CInfoViewer: don't show tuner icon with single boxes --- src/gui/infoviewer.cpp | 3 ++- src/gui/infoviewer_bb.cpp | 6 ++++-- src/gui/osd_setup.cpp | 9 ++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 043bc0a90..0b6883847 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -1152,7 +1152,8 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data) infoViewerBB->showIcon_SubT(); //infoViewerBB->showIcon_CA_Status(0); infoViewerBB->showIcon_Resolution(); - infoViewerBB->showIcon_Tuner(); + if (CFEManager::getInstance()->getMode() != CFEManager::FE_MODE_SINGLE) + infoViewerBB->showIcon_Tuner(); } } return messages_return::handled; diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index b8e2bb967..e03621c76 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -180,8 +180,10 @@ void CInfoViewerBB::getBBIconInfo() iconView = checkBBIcon(NEUTRINO_ICON_SCRAMBLED2, &w, &h); break; case CInfoViewerBB::ICON_TUNER: - if (g_settings.infobar_show_tuner == 1) { - iconView = checkBBIcon(NEUTRINO_ICON_TUNER_1, &w, &h); + if (CFEManager::getInstance()->getMode() != CFEManager::FE_MODE_SINGLE) { + if (g_settings.infobar_show_tuner == 1) { + iconView = checkBBIcon(NEUTRINO_ICON_TUNER_1, &w, &h); + } } break; default: diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 688c37c87..8dd62f4fc 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -52,6 +52,7 @@ #include #include +#include #include extern CRemoteControl * g_RemoteControl; @@ -761,9 +762,11 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar) menu_infobar->addItem(mc); // tuner icon - mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_TUNER, &g_settings.infobar_show_tuner, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); - mc->setHint("", LOCALE_MENU_HINT_INFOBAR_TUNER); - menu_infobar->addItem(mc); + if (CFEManager::getInstance()->getMode() != CFEManager::FE_MODE_SINGLE){ + mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_TUNER, &g_settings.infobar_show_tuner, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + mc->setHint("", LOCALE_MENU_HINT_INFOBAR_TUNER); + menu_infobar->addItem(mc); + } // show on epg change mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW, &g_settings.infobar_show, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);