Merge branch 'bug157_wizard_virtualkeyboard' into experimental

[enigma2.git] / data / menu.xml

diff --git a/data/menu.xml b/data/menu.xml
index 56b3ee651c78e751aed6a5a0e3a1b1078379fb7f..403e0b81bab8d5909a9b256eea7850b5a52335d3 100644 (file)
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -35,7 +35,7 @@
                                <item text="Add to Bouquets"></item>
                                <item text="Edit Bouquets"></item>
                        </menu>-->
-                       <menu level="0" 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>
@@ -46,7 +46,7 @@
                                <item text="Edit Transponder"></item>
                                <item text="Satfinder"></item>-->
                        </menu>
-                       <menu level="0" text="System" entryID="system_selection">
+                       <menu weight="5" level="0" text="System" entryID="system_selection">
                                <id val="system" />
                                <item level="0" text="Language..." entryID="language_setup"><screen module="LanguageSelection" /></item>
                                <item level="0" entryID="usage_setup"><setup id="usage" /></item>
@@ -61,27 +61,27 @@
                                        <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 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 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>
+                               <item level="2" text="Recording paths..." entryId="RecordPaths"><screen module="RecordPaths" screen="RecordPathsSettings" /></item>
                        </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 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 level="0" text="Default settings" entryID="default_wizard">
+                       <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 level="0" text="Factory reset" entryID="factory_reset">
+                       <item weight="25" level="0" text="Factory reset" entryID="factory_reset">
                                <code>
 from Screens.FactoryReset import FactoryReset
 def msgClosed(ret):