X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FLcd.py;h=dde158b6a16f4c1d97d697b312f12f239a7637bb;hp=5709769234b5a49002c3848fbb5760f67c26759a;hb=e7c018fc484ad4263c2e7156d1ab58d1f5f67bda;hpb=d0cdfb806e7c602e610f1b529640ad9508a83d7e

diff --git a/lib/python/Components/Lcd.py b/lib/python/Components/Lcd.py
index 5709769..dde158b 100644
--- a/lib/python/Components/Lcd.py
+++ b/lib/python/Components/Lcd.py
@@ -28,9 +28,18 @@ 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);
@@ -41,25 +50,36 @@ def InitLcd():
 		def setLCDinverted(configElement):
 			ilcd.setInverted(configElement.value);
 
-		ilcd = LCD()
-
-		config.lcd = ConfigSubsection();
+		standby_default = 0
 
-		config.lcd.bright = ConfigSlider(default=10, limits=(0, 10))
-		config.lcd.bright.addNotifier(setLCDbright);
-		config.lcd.bright.apply = lambda : setLCDbright(config.lcd.bright)
+		ilcd = LCD()
 
 		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=0, limits=(0, 10))
+		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=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.invert = ConfigYesNo(default=False)
 		config.lcd.invert.addNotifier(setLCDinverted);
 	else:
-		config.lcd.bright.apply = lambda : pass
-		config.lcd.standby.apply = lambda : pass
+		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.misc.standbyCounter.addNotifier(standbyCounterChanged, initial_call = False)
+