X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=data%2Fmenu.xml;h=d562ab3b434ef7d0834ddc004728181bc6014576;hb=78e893472c0bef2f78b8c1ed0e98b28dae429ab2;hp=dceccccc45a069ed03fdb561e0cb01b38e7a4b74;hpb=61c464a2fc81d446f7b8a554f88c40498ab3494c;p=vuplus_dvbapp

diff --git a/data/menu.xml b/data/menu.xml
index dcecccc..d562ab3 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,50 +13,73 @@
 	<code> .. code .. </code>
 		"exec"s code
 -->
-		<!--<item text="Standby debug">quitMainloop()</item>
-		<item text="Networksetup">self.openSetup("network")</item>-->
-		<item text="CI"><screen module="Ci" screen="CiSelection" /></item>
-		<item text="Satelliteconfig"><screen module="Satconfig" screen="NimSelection" /></item>
-		<item text="Scanconfiguration"><screen module="ScanSetup" screen="ScanSetup" /></item>
-		<item text="Timerentry"><screen module="TimerEntry" screen="TimerEntry" /></item>
-		<item text="Radio"><code>print "radio mode"</code></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="Subtitles"><screen module="Subtitles" screen="Subtitles" /></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"><code>self.session.scart.VCRSbChanged(3)</code></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">
-				<item text="Satelliteconfig"><screen module="Satconfig" /></item>
-				<!--<item text="Satelliteconfig">self.openSetup("satconfig")</item>-->
-				<item text="Automatic Scan"><screen module="ServiceScan" /></item>
-				<item text="Manual Scan"><screen module="ServiceScan" /></item>
-				<item text="Rotor Control"></item>
-				<item text="Edit Transponder"></item>
+				<id val="scan" />
+				<item text="Tuner configuration"><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"><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="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="Networksetup"><screen module="NetworkSetup" screen="NetworkSetup" /></item>
+				<id val="system" />
+				<item text="Language..."><screen module="LanguageSelection" /></item>
+				<item><setup id="usage" /></item>
+				<item><setup id="timezone" /></item>
+				<item><setup id="avsetup" /></item>
+				<item><setup id="RFmod" /></item>
+				<menu text="Harddisk">
+					<id val="harddisk" />
+					<item><setup id="harddisk" /></item>
+					<item text="Initialization..."><screen module="HarddiskSetup" screen="HarddiskSelection"/></item>
+				</menu>
+				<!--<item text="Remote Control"><setup id="rc" /></item>-->
+				<!--<item text="Keyboard"><setup id="keyboard" /></item>-->
+				<!--<item text="OSD"><setup id="osd" /></item>-->
+				<item><setup id="lcd" /></item>
+				<menu text="Network...">
+					<id val="network" />
+					<item text="Device Setup..."><screen module="NetworkSetup" screen="NetworkAdapterSelection"/></item>
+					<item text="Nameserver Setup..."><screen module="NetworkSetup" screen="NameserverSetup"/></item>
+				</menu>
 			</menu>
-			<item text="Common Interface"></item>
-			<item text="Parental Control"><setup id="parental" /></item>
-			<item text="Expert"><setup id="expert" /></item>
+			<item text="Common Interface"><screen module="Ci" screen="CiSelection" /></item>
+			<item text="Parental control"><screen module="ParentalControlSetup" screen="ParentalControlSetup" /></item>
+			<item text="Startwizard"><screen module="StartWizard" screen="StartWizard" /></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="Standby"><screen module="Standby" screen="Standby"/></item>
+			<item text="Restart"><screen module="Standby" screen="TryQuitMainloop">2</screen></item>
+			<item text="Deep Standby"><screen module="Standby" screen="TryQuitMainloop">1</screen></item>
 		</menu>
 </menu>