diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2007-11-26 12:39:43 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2007-11-26 12:39:43 +0000 |
| commit | 1c21fe13bb453d0f11c8a40461b3bfe7dba5cef1 (patch) | |
| tree | c3fd96fe4d383ed288242fba52243e977c7961bb /lib/python/Screens | |
| parent | d4a222aff5af90a8bdd9b20a60c89f4b9761e736 (diff) | |
| download | enigma2-1c21fe13bb453d0f11c8a40461b3bfe7dba5cef1.tar.gz enigma2-1c21fe13bb453d0f11c8a40461b3bfe7dba5cef1.zip | |
dont show display contrast setting in display setup when a oled is detected
make standby display brightness working
Diffstat (limited to 'lib/python/Screens')
| -rw-r--r-- | lib/python/Screens/Setup.py | 5 | ||||
| -rw-r--r-- | lib/python/Screens/Standby.py | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py index 1f262e32..3439954d 100644 --- a/lib/python/Screens/Setup.py +++ b/lib/python/Screens/Setup.py @@ -1,6 +1,6 @@ from Screen import Screen from Components.ActionMap import NumberActionMap -from Components.config import config +from Components.config import config, ConfigNothing from Components.ConfigList import ConfigListScreen from Components.Label import Label from Components.Pixmap import Pixmap @@ -138,7 +138,8 @@ class Setup(ConfigListScreen, Screen): item = b # the first b is the item itself, ignored by the configList. # the second one is converted to string. - list.append( (item_text, item) ) + if not isinstance(item, ConfigNothing): + list.append( (item_text, item) ) def getSetupTitle(id): xmldata = setupdom.childNodes[0].childNodes diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py index 6807c1aa..b8af16f5 100644 --- a/lib/python/Screens/Standby.py +++ b/lib/python/Screens/Standby.py @@ -2,7 +2,7 @@ from Screen import Screen from Components.ActionMap import ActionMap from Components.config import config from Components.AVSwitch import AVSwitch -from enigma import eDVBVolumecontrol, eDBoxLCD +from enigma import eDVBVolumecontrol from Components.Sources.Source import ObsoleteSource inStandby = None @@ -18,7 +18,7 @@ class Standby(Screen): #unmute adc self.leaveMute() #set brightness of lcd - eDBoxLCD.getInstance().setLCDBrightness(config.lcd.bright.value * 20) + config.lcd.bright.apply() #kill me self.close(True) @@ -54,7 +54,7 @@ class Standby(Screen): #set input to vcr scart self.avswitch.setInput("SCART") #set lcd brightness to standby value - eDBoxLCD.getInstance().setLCDBrightness(config.lcd.standby.value * 20) + config.lcd.standby.apply() self.onShow.append(self.__onShow) self.onHide.append(self.__onHide) |