X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3ff1dc8555e0bf219e47ed002ea7b66a59bdaeb7..e77779c4822c7c860f5006b24445960722c7a46e:/data/menu.xml?ds=sidebyside

diff --git a/data/menu.xml b/data/menu.xml
index d566816b..db3c95ef 100644
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -1,5 +1,5 @@
 <menu text="Mainmenu" title="Mainmenu">
-
+	<id val="mainmenu" />
 <!-- the following types are allowed:
 	<screen [module="mod"] [screen="classname"]>[arguments]</screen> 
 		executes Screen called "classname" from module "Screen.mod"
@@ -13,47 +13,61 @@
 	<code> .. code .. </code>
 		"exec"s code
 -->
-		<!--<item text="Standby debug">quitMainloop()</item>
-		<item text="Networksetup">self.openSetup("network")</item>-->
+		<!--<item text="Standby debug">quitMainloop(0)</item>
+		<item text="Network setup">self.openSetup("network")</item>-->
 		<!--<item text="CI"><screen module="Ci" screen="CiSelection" /></item>-->
-		<item text="Radio"><code>print "radio mode"</code></item>
+		<!--<item text="Radio"><code>print "radio mode"</code></item>-->
+		<item text="Media player"><screen module="MediaPlayer" screen="MediaPlayer" /></item>
 		<item text="Timer"><screen module="TimerEdit" screen="TimerEditList" /></item>
-		<item text="Information"><screen module="About" /></item>
-		<item text="Games / Plugins"><screen module="PluginBrowser" /></item>
-		<menu text="Setup">
-			<menu text="Service Organising">
+		<item text="VCR scart"><screen module="Scart" screen="Scart" /></item>
+
+		<menu text="Information">
+			<id val="information" />
+			<item text="Service"><screen module="ServiceInfo" screen="ServiceInfo"/></item>
+			<item text="About..."><screen module="About" /></item>
+		</menu>
+
+		<item text="Games / Plugins"><screen module="PluginBrowser" screen="PluginBrowser" /></item>
+		<menu text="Setup" flushConfigOnClose="1" >
+			<id val="setup" />
+			<!--<menu text="Service Organising">
 				<item text="New Bouquets"></item>
 				<item text="Add to Bouquets"></item>
 				<item text="Edit Bouquets"></item>
-			</menu>
+			</menu>-->
 			<menu text="Service Searching">
+				<id val="scan" />
 				<item text="Satelliteconfig"><screen module="Satconfig" screen="NimSelection" /></item>
 				<item text="Automatic Scan"><screen module="ScanSetup" screen="ScanSimple" /></item>
 				<!--<item text="Automatic Scan"><screen module="ServiceScan" /></item>-->
 				<item text="Manual Scan"><screen module="ScanSetup" /></item>
-				<item text="Rotor Control"></item>
-				<item text="Edit Transponder"></item>
+				<!--<item text="Rotor Control"></item>
+				<item text="Edit Transponder"></item>-->
 				<!--<item text="Satfinder"></item>-->
 			</menu>
 			<menu text="System">
+				<id val="system" />
+				<item text="Language"><screen module="LanguageSelection" /></item>
+				<item text="Usage Settings"><setup id="usage" /></item>
 				<item text="Timezone"><setup id="timezone" /></item>
-				<item text="Video Audio"><setup id="avsetup" /></item>
+				<item text="Audio / Video"><setup id="avsetup" /></item>
 				<item text="UHF Modulator"><setup id="RFmod" /></item>
 				<item text="Harddisk"><screen module="HarddiskSetup" screen="HarddiskSelection"/></item>
-				<item text="Remote Control"><setup id="rc" /></item>
+				<!--<item text="Remote Control"><setup id="rc" /></item>-->
 				<!--<item text="Keyboard"><setup id="keyboard" /></item>-->
-				<item text="OSD"><setup id="osd" /></item>
+				<!--<item text="OSD"><setup id="osd" /></item>-->
 				<item text="LCD"><setup id="lcd" /></item>
 				<item text="Network"><screen module="NetworkSetup" screen="NetworkSetup" /></item>
 			</menu>
 			<item text="Common Interface"><screen module="Ci" screen="CiSelection" /></item>
-			<item text="Parental Control"><setup id="parental" /></item>
-			<item text="Expert"><setup id="expert" /></item>
+			<!--<item text="Parental Control"><setup id="parental" /></item>-->
+			<!--<item text="Expert -disabled-"><setup id="expert" /></item>-->
 		</menu>
 		<!--<item text="Unser Setup">self.openSetup("Blaselfasel")</item>-->
 		<menu text="Standby / Restart">
-			<item text="Standby"><code>quitMainloop()</code></item>
-			<item text="Restart"><code>quitMainloop()</code></item>
-			<item text="Deep Standby"><code>quitMainloop()</code></item>
+			<id val="shutdown" />
+			<!--<item text="Standby"><code>quitMainloop(0)</code></item>-->
+			<item text="Restart"><code>quitMainloop(2)</code></item>
+			<item text="Deep Standby"><code>quitMainloop(1)</code></item>
 		</menu>
 </menu>