remove bouquets.tv and userbouquets... from Makefile (it is installed

[enigma2.git] / data / menu.xml

diff --git a/data/menu.xml b/data/menu.xml
index fea00c0b1a501d405e1e14ae22010e508a8b7ea7..93455b2314bcb3ea9fb48474a8c87437cfedb979 100644 (file)
--- 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> 
@@ -38,6 +38,7 @@
                        <menu 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>
@@ -63,16 +64,23 @@
                                <!--<item text="Keyboard"><setup id="keyboard" /></item>-->
                                <!--<item text="OSD"><setup id="osd" /></item>-->
                                <item requires="Display"><setup level="1" id="lcd" /></item>
-                               <menu level="1" text="Network..." entryID="network_setup">
+                               <item level="0" text="Network..." entryID="network_setup"><screen module="NetworkSetup" screen="NetworkAdapterSelection" /></item>
+                               <!--<menu level="1" text="Network..." entryID="network_setup">
                                        <id val="network" />
                                        <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>
+                               </menu>-->
                        </menu>
                        <item level="1" text="Common Interface" entryID="ci_setup" requires="CommonInterface"><screen module="Ci" screen="CiSelection" /></item>
                        <item 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 level="0" text="Factoryreset" entryID="factory_reset">
+                       <item level="0" text="Default settings" entryID="default_wizard">
+                               <code>
+from Screens.DefaultWizard import DefaultWizard
+self.session.open(DefaultWizard, silent = False)
+</code>
+                       </item>
+                       <item level="0" text="Factory reset" entryID="factory_reset">
 <code>
 from Screens.MessageBox import MessageBox
 def msgClosed(ret):