Merge branch 'bug_293_indicate_unhandled_key' into experimental

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

diff --git a/lib/python/Components/Lcd.py b/lib/python/Components/Lcd.py
index 9dc80e972a73c423db62c01bbb1044c0dc1dfcea..7d27c097ee9fd2c98a68c977a7711253f25d82be 100644 (file)
--- a/lib/python/Components/Lcd.py
+++ b/lib/python/Components/Lcd.py
@@ -1,47 +1,74 @@
-from config import config                              #global config instance
-from config import ConfigSlider
-from config import configSelection
-from config import ConfigSubsection
-from config import configElement
-
-from enigma import *
+from config import config, ConfigSubsection, ConfigSlider, ConfigYesNo, ConfigNothing
+from enigma import eDBoxLCD
+from Components.SystemInfo import SystemInfo
 
 class LCD:
        def __init__(self):
                pass
 
        def setBright(self, value):
-               eDBoxLCD.getInstance().setLCDBrightness(value * 20)
-               pass
+               value *= 255
+               value /= 10
+               if value > 255:
+                       value = 255
+               eDBoxLCD.getInstance().setLCDBrightness(value)
 
        def setContrast(self, value):
+               value *= 63
+               value /= 20
+               if value > 63:
+                       value = 63
                eDBoxLCD.getInstance().setLCDContrast(value)
-               pass
 
        def setInverted(self, value):
+               if value:
+                       value = 255
                eDBoxLCD.getInstance().setInverted(value)
-               pass
+
+       def isOled(self):
+               return eDBoxLCD.getInstance().isOled()
 
 def InitLcd():
+       detected = eDBoxLCD.getInstance().detected()
+       SystemInfo["Display"] = detected
        config.lcd = ConfigSubsection();
-       config.lcd.bright = configElement("config.lcd.bright", ConfigSlider, 10, "");
-       config.lcd.contrast = configElement("config.lcd.contrast", ConfigSlider, 10, "");
-       config.lcd.standby = configElement("config.lcd.standby", ConfigSlider, 1, "");
-       config.lcd.invert = configElement("config.lcd.invert", configSelection, 0, ("Disable", "Enable") );
+       if detected:
+               def setLCDbright(configElement):
+                       ilcd.setBright(configElement.value);
+
+               def setLCDcontrast(configElement):
+                       ilcd.setContrast(configElement.value);
+
+               def setLCDinverted(configElement):
+                       ilcd.setInverted(configElement.value);
+
+               standby_default = 0
 
-       ilcd = LCD()
+               ilcd = LCD()
 
-       def setLCDbright(configElement):
-               ilcd.setBright(configElement.value);
+               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
 
-       def setLCDcontrast(configElement):
-               ilcd.setContrast(configElement.value);
+               config.lcd.standby = ConfigSlider(default=standby_default, limits=(0, 10))
+               config.lcd.standby.addNotifier(setLCDbright);
+               config.lcd.standby.apply = lambda : setLCDbright(config.lcd.standby)
 
-       def setLCDinverted(configElement):
-               ilcd.setInverted(configElement.value);
+               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
 
-       config.lcd.bright.addNotifier(setLCDbright);
-       config.lcd.contrast.addNotifier(setLCDcontrast);
-       config.lcd.invert.addNotifier(setLCDinverted);
-       
-       
\ No newline at end of file
+               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()