dont show display contrast setting in display setup when a oled is detected

make standby display brightness working

diff --git a/lib/gdi/lcd.h b/lib/gdi/lcd.h
index de49571999c69edeffef37b2672e4646ed08f3db..e45d88b210289848973a72196dcbe035e59c3250 100644 (file)
--- a/lib/gdi/lcd.h
+++ b/lib/gdi/lcd.h
@@ -56,6 +56,7 @@ public:
        int setLCDContrast(int contrast);
        int setLCDBrightness(int brightness);
        void setInverted( unsigned char );
+       bool isOled() const { return !!is_oled; }
        void update();
 };
 

diff --git a/lib/python/Components/Lcd.py b/lib/python/Components/Lcd.py
index b043f393a636ac5464916ffe9ce517ddd3df074d..eb3e3df18f3e1bc7225ae5acd02933f4526e7944 100644 (file)
--- a/lib/python/Components/Lcd.py
+++ b/lib/python/Components/Lcd.py
@@ -1,4 +1,4 @@
-from config import config, ConfigSubsection, ConfigSlider, ConfigYesNo
+from config import config, ConfigSubsection, ConfigSlider, ConfigYesNo, ConfigNothing
 
 from enigma import eDBoxLCD
 
@@ -25,14 +25,10 @@ class LCD:
                        value = 255
                eDBoxLCD.getInstance().setInverted(value)
 
-def InitLcd():
-       config.lcd = ConfigSubsection();
-       config.lcd.bright = ConfigSlider(default=10, limits=(0, 10))
-       config.lcd.contrast = ConfigSlider(default=5, limits=(0, 20))
-       config.lcd.standby = ConfigSlider(default=0, limits=(0, 10))
-       config.lcd.invert = ConfigYesNo(default=False)
+       def isOled(self):
+               return eDBoxLCD.getInstance().isOled()
 
-       ilcd = LCD()
+def InitLcd():
 
        def setLCDbright(configElement):
                ilcd.setBright(configElement.value);
@@ -43,6 +39,22 @@ def InitLcd():
        def setLCDinverted(configElement):
                ilcd.setInverted(configElement.value);
 
+       ilcd = LCD()
+
+       config.lcd = ConfigSubsection();
+
+       config.lcd.bright = ConfigSlider(default=10, limits=(0, 10))
        config.lcd.bright.addNotifier(setLCDbright);
-       config.lcd.contrast.addNotifier(setLCDcontrast);
+       config.lcd.bright.apply = lambda : setLCDbright(config.lcd.bright)
+
+       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.standby = ConfigSlider(default=0, limits=(0, 10))
+       config.lcd.standby.apply = lambda : setLCDbright(config.lcd.standby)
+
+       config.lcd.invert = ConfigYesNo(default=False)
        config.lcd.invert.addNotifier(setLCDinverted);

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index 1f262e32139ae207f1c380e102df2cce84f523a5..3439954dd0f9f24f573c6455c30be8743fec9f97 100644 (file)
--- 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 6807c1aac75a3ca9562134740e90da68b54795ad..b8af16f5f19b5ba2c9e279b9b3d24c754dd5c02b 100644 (file)
--- 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)