From 78950dbe85f5eafb3adb817eef742654d1f84e5a Mon Sep 17 00:00:00 2001
From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Tue, 30 Aug 2005 23:22:01 +0000
Subject: [PATCH] use setup.xml for the menu instead of an inline string

---
 data/Makefile.am            |  2 +-
 data/setup.xml              | 60 +++++++++++++++++++++++++++++++++++++
 lib/python/Screens/Setup.py | 73 +++++++--------------------------------------
 3 files changed, 71 insertions(+), 64 deletions(-)
 create mode 100644 data/setup.xml

diff --git a/data/Makefile.am b/data/Makefile.am
index 77904cb..fcd4e50 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,4 +3,4 @@ AUTOMAKE_OPTIONS = gnu
 installdir = $(DATADIR)/enigma2
 
 install_DATA = \
-	skin.xml menu.xml
+	skin.xml menu.xml setup.xml
diff --git a/data/setup.xml b/data/setup.xml
new file mode 100644
index 0000000..620ef7c
--- /dev/null
+++ b/data/setup.xml
@@ -0,0 +1,60 @@
+<setupxml>
+		<setup key="rc" title="RC Menu">
+			<item text="Repeat Rate">config.inputDevices.repeat</item>
+			<item text="Delay Rate">config.inputDevices.delay</item>
+			<item text="Keymap">config.rc.map</item>
+		</setup>
+		<setup key="timezone" title="RC Menu">
+			<item text="Timezone">config.timezone.val</item>
+		</setup>
+		<setup key="avsetup" title="A/V Settings">
+			<item text="Color Format">config.av.colorformat</item>
+			<item text="Aspect Ratio">config.av.aspectratio</item>
+			<item text="TV System">config.av.tvsystem</item>
+			<item text="WSS">config.av.wss</item>
+			<item text="AC3 default">config.av.defaultac3</item>
+			<item text="VCR Switch">config.av.vcrswitch</item>
+		</setup>
+		<setup key="rfmod" title="UHF Modulator">
+			<item text="Modulator">config.rfmod.enable</item>
+			<item text="Testmode">config.rfmod.test</item>
+			<item text="Sound">config.rfmod.sound</item>
+			<item text="Soundcarrier">config.rfmod.soundcarrier</item>
+			<item text="Channel">config.rfmod.channel</item>
+			<item text="Finetune">config.rfmod.finetune</item>
+		</setup>
+		<setup key="keyboard" title="Keyboard Setup">
+			<item text="Keyboard Map">config.keyboard.keymap</item>
+		</setup>
+		<setup key="osd" title="OSD Settings">
+			<item text="Alpha">config.osd.alpha</item>
+			<item text="Brightness">config.osd.bright</item>
+			<item text="Contrast">config.osd.contrast</item>
+			<item text="Language">config.osd.language</item>
+		</setup>
+		<setup key="lcd" title="LCD Setup">
+			<item text="Brightness">config.lcd.bright</item>
+			<item text="Standby">config.lcd.standby</item>
+			<item text="Invert">config.lcd.invert</item>
+		</setup>
+		<setup key="parental" title="Parental Control">
+			<item text="Parental Lock">config.parental.lock</item>
+			<item text="Setup Lock">config.parental.setuplock</item>
+		</setup>
+		<setup key="expert" title="Expert Setup">
+			<item text="Record Splitsize">config.expert.splitsize</item>
+			<item text="Show Satposition">config.expert.satpos</item>
+			<item text="Fast zapping">config.expert.fastzap</item>
+			<item text="Skip confirmations">config.expert.skipconfirm</item>
+			<item text="Hide error windows">config.expert.hideerrors</item>
+			<item text="Auto show inforbar">config.expert.autoinfo</item>
+		</setup>
+		<setup key="satconfig" title="Sat/Dish Setup">
+			<item text="Tuner-A Control">config.sat.diseqcA</item>
+			<item text="Tuner-A Position">config.sat.posA</item>
+			<item text="Tuner-A Sat">config.sat.satA</item>
+			<item text="Tuner-B Control">config.sat.diseqcB</item>
+			<item text="Tuner-A Position">config.sat.posB</item>
+			<item text="Tuner-B Sat">config.sat.satB</item>
+		</setup>
+	</setupxml>
\ No newline at end of file
diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index a694ab1..c643c75 100644
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -12,69 +12,16 @@ from skin import elementsWithTag
 
 from Tools import XMLTools
 
-setupdom = xml.dom.minidom.parseString(
-	"""
-	<setupxml>
-		<setup key="rc" title="RC Menu">
-			<item text="Repeat Rate">config.inputDevices.repeat</item>
-			<item text="Delay Rate">config.inputDevices.delay</item>
-			<item text="Keymap">config.rc.map</item>
-		</setup>
-		<setup key="timezone" title="RC Menu">
-			<item text="Timezone">config.timezone.val</item>
-		</setup>
-		<setup key="avsetup" title="A/V Settings">
-			<item text="Color Format">config.av.colorformat</item>
-			<item text="Aspect Ratio">config.av.aspectratio</item>
-			<item text="TV System">config.av.tvsystem</item>
-			<item text="WSS">config.av.wss</item>
-			<item text="AC3 default">config.av.defaultac3</item>
-			<item text="VCR Switch">config.av.vcrswitch</item>
-		</setup>
-		<setup key="rfmod" title="UHF Modulator">
-			<item text="Modulator">config.rfmod.enable</item>
-			<item text="Testmode">config.rfmod.test</item>
-			<item text="Sound">config.rfmod.sound</item>
-			<item text="Soundcarrier">config.rfmod.soundcarrier</item>
-			<item text="Channel">config.rfmod.channel</item>
-			<item text="Finetune">config.rfmod.finetune</item>
-		</setup>
-		<setup key="keyboard" title="Keyboard Setup">
-			<item text="Keyboard Map">config.keyboard.keymap</item>
-		</setup>
-		<setup key="osd" title="OSD Settings">
-			<item text="Alpha">config.osd.alpha</item>
-			<item text="Brightness">config.osd.bright</item>
-			<item text="Contrast">config.osd.contrast</item>
-			<item text="Language">config.osd.language</item>
-		</setup>
-		<setup key="lcd" title="LCD Setup">
-			<item text="Brightness">config.lcd.bright</item>
-			<item text="Standby">config.lcd.standby</item>
-			<item text="Invert">config.lcd.invert</item>
-		</setup>
-		<setup key="parental" title="Parental Control">
-			<item text="Parental Lock">config.parental.lock</item>
-			<item text="Setup Lock">config.parental.setuplock</item>
-		</setup>
-		<setup key="expert" title="Expert Setup">
-			<item text="Record Splitsize">config.expert.splitsize</item>
-			<item text="Show Satposition">config.expert.satpos</item>
-			<item text="Fast zapping">config.expert.fastzap</item>
-			<item text="Skip confirmations">config.expert.skipconfirm</item>
-			<item text="Hide error windows">config.expert.hideerrors</item>
-			<item text="Auto show inforbar">config.expert.autoinfo</item>
-		</setup>
-		<setup key="satconfig" title="Sat/Dish Setup">
-			<item text="Tuner-A Control">config.sat.diseqcA</item>
-			<item text="Tuner-A Position">config.sat.posA</item>
-			<item text="Tuner-A Sat">config.sat.satA</item>
-			<item text="Tuner-B Control">config.sat.diseqcB</item>
-			<item text="Tuner-A Position">config.sat.posB</item>
-			<item text="Tuner-B Sat">config.sat.satB</item>
-		</setup>
-	</setupxml>
-	""")
+# read the setupmenu
+try:
+	# first we search in the current path
+	setupfile = file('data/menu.xml', 'r')
+except:
+	# if not found in the current path, we use the global datadir-path
+	setupfile = file('/usr/share/enigma2/setup.xml', 'r')
+setupdom = xml.dom.minidom.parseString(setupfile.read())
+setupfile.close()
+
 
 def getValbyAttr(x, attr):
 	for p in range(x.attributes.length):
-- 
2.7.4