From 06bad717c4d05588e020d1c86db9741a03410dcb Mon Sep 17 00:00:00 2001 From: satbaby Date: Sun, 12 Sep 2010 10:20:33 +0000 Subject: [PATCH] only NEO have led git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@758 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- data/locale/deutsch.locale | 2 +- data/locale/english.locale | 2 +- data/locale/polski.locale | 2 +- data/locale/slovak.locale | 2 +- src/neutrino_menue.cpp | 11 +++++------ 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 52c959088..48c972fc4 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -635,7 +635,7 @@ lcdmenu.dim_brightness Helligkeit nach Dimm-Timeout lcdmenu.dim_time Dimm-Timeout lcdmenu.head VFD Einstellungen lcdmenu.inverse Invertieren -lcdmenu.lcdcontroler Kontrast/ Helligkeit +lcdmenu.lcdcontroler Helligkeit lcdmenu.power Power lcdmenu.statusline Statuszeile lcdmenu.statusline.both Lautstärke/ Fortschritt diff --git a/data/locale/english.locale b/data/locale/english.locale index 713bdd597..17f43acec 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -455,7 +455,7 @@ lcdcontroler.contrast Contrast lcdmenu.autodimm Auto dimm lcdmenu.head VFD Settings lcdmenu.inverse Invert -lcdmenu.lcdcontroler Contrast / Brightness +lcdmenu.lcdcontroler Brightness lcdmenu.power Power lcdmenu.statusline status line lcdmenu.statusline.both volume / playtime diff --git a/data/locale/polski.locale b/data/locale/polski.locale index 623263dfc..fd4408157 100644 --- a/data/locale/polski.locale +++ b/data/locale/polski.locale @@ -461,7 +461,7 @@ lcdcontroler.brightness Jasność lcdcontroler.brightnessstandby Jasność w trybie got. lcdcontroler.contrast Kontrast lcdmenu.head Ustawienia wyświtlacza -lcdmenu.lcdcontroler Kontrast/Jasność +lcdmenu.lcdcontroler Jasność lcdmenu.statusline Pasek stanu lcdmenu.statusline.playtime czas lcdmenu.statusline.volume głośność diff --git a/data/locale/slovak.locale b/data/locale/slovak.locale index 5f5266c54..8847ebde5 100644 --- a/data/locale/slovak.locale +++ b/data/locale/slovak.locale @@ -482,7 +482,7 @@ lcdmenu.dim_brightness Jas po zhasnutí lcdmenu.dim_time Čas zhasnutia lcdmenu.head Nastavenie VFD lcdmenu.inverse Invertovať -lcdmenu.lcdcontroler Kontrast/Jas +lcdmenu.lcdcontroler Jas lcdmenu.power Zapnutie lcdmenu.statusline Stavový riadok lcdmenu.statusline.both hlasitosť/hraný čas diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index dc7e250ab..38409b775 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -2710,17 +2710,16 @@ void CNeutrinoApp::InitLcdSettings(CMenuWidget &lcdSettings) lcdSettings.addItem(GenericMenuSeparatorLine); lcdSettings.addItem(new CMenuForwarder(LOCALE_LCDMENU_LCDCONTROLER, true, NULL, lcdsliders, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); - - CMenuWidget * ledMenu = new CMenuWidget(LOCALE_LEDCONTROLER_MENU, NEUTRINO_ICON_SETTINGS); - addMenueIntroItems(*ledMenu); - ledMenu->addItem(new CMenuOptionChooser(LOCALE_LEDCONTROLER_MODE_TV, &g_settings.led_tv_mode, LEDMENU_OPTIONS, LEDMENU_OPTION_COUNT, true, new CLedControlNotifier())); - ledMenu->addItem(new CMenuOptionChooser(LOCALE_LEDCONTROLER_MODE_STANDBY, &g_settings.led_standby_mode, LEDMENU_OPTIONS, LEDMENU_OPTION_COUNT, true)); if(cs_get_revision() > 7) { + CMenuWidget * ledMenu = new CMenuWidget(LOCALE_LEDCONTROLER_MENU, NEUTRINO_ICON_SETTINGS); + addMenueIntroItems(*ledMenu); + ledMenu->addItem(new CMenuOptionChooser(LOCALE_LEDCONTROLER_MODE_TV, &g_settings.led_tv_mode, LEDMENU_OPTIONS, LEDMENU_OPTION_COUNT, true, new CLedControlNotifier())); + ledMenu->addItem(new CMenuOptionChooser(LOCALE_LEDCONTROLER_MODE_STANDBY, &g_settings.led_standby_mode, LEDMENU_OPTIONS, LEDMENU_OPTION_COUNT, true)); ledMenu->addItem(new CMenuOptionChooser(LOCALE_LEDCONTROLER_MODE_DEEPSTANDBY, &g_settings.led_deep_mode, LEDMENU_OPTIONS, LEDMENU_OPTION_COUNT, true)); ledMenu->addItem(new CMenuOptionChooser(LOCALE_LEDCONTROLER_BLINK, &g_settings.led_blink, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); + lcdSettings.addItem(new CMenuForwarder(LOCALE_LEDCONTROLER_MENU, true, NULL, ledMenu, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN)); } - lcdSettings.addItem(new CMenuForwarder(LOCALE_LEDCONTROLER_MENU, true, NULL, ledMenu, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN)); lcdSettings.addItem(GenericMenuSeparatorLine); CMenuOptionChooser* oj = new CMenuOptionChooser(LOCALE_LCDMENU_STATUSLINE, &g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME], LCDMENU_STATUSLINE_OPTIONS, LCDMENU_STATUSLINE_OPTION_COUNT, true);