refs bug #429

[enigma2.git] / lib / python / Components / Lcd.py

diff --git a/lib/python/Components/Lcd.py b/lib/python/Components/Lcd.py
index eb3e3df18f3e1bc7225ae5acd02933f4526e7944..dde158b6a16f4c1d97d697b312f12f239a7637bb 100644 (file)
--- a/lib/python/Components/Lcd.py
+++ b/lib/python/Components/Lcd.py
@@ -1,6 +1,6 @@
 from config import config, ConfigSubsection, ConfigSlider, ConfigYesNo, ConfigNothing
-
 from enigma import eDBoxLCD
+from Components.SystemInfo import SystemInfo
 
 class LCD:
        def __init__(self):
@@ -28,33 +28,58 @@ class LCD:
        def isOled(self):
                return eDBoxLCD.getInstance().isOled()
 
+def leaveStandby():
+       config.lcd.bright.apply()
+
+def standbyCounterChanged(configElement):
+       from Screens.Standby import inStandby
+       inStandby.onClose.append(leaveStandby)
+       config.lcd.standby.apply()
+
 def InitLcd():
+       detected = eDBoxLCD.getInstance().detected()
+       SystemInfo["Display"] = detected
+       config.lcd = ConfigSubsection();
+       if detected:
+               def setLCDbright(configElement):
+                       ilcd.setBright(configElement.value);
 
-       def setLCDbright(configElement):
-               ilcd.setBright(configElement.value);
+               def setLCDcontrast(configElement):
+                       ilcd.setContrast(configElement.value);
 
-       def setLCDcontrast(configElement):
-               ilcd.setContrast(configElement.value);
+               def setLCDinverted(configElement):
+                       ilcd.setInverted(configElement.value);
 
-       def setLCDinverted(configElement):
-               ilcd.setInverted(configElement.value);
+               standby_default = 0
 
-       ilcd = LCD()
+               ilcd = LCD()
 
-       config.lcd = ConfigSubsection();
+               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)
 
-       config.lcd.bright = ConfigSlider(default=10, limits=(0, 10))
-       config.lcd.bright.addNotifier(setLCDbright);
-       config.lcd.bright.apply = lambda : setLCDbright(config.lcd.bright)
+               config.lcd.bright = ConfigSlider(default=5, limits=(0, 10))
+               config.lcd.bright.addNotifier(setLCDbright);
+               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);
+               config.lcd.invert = ConfigYesNo(default=False)
+               config.lcd.invert.addNotifier(setLCDinverted);
        else:
+               def doNothing():
+                       pass
                config.lcd.contrast = ConfigNothing()
+               config.lcd.bright = ConfigNothing()
+               config.lcd.standby = ConfigNothing()
+               config.lcd.bright.apply = lambda : doNothing()
+               config.lcd.standby.apply = lambda : doNothing()
 
-       config.lcd.standby = ConfigSlider(default=0, limits=(0, 10))
-       config.lcd.standby.apply = lambda : setLCDbright(config.lcd.standby)
+       config.misc.standbyCounter.addNotifier(standbyCounterChanged, initial_call = False)
 
-       config.lcd.invert = ConfigYesNo(default=False)
-       config.lcd.invert.addNotifier(setLCDinverted);