X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f1af72b9827f7c192a22279c5d780a050798336a..d2ceae9583bc62daa872c316f8952b9a6a416a69:/data/menu.xml

diff --git a/data/menu.xml b/data/menu.xml
index 7091c83e..0f87c20a 100644
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -1,45 +1,64 @@
 <menu text="Mainmenu" title="Mainmenu">
-		<!--<item text="Standby debug">quitMainloop()</item>
+
+<!-- the following types are allowed:
+	<screen [module="mod"] [screen="classname"]>[arguments]</screen> 
+		executes Screen called "classname" from module "Screen.mod"
+		if no module is given, Screen must be globally available.
+		if no screen is given, module is used as screen class name.
+		arguments must be comma seperated (will be fed to eval), and can
+			use stuff from module
+		(of course you must specify at least one of module, screen.)
+	<setup id="id" />
+		opens a setup with specified id
+	<code> .. code .. </code>
+		"exec"s code
+-->
+		<!--<item text="Standby debug">quitMainloop(0)</item>
 		<item text="Networksetup">self.openSetup("network")</item>-->
-		<item text="Satelliteconfig">self.openDialog(Satconfig)</item>
-		<item text="Radio"></item>
-		<item text="Timer">self.openDialog(TimerEditList)</item>
-		<item text="Information">self.openDialog(About)</item>
-		<item text="Games / Plugins">self.openDialog(PluginBrowser)</item>
+		<!--<item text="CI"><screen module="Ci" screen="CiSelection" /></item>-->
+		<!--<item text="Radio"><code>print "radio mode"</code></item>-->
+		<item text="Timer"><screen module="TimerEdit" screen="TimerEditList" /></item>
+
+		<menu text="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" /></item>
 		<menu text="Setup">
-			<menu text="Service Organising">
+			<!--<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">
-				<!--<item text="Satelliteconfig">self.openDialog(Satconfig)</item>-->
-				<item text="Satelliteconfig">self.openSetup("satconfig")</item>
-				<item text="Automatic Scan">self.openDialog(ServiceScan)</item>
-				<item text="Manual Scan">self.openDialog(ServiceScan)</item>
-				<item text="Rotor Control"></item>
-				<item text="Edit Transponder"></item>
+				<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="Satfinder"></item>-->
 			</menu>
 			<menu text="System">
-				<item text="Timezone">self.openSetup("timezone")</item>
-				<item text="Video Audio">self.openSetup("avsetup")</item>
-				<item text="UHF Modulator">self.openSetup("rfmod")</item>
-				<item text="Harddisk">self.openDialog(HarddiskSelection)</item>
-				<item text="Remote Control">self.openSetup("rc")</item>
-				<item text="Keyboard">self.openSetup("keyboard")</item>
-				<item text="OSD">self.openSetup("osd")</item>
-				<item text="LCD">self.openSetup("lcd")</item>
-				<item text="Networksetup">self.openSetup("network")</item>
+				<item text="Timezone"><setup id="timezone" /></item>
+				<item text="Video Audio"><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="Keyboard"><setup id="keyboard" /></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"></item>
-			<item text="Parental Control">self.openSetup("parental")</item>
-			<item text="Expert">self.openSetup("expert")</item>
+			<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>
 		</menu>
 		<!--<item text="Unser Setup">self.openSetup("Blaselfasel")</item>-->
 		<menu text="Standby / Restart">
-			<item text="Standby">quitMainloop()</item>
-			<item text="Restart">quitMainloop()</item>
-			<item text="Deep Standby">quitMainloop()</item>
+			<!--<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>
\ No newline at end of file
+</menu>