From 0dcbf51f852cd15e087ee404c73832abe9809cd7 Mon Sep 17 00:00:00 2001 From: satbaby Date: Sun, 8 May 2011 07:31:54 +0000 Subject: [PATCH] vfd menu tiny changes git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1445 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- data/locale/deutsch.locale | 8 ++++---- src/gui/vfd_setup.cpp | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index e9af9cb89..a437900f2 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -651,12 +651,12 @@ languagesetup.select Sprache lcd_info_line Zeige in Infozeile lcd_info_line_channel Kanalname lcd_info_line_clock Uhrzeit -lcdcontroler.brightness normale Helligkeit -lcdcontroler.brightnessdeepstandby Deep-Standby Helligkeit -lcdcontroler.brightnessstandby Standby Helligkeit +lcdcontroler.brightness normale +lcdcontroler.brightnessdeepstandby Deep-Standby +lcdcontroler.brightnessstandby Standby lcdcontroler.contrast Kontrast lcdmenu.autodimm Automatisch dimmen -lcdmenu.dim_brightness Helligkeit nach Dimm-Timeout +lcdmenu.dim_brightness nach Dimm-Timeout lcdmenu.dim_time Dimm-Timeout lcdmenu.head VFD Einstellungen lcdmenu.inverse Invertieren diff --git a/src/gui/vfd_setup.cpp b/src/gui/vfd_setup.cpp index 3822270c1..3bc6c5ab5 100644 --- a/src/gui/vfd_setup.cpp +++ b/src/gui/vfd_setup.cpp @@ -70,6 +70,7 @@ int CVfdSetup::exec(CMenuTarget* parent, const std::string &actionKey) brightness = DEFAULT_VFD_BRIGHTNESS; brightnessstandby = DEFAULT_VFD_STANDBYBRIGHTNESS; brightnessdeepstandby = DEFAULT_VFD_STANDBYBRIGHTNESS; + g_settings.lcd_setting_dim_brightness = 3; CVFD::getInstance()->setBrightness(brightness); CVFD::getInstance()->setBrightnessStandby(brightnessstandby); CVFD::getInstance()->setBrightnessDeepStandby(brightnessdeepstandby); @@ -125,12 +126,12 @@ void CVfdSetup::showSetup() lcdsliders->addItem(new CMenuOptionNumberChooser(LOCALE_LCDCONTROLER_BRIGHTNESSSTANDBY, &brightnessstandby, true, 0, 15, this, 0, 0, NONEXISTANT_LOCALE, NULL, true)); if(cs_get_revision() > 7) lcdsliders->addItem(new CMenuOptionNumberChooser(LOCALE_LCDCONTROLER_BRIGHTNESSDEEPSTANDBY, &brightnessdeepstandby, true, 0, 15, this, 0, 0, NONEXISTANT_LOCALE, NULL, true)); - lcdsliders->addItem(GenericMenuSeparatorLine); - lcdsliders->addItem(new CMenuForwarder(LOCALE_OPTIONS_DEFAULT, true, NULL, this, "def", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); - lcdsliders->addItem(GenericMenuSeparatorLine); lcdsliders->addItem(new CMenuOptionNumberChooser(LOCALE_LCDMENU_DIM_BRIGHTNESS, &g_settings.lcd_setting_dim_brightness, vfd_enabled, -1, 15, NULL, 0, -1, LOCALE_OPTIONS_OFF, NULL, true)); + lcdsliders->addItem(GenericMenuSeparatorLine); CStringInput * dim_time = new CStringInput(LOCALE_LCDMENU_DIM_TIME, g_settings.lcd_setting_dim_time, 3, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE,"0123456789 "); lcdsliders->addItem(new CMenuForwarder(LOCALE_LCDMENU_DIM_TIME, vfd_enabled, g_settings.lcd_setting_dim_time,dim_time)); + lcdsliders->addItem(GenericMenuSeparatorLine); + lcdsliders->addItem(new CMenuForwarder(LOCALE_OPTIONS_DEFAULT, true, NULL, this, "def", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); vfds->addItem(new CMenuForwarder(LOCALE_LCDMENU_LCDCONTROLER, vfd_enabled, NULL, lcdsliders, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));