mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'check/next-cc'

Browse Source 
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h
This commit is contained in:
Stefan Seyfried
2013-09-01 19:46:10 +02:00
parent a5999ea165 4c8e32101c
commit 32de6beef0
163 changed files with 4066 additions and 1537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/gui/vfd_setup.cpp
View File

@@ -54,7 +54,7 @@ CVfdSetup::CVfdSetup()
{
width = w_max (40, 10);
dim_time = NULL;
vfd_enabled = (cs_get_revision() != 10);
vfd_enabled = (cs_get_revision() != 10) && (cs_get_revision() != 11);
}
CVfdSetup::~CVfdSetup()
@@ -130,6 +130,14 @@ int CVfdSetup::showSetup()
mf->setHint("", LOCALE_MENU_HINT_POWER_LEDS);
vfds->addItem(mf);
}
if(cs_get_revision() == 9)
{
CMenuWidget * blMenu = new CMenuWidget(LOCALE_LCDMENU_HEAD, NEUTRINO_ICON_LCD, width, MN_WIDGET_ID_VFDSETUP_BACKLIGHT);
showBacklightSetup(blMenu);
mf = new CMenuDForwarder(LOCALE_LEDCONTROLER_BACKLIGHT, true, NULL, blMenu, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
mf->setHint("", LOCALE_MENU_HINT_BACKLIGHT);
vfds->addItem(mf);
}
vfds->addItem(GenericMenuSeparatorLine);
@@ -215,6 +223,24 @@ void CVfdSetup::showLedSetup(CMenuWidget *mn_led_widget)
mn_led_widget->addItem(mc);
}
void CVfdSetup::showBacklightSetup(CMenuWidget *mn_led_widget)
{
CMenuOptionChooser * mc;
mn_led_widget->addIntroItems(LOCALE_LEDCONTROLER_BACKLIGHT);
mc = new CMenuOptionChooser(LOCALE_LEDCONTROLER_BACKLIGHT_TV, &g_settings.backlight_tv, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this);
mc->setHint("", LOCALE_MENU_HINT_LEDS_TV);
mn_led_widget->addItem(mc);
mc = new CMenuOptionChooser(LOCALE_LEDCONTROLER_MODE_STANDBY, &g_settings.backlight_standby, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
mc->setHint("", LOCALE_MENU_HINT_LEDS_STANDBY);
mn_led_widget->addItem(mc);
mc = new CMenuOptionChooser(LOCALE_LEDCONTROLER_MODE_DEEPSTANDBY, &g_settings.backlight_deepstandby, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
mc->setHint("", LOCALE_MENU_HINT_LEDS_DEEPSTANDBY);
mn_led_widget->addItem(mc);
}
bool CVfdSetup::changeNotify(const neutrino_locale_t OptionName, void */* data */)
{
@@ -236,5 +262,9 @@ bool CVfdSetup::changeNotify(const neutrino_locale_t OptionName, void */* data *
{
CVFD::getInstance()->setled();
}
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_LEDCONTROLER_BACKLIGHT_TV))
{
CVFD::getInstance()->setBacklight(g_settings.backlight_tv);
}
return false;
}