diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 7ccc58506..b2ed4fad0 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -641,9 +641,14 @@ lcdmenu.statusline Statuszeile lcdmenu.statusline.both Lautstärke/ Fortschritt lcdmenu.statusline.playtime Sendungsfortschritt lcdmenu.statusline.volume Lautstärke +ledcontroler.menu Power Button LED´s ledcontroler.mode.tv Led ledcontroler.mode.deepstandby Led DeepStandby ledcontroler.mode.standby Led Standby +ledcontroler.off Led1 & Led2 off +ledcontroler.on.all Led1 & Led2 on +ledcontroler.on.led1 Led1 on +ledcontroler.on.led2 Led2 on mainmenu.audioplayer Audioplayer mainmenu.clearsectionsd Lösche EPG Cache mainmenu.games Spiele diff --git a/data/locale/english.locale b/data/locale/english.locale index f8887b2df..ea55a485f 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -461,9 +461,14 @@ lcdmenu.statusline status line lcdmenu.statusline.both volume / playtime lcdmenu.statusline.playtime playtime lcdmenu.statusline.volume volume +ledcontroler.menu Power Button LED´s ledcontroler.mode.tv Led ledcontroler.mode.deepstandby Led DeepStandby ledcontroler.mode.standby Led Standby +ledcontroler.off Led1 & Led2 off +ledcontroler.on.all Led1 & Led2 on +ledcontroler.on.led1 Led1 on +ledcontroler.on.led2 Led2 on mainmenu.audioplayer Audioplayer mainmenu.games Games mainmenu.head Main Menu diff --git a/src/driver/vfd.cpp b/src/driver/vfd.cpp index be92f169d..7cfc49f60 100644 --- a/src/driver/vfd.cpp +++ b/src/driver/vfd.cpp @@ -191,6 +191,12 @@ void CVFD::setled(void) case 1: led1 = VFD_LED_1_ON; led2 = VFD_LED_2_ON; break; + case 2: + led1 = VFD_LED_1_ON; led2 = VFD_LED_2_OFF; + break; + case 3: + led1 = VFD_LED_1_OFF; led2 = VFD_LED_2_ON; + break; default: break; } diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index 607081497..c4e55b854 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -70,7 +70,7 @@ int EpgPlus::sliderWidth = 0; int EpgPlus::channelsTableWidth = 0; static EpgPlus::FontSetting fontSettingTable[] = { - { EpgPlus::EPGPlus_header_font, "Bold", 20 }, + { EpgPlus::EPGPlus_header_font, "Regular", 27 }, { EpgPlus::EPGPlus_timeline_fonttime, "Bold", 16 }, { EpgPlus::EPGPlus_timeline_fontdate, "Bold", 14 }, { EpgPlus::EPGPlus_channelentry_font, "Bold", 16 }, @@ -127,7 +127,7 @@ void EpgPlus::Header::paint(const char * Name) //this->width - 20, g_Locale->getText (LOCALE_EPGPLUS_HEAD) , COL_MENUHEAD, 0, true); int icol_w, icol_h; frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_HELP, &icol_w, &icol_h); - this->frameBuffer->paintIcon (NEUTRINO_ICON_BUTTON_HELP, this->x + this->width - icol_w - RADIUS_LARGE - 10, this->y, icol_h); + this->frameBuffer->paintIcon (NEUTRINO_ICON_BUTTON_HELP, this->x + this->width - icol_w - RADIUS_LARGE - 10, this->y+ ((this->font->getHeight()-icol_h)/2), icol_h); } @@ -656,7 +656,6 @@ void EpgPlus::init() usableScreenWidth = w_max (g_settings.screen_EndX, 0); usableScreenHeight = h_max (g_settings.screen_EndY, 0); std::string FileName = std::string (g_settings.font_file); - fontSettingTable[0].size = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); for (size_t i = 0; i < NumberOfFontSettings; ++i) { int size = fontSettingTable[i].size; if (bigfont && (fontSettingTable[i].settingID == EpgPlus::EPGPlus_channelentry_font || diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 007ef9c90..bedceae3d 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3738,9 +3738,26 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode) if(timer_minutes) fp_timer = (timer_minutes - mtime)/60; printf("now: %ld, timer %ld, FP timer %ld\n", mtime/60, timer_minutes/60, fp_timer);fflush(stdout); + int leds = 0x40; + switch(g_settings.led_deep_mode){ + case 0: + leds = 0x0;//off leds + break; + case 1: + leds = 0x60;//on led1 & 2 + break; + case 2: + leds = 0x20;//led1 on , 2 off + break; + case 3: + leds = 0x40;//led2 off, 2 on + break; + default: + break; + } standby.brightness = g_settings.lcd_setting[SNeutrinoSettings::LCD_DEEPSTANDBY_BRIGHTNESS]; - standby.flags = g_settings.led_deep_mode ? 0x40:0; + standby.flags = leds; standby.current_hour = tmtime->tm_hour; standby.current_minute = tmtime->tm_min; standby.timer_minutes_hi = fp_timer >> 8;; diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 767910796..9cdf4d1b6 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -2634,6 +2634,15 @@ const CMenuOptionChooser::keyval LCDMENU_STATUSLINE_OPTIONS[LCDMENU_STATUSLINE_O //,{ 2, LOCALE_LCDMENU_STATUSLINE_BOTH } }; +#define LEDMENU_OPTION_COUNT 4 +const CMenuOptionChooser::keyval LEDMENU_OPTIONS[LEDMENU_OPTION_COUNT] = +{ + { 0, LOCALE_LEDCONTROLER_OFF }, + { 1, LOCALE_LEDCONTROLER_ON_ALL }, + { 2, LOCALE_LEDCONTROLER_ON_LED1 }, + { 3, LOCALE_LEDCONTROLER_ON_LED2 } +}; + void CNeutrinoApp::InitLcdSettings(CMenuWidget &lcdSettings) { addMenueIntroItems(lcdSettings); @@ -2660,14 +2669,14 @@ 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_MODE_TV, NEUTRINO_ICON_SETTINGS); + 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, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, new CLedControlNotifier())); - ledMenu->addItem(new CMenuOptionChooser(LOCALE_LEDCONTROLER_MODE_STANDBY, &g_settings.led_standby_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); + 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) - ledMenu->addItem(new CMenuOptionChooser(LOCALE_LEDCONTROLER_MODE_DEEPSTANDBY, &g_settings.led_deep_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); + ledMenu->addItem(new CMenuOptionChooser(LOCALE_LEDCONTROLER_MODE_DEEPSTANDBY, &g_settings.led_deep_mode, LEDMENU_OPTIONS, LEDMENU_OPTION_COUNT, true)); - lcdSettings.addItem(new CMenuForwarder(LOCALE_LEDCONTROLER_MODE_TV, 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); diff --git a/src/system/locals.h b/src/system/locals.h index 6b1f3d72e..501c9e010 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -493,9 +493,14 @@ typedef enum { LOCALE_LCDMENU_STATUSLINE_BOTH, LOCALE_LCDMENU_STATUSLINE_PLAYTIME, LOCALE_LCDMENU_STATUSLINE_VOLUME, + LOCALE_LEDCONTROLER_MENU, LOCALE_LEDCONTROLER_MODE_TV, LOCALE_LEDCONTROLER_MODE_DEEPSTANDBY, LOCALE_LEDCONTROLER_MODE_STANDBY, + LOCALE_LEDCONTROLER_OFF, + LOCALE_LEDCONTROLER_ON_ALL, + LOCALE_LEDCONTROLER_ON_LED1, + LOCALE_LEDCONTROLER_ON_LED2, LOCALE_MAINMENU_AUDIOPLAYER, LOCALE_MAINMENU_CLEARSECTIONSD, LOCALE_MAINMENU_GAMES, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 309c1c196..c10a5e0d0 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -493,9 +493,14 @@ const char *locale_real_names[] = { "lcdmenu.statusline.both", "lcdmenu.statusline.playtime", "lcdmenu.statusline.volume", + "ledcontroler.menu", "ledcontroler.mode.tv", "ledcontroler.mode.deepstandby", "ledcontroler.mode.standby", + "ledcontroler.off", + "ledcontroler.on.all", + "ledcontroler.on.led1", + "ledcontroler.on.led2", "mainmenu.audioplayer", "mainmenu.clearsectionsd", "mainmenu.games",