From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Fri, 15 Feb 2008 17:28:23 +0000 (+0000)
Subject: dont show display setup in menu, when no display is available
X-Git-Tag: 2.6.0~1527
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/d764fc2a712770bff292b19cc6f815ad8cc55950

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

diff --git a/data/menu.xml b/data/menu.xml
index 977a2092..cc0d410f 100644
--- 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><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>
diff --git a/lib/gdi/lcd.h b/lib/gdi/lcd.h
index e45d88b2..99f921b5 100644
--- a/lib/gdi/lcd.h
+++ b/lib/gdi/lcd.h
@@ -27,6 +27,7 @@ public:
 	int lock();
 	void unlock();
 	int islocked() { return locked; }
+	bool detected() { return lcdfd >= 0; }
 #ifndef SWIG
 	eLCD(eSize size);
 	virtual ~eLCD();
diff --git a/lib/python/Components/Lcd.py b/lib/python/Components/Lcd.py
index eb3e3df1..e722250d 100644
--- 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 enigma import eDBoxLCD
+from Components.SystemInfo import SystemInfo
 
 class LCD:
 	def __init__(self):
@@ -29,32 +29,34 @@ class LCD:
 		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);