X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=data%2Fmenu.xml;h=c7fb8897eb03d0a55fde27560fbad6a383b31e7a;hp=1d7bdf1a81bfd7fc271c89571968899c0639b915;hb=26ffb5f9f32d3939c8f4bb6601bfed424bd13a14;hpb=e9ac30d0d9eadcce3d2872ab2e4380144e49adbc

diff --git a/data/menu.xml b/data/menu.xml
index 1d7bdf1..c7fb889 100644
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -1,4 +1,4 @@
-<menu text="Mainmenu" title="Mainmenu">
+<menu text="Mainmenu" title="Main menu">
 	<id val="mainmenu" />
 <!-- the following types are allowed:
 	<screen [module="mod"] [screen="classname"]>[arguments]</screen> 
@@ -17,28 +17,28 @@
 		<item text="Network setup" entryID="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" entryID="subtitle_selection"><screen module="Subtitles" screen="Subtitles" /></item>
-		<item text="Media player" entryID="media_player"><screen module="MediaPlayer" screen="MediaPlayer" /></item>
-		<item text="Timer" entryID="timer_edit"><screen module="TimerEdit" screen="TimerEditList" /></item>
-		<item text="VCR scart" entryID="scart_switch"><code>self.session.scart.VCRSbChanged(3)</code></item>
+		<item level="0" text="Subtitles" entryID="subtitle_selection" weight="40"><screen module="Subtitles" screen="Subtitles" /></item>
+		<item level="0" text="Timer" entryID="timer_edit"><screen module="TimerEdit" screen="TimerEditList" /></item>
+		<item level="1" text="VCR scart" entryID="scart_switch" requires="ScartSwitch"><code>self.session.scart.VCRSbChanged(3)</code></item>
 
-		<menu text="Information" entryID="info_screen">
+		<menu level="0" text="Information" entryID="info_screen">
 			<id val="information" />
-			<item text="Service" entryID="service_info_screen"><screen module="ServiceInfo" screen="ServiceInfo"/></item>
-			<item text="About..." entryID="about_screen"><screen module="About" /></item>
+			<item level="1" text="Service" entryID="service_info_screen"><screen module="ServiceInfo" screen="ServiceInfo"/></item>
+			<item level="0" text="About..." entryID="about_screen"><screen module="About" /></item>
 		</menu>
 
-		<item text="Games / Plugins" entryID="plugin_selection"><screen module="PluginBrowser" screen="PluginBrowser" /></item>
-		<menu text="Setup" flushConfigOnClose="1" entryID="setup_selection" >
+		<item level="1" text="Plugins" entryID="plugin_selection"><screen module="PluginBrowser" screen="PluginBrowser" /></item>
+		<menu level="0" text="Setup" flushConfigOnClose="1" entryID="setup_selection" >
 			<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 text="Service Searching" entryID="service_searching_selection">
+			<menu weight="0" level="0" text="Service Searching" entryID="service_searching_selection">
 				<id val="scan" />
 				<item text="Tuner configuration" entryID="tuner_setup"><screen module="Satconfig" screen="NimSelection" /></item>
+				<item text="Default services lists" entryID="default_lists"><screen module="ScanSetup" screen="DefaultSatLists" /></item>
 				<item text="Automatic Scan" entryID="auto_scan"><screen module="ScanSetup" screen="ScanSimple" /></item>
 				<!--<item text="Automatic Scan"><screen module="ServiceScan" /></item>-->
 				<item text="Manual Scan" entryID="manual_scan"><screen module="ScanSetup" /></item>
@@ -46,31 +46,53 @@
 				<item text="Edit Transponder"></item>
 				<item text="Satfinder"></item>-->
 			</menu>
-			<menu text="System" entryID="system_selection">
+			<menu weight="5" level="0" text="System" entryID="system_selection">
 				<id val="system" />
-				<item text="Language..." entryID="language_setup"><screen module="LanguageSelection" /></item>
-				<item entryID="usage_setup"><setup id="usage" /></item>
-				<item entryID="timezone_setup"><setup id="timezone"/></item>
-				<item entryID="av_setup"><setup id="avsetup"/></item>
-				<item entryID="rfmod_setup"><setup id="RFmod"/></item>
-				<menu text="Harddisk" entryID="hardisk_selection">
+				<item level="0" text="Language..." entryID="language_setup"><screen module="LanguageSelection" /></item>
+				<item level="0" entryID="usage_setup"><setup id="usage" /></item>
+				<item level="0" entryID="timezone_setup"><setup id="timezone"/></item>
+				<item level="0" entryID="av_setup"><setup id="avsetup"/></item>
+				<!--<item level="0" text="Video Setup" entryID="video_setup"><screen module="VideoSetup" /></item>-->
+				<item level="1" entryID="rfmod_setup" requires="RfModulator"><setup id="RFmod"/></item>
+				<menu level="0" text="Harddisk" entryID="hardisk_selection" requires="Harddisk">
 					<id val="harddisk" />
-					<item entryID="harddisk_setup"><setup id="harddisk"/></item>
-					<item text="Initialization..." entryID="harddisk_init"><screen module="HarddiskSetup" screen="HarddiskSelection"/></item>
+					<item level="1" entryID="harddisk_setup"><setup id="harddisk"/></item>
+					<item level="0" text="Initialization..." entryID="harddisk_init"><screen module="HarddiskSetup" screen="HarddiskSelection"/></item>
+					<item level="0" text="Filesystem Check..." entryID="harddisk_check"><screen module="HarddiskSetup" screen="HarddiskFsckSelection"/></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..." entryID="network_setup">
+				<item requires="Display"><setup level="1" id="lcd" /></item>
+				<item level="0" text="Network..." entryID="network_setup"><screen module="NetworkSetup" screen="NetworkAdapterSelection" /></item>
+				<item text="Keyboard"><setup id="keyboard" /></item>
+				<!--<menu level="1" text="Network..." entryID="network_setup">
 					<id val="network" />
-					<item text="Device Setup..." entryID="device_setup"><screen module="NetworkSetup" screen="NetworkAdapterSelection"/></item>
-					<item text="Nameserver Setup..." entryID="dns_setup"><screen module="NetworkSetup" screen="NameserverSetup"/></item>
-				</menu>
+					<item level="1" text="Device Setup..." entryID="device_setup"><screen module="NetworkSetup" screen="NetworkAdapterSelection"/></item>
+					<item level="1" text="Nameserver Setup..." entryID="dns_setup"><screen module="NetworkSetup" screen="NameserverSetup"/></item>
+				</menu>-->
+				<item level="2" text="Timeshift path..." entryId="timeshift_path"><screen module="LocationBox" screen="TimeshiftLocationBox" /></item>
 			</menu>
-			<item text="Common Interface" entryID="ci_setup"><screen module="Ci" screen="CiSelection" /></item>
-			<item text="Parental control" entryID="parental_setup"><screen module="ParentalControlSetup" screen="ParentalControlSetup" /></item>
-			<item text="Startwizard" entryID="startwizzard"><screen module="StartWizard" screen="StartWizard" /></item>
+			<item weight="10" level="1" text="Common Interface" entryID="ci_setup" requires="CommonInterface"><screen module="Ci" screen="CiSelection" /></item>
+			<item weight="15" level="0" text="Parental control" entryID="parental_setup"><screen module="ParentalControlSetup" screen="ParentalControlSetup" /></item>
+			<!--item level="0" text="Startwizard" entryID="startwizzard"><screen module="StartWizard" screen="StartWizard" /></item-->
+			<item weight="20" level="0" text="Default settings" entryID="default_wizard">
+				<code>
+from Screens.DefaultWizard import DefaultWizard
+self.session.open(DefaultWizard, silent = False)
+</code>
+			</item>
+			<item weight="25" level="0" text="Factory reset" entryID="factory_reset">
+				<code>
+from Screens.FactoryReset import FactoryReset
+def msgClosed(ret):
+	if ret:
+		from os import system, _exit
+		system("rm -R /etc/enigma2")
+		system("cp -R /usr/share/enigma2/defaults /etc/enigma2")
+		_exit(0)
+self.session.openWithCallback(msgClosed, FactoryReset)
+</code>
+			</item>
 			<!--<item text="Parental Control"><setup id="parental" /></item>-->
 			<!--<item text="Expert -disabled-"><setup id="expert" /></item>-->
 		</menu>
@@ -78,8 +100,10 @@
 		<menu text="Standby / Restart" entryID="standby_restart_list">
 			<id val="shutdown" />
 			<!--<item text="Standby"><code>quitMainloop(0)</code></item>-->
+			<item text="Sleep Timer" entryID="sleep"><screen module="SleepTimerEdit" screen="SleepTimerEdit" /></item>
 			<item text="Standby" entryID="standby"><screen module="Standby" screen="Standby"/></item>
 			<item text="Restart" entryID="restart"><screen module="Standby" screen="TryQuitMainloop">2</screen></item>
+			<item level="2" text="Restart GUI" entryID="restart_enigma"><screen module="Standby" screen="TryQuitMainloop">3</screen></item>
 			<item text="Deep Standby" entryID="deep_standby"><screen module="Standby" screen="TryQuitMainloop">1</screen></item>
 		</menu>
 </menu>