dont show display setup in menu, when no display is available

diff --git a/data/menu.xml b/data/menu.xml
index 977a209249d16a4e5ac587bf49080d7f0a308f17..cc0d410f593bc76a1752e335c30cdbc9f87c0df4 100644 (file)
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -62,7 +62,7 @@
                                <!--<item text="Remote Control"><setup id="rc" /></item>-->
                                <!--<item text="Keyboard"><setup id="keyboard" /></item>-->
                                <!--<item text="OSD"><setup id="osd" /></item>-->
                                <!--<item text="Remote Control"><setup id="rc" /></item>-->
                                <!--<item text="Keyboard"><setup id="keyboard" /></item>-->
                                <!--<item text="OSD"><setup id="osd" /></item>-->

-                               <item><setup level="1" id="lcd" /></item>
+                               <item requires="Display"><setup level="1" id="lcd" /></item>

                                <menu level="1" text="Network..." entryID="network_setup">
                                        <id val="network" />
                                        <item level="1" text="Device Setup..." entryID="device_setup"><screen module="NetworkSetup" screen="NetworkAdapterSelection"/></item>
                                <menu level="1" text="Network..." entryID="network_setup">
                                        <id val="network" />
                                        <item level="1" text="Device Setup..." entryID="device_setup"><screen module="NetworkSetup" screen="NetworkAdapterSelection"/></item>

diff --git a/lib/gdi/lcd.h b/lib/gdi/lcd.h
index e45d88b210289848973a72196dcbe035e59c3250..99f921b525e16434bf6cb4dcf8c952b6a508f8d4 100644 (file)
--- a/lib/gdi/lcd.h
+++ b/lib/gdi/lcd.h
@@ -27,6 +27,7 @@ public:
        int lock();
        void unlock();
        int islocked() { return locked; }
        int lock();
        void unlock();
        int islocked() { return locked; }

+       bool detected() { return lcdfd >= 0; }

 #ifndef SWIG
        eLCD(eSize size);
        virtual ~eLCD();
 #ifndef SWIG
        eLCD(eSize size);
        virtual ~eLCD();

diff --git a/lib/python/Components/Lcd.py b/lib/python/Components/Lcd.py
index eb3e3df18f3e1bc7225ae5acd02933f4526e7944..e722250db26d5e7fc1b5990e2ed86a6271141eb9 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 config import config, ConfigSubsection, ConfigSlider, ConfigYesNo, ConfigNothing

-

 from enigma import eDBoxLCD
 from enigma import eDBoxLCD

+from Components.SystemInfo import SystemInfo

 
 class LCD:
        def __init__(self):
 
 class LCD:
        def __init__(self):


@@ -29,32 +29,34 @@ class LCD:
                return eDBoxLCD.getInstance().isOled()
 
 def InitLcd():
                return eDBoxLCD.getInstance().isOled()
 
 def InitLcd():

+       detected = eDBoxLCD.getInstance().detected()
+       SystemInfo["Display"] = detected
+       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);

 
 

-       ilcd = LCD()
+               ilcd = LCD()

 
 

-       config.lcd = ConfigSubsection();
+               config.lcd = ConfigSubsection();

 
 

-       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=10, limits=(0, 10))
+               config.lcd.bright.addNotifier(setLCDbright);
+               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()
+               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.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);
+               config.lcd.invert = ConfigYesNo(default=False)
+               config.lcd.invert.addNotifier(setLCDinverted);