diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2009-12-03 17:56:03 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2009-12-03 17:56:03 +0100 |
| commit | 0cb206d2c07cb9e4130e13234e3fd59b127421a8 (patch) | |
| tree | 07bcbcc638a6012d32b0574531cf0bd8304484ae /lib/python/Components/Lcd.py | |
| parent | 99a717e9813eab30cd34f5da6f4a5ab6e791dc1f (diff) | |
| parent | e9272c492c7a3c7fd8a1225a4baa6bee2a02eea8 (diff) | |
| download | enigma2-0cb206d2c07cb9e4130e13234e3fd59b127421a8.tar.gz enigma2-0cb206d2c07cb9e4130e13234e3fd59b127421a8.zip | |
Merge branch 'master' into bug_245_record_playback_fixes
Diffstat (limited to 'lib/python/Components/Lcd.py')
| -rw-r--r-- | lib/python/Components/Lcd.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/python/Components/Lcd.py b/lib/python/Components/Lcd.py index 0e501237..7d27c097 100644 --- a/lib/python/Components/Lcd.py +++ b/lib/python/Components/Lcd.py @@ -42,9 +42,18 @@ def InitLcd(): def setLCDinverted(configElement): ilcd.setInverted(configElement.value); + standby_default = 0 + ilcd = LCD() - config.lcd.standby = ConfigSlider(default=0, limits=(0, 10)) + if not ilcd.isOled(): + config.lcd.contrast = ConfigSlider(default=5, limits=(0, 20)) + config.lcd.contrast.addNotifier(setLCDcontrast); + else: + config.lcd.contrast = ConfigNothing() + standby_default = 1 + + config.lcd.standby = ConfigSlider(default=standby_default, limits=(0, 10)) config.lcd.standby.addNotifier(setLCDbright); config.lcd.standby.apply = lambda : setLCDbright(config.lcd.standby) @@ -53,12 +62,6 @@ def InitLcd(): config.lcd.bright.apply = lambda : setLCDbright(config.lcd.bright) config.lcd.bright.callNotifiersOnSaveAndCancel = True - if not ilcd.isOled(): - config.lcd.contrast = ConfigSlider(default=5, limits=(0, 20)) - config.lcd.contrast.addNotifier(setLCDcontrast); - else: - config.lcd.contrast = ConfigNothing() - config.lcd.invert = ConfigYesNo(default=False) config.lcd.invert.addNotifier(setLCDinverted); else: |