Merge commit 'origin/bug_503_softwaremanager_catch_feederror'

[enigma2.git] / data / menu.xml

diff --git a/data/menu.xml b/data/menu.xml
old mode 100644 (file)
new mode 100755 (executable)
index 7dc764a..b437fbc
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -24,7 +24,7 @@
                <menu level="0" text="Information" entryID="info_screen">
                        <id val="information" />
                        <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>
+                       <item level="0" text="About" entryID="about_screen"><screen module="About" /></item>
                </menu>
 
                <item level="1" text="Plugins" entryID="plugin_selection"><screen module="PluginBrowser" screen="PluginBrowser" /></item>
@@ -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,9 +46,9 @@
                                <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" 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>
@@ -57,45 +57,36 @@
                                <menu level="0" text="Harddisk" entryID="hardisk_selection" requires="Harddisk">
                                        <id val="harddisk" />
                                        <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>
+                                       <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 requires="Display"><setup level="1" id="lcd" /></item>
-                               <item level="0" text="Network..." entryID="network_setup"><screen module="NetworkSetup" screen="NetworkAdapterSelection" /></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="25" level="0" text="Factory reset" entryID="factory_reset">
                                <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
+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, MessageBox, _("When you do a factory reset, you will lose ALL your configuration data\n"
-       "(including bouquets, services, satellite data ...)\n"
-       "After completion of factory reset, your receiver will restart automatically!\n\n"
-       "Really do a factory reset?"), MessageBox.TYPE_YESNO)
-</code></item>
+self.session.openWithCallback(msgClosed, FactoryReset)
+</code>
+                       </item>
                        <!--<item text="Parental Control"><setup id="parental" /></item>-->
                        <!--<item text="Expert -disabled-"><setup id="expert" /></item>-->
                </menu>
@@ -107,6 +98,7 @@ self.session.openWithCallback(msgClosed, MessageBox, _("When you do a factory re
                        <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>
+                       <item text="Deep Standby" requires="DeepstandbySupport" entryID="deep_standby"><screen module="Standby" screen="TryQuitMainloop">1</screen></item>
+                       <item text="Shutdown" requires="!DeepstandbySupport" entryID="deep_standby"><screen module="Standby" screen="TryQuitMainloop">1</screen></item>
                </menu>
 </menu>