COsdSetup: show correct option in infobar tuner icon setup item

It could be confused for single stb users to see the option
'ON', although it is not possible.
So it's better to show only a possible or real option at item, if stb is in single mode or
item is disabled,
but the real value of g_settings.infobar_show_tuner is not touched.


Origin commit data
------------------
Branch: ni/coolstream
Commit: ca748c6f48
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-18 (Tue, 18 Sep 2012)

Origin message was:
------------------
*COsdSetup: show correct option in infobar tuner icon setup item

It could be confused for single stb users to see the option
'ON', although it is not possible.
So it's better to show only a possible or real option at item, if stb is in single mode or
item is disabled,
but the real value of g_settings.infobar_show_tuner is not touched.


------------------
This commit was generated by Migit
This commit is contained in:
2012-09-18 11:53:31 +02:00
parent 96ee0d7c1c
commit c28551f89d

View File

@@ -762,11 +762,18 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar)
menu_infobar->addItem(mc);
// tuner icon
bool mc_active = false;
int show_tuner_icon = 0;
// show possible option if we in single box mode, but don't touch the real settings
int *p_show_tuner_icon = &show_tuner_icon;
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);
mc_active = true;
// use the real value of g_settings.infobar_show_tuner
p_show_tuner_icon = &g_settings.infobar_show_tuner;
}
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_TUNER, p_show_tuner_icon, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, mc_active);
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);