whitespace fixup

[enigma2.git] / data / menu.xml

diff --git a/data/menu.xml b/data/menu.xml
index 47034bbae9527da3312a14377646d35361cc4358..d562ab3b434ef7d0834ddc004728181bc6014576 100644 (file)
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -17,8 +17,10 @@
                <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="VCR scart"><screen module="Scart" screen="Scart" /></item>
+               <item text="VCR scart"><code>self.session.scart.VCRSbChanged(3)</code></item>
 
                <menu text="Information">
                        <id val="information" />
@@ -27,7 +29,7 @@
                </menu>
 
                <item text="Games / Plugins"><screen module="PluginBrowser" screen="PluginBrowser" /></item>
-               <menu text="Setup">
+               <menu text="Setup" flushConfigOnClose="1" >
                        <id val="setup" />
                        <!--<menu text="Service Organising">
                                <item text="New Bouquets"></item>
@@ -36,7 +38,7 @@
                        </menu>-->
                        <menu text="Service Searching">
                                <id val="scan" />
-                               <item text="Satelliteconfig"><screen module="Satconfig" screen="NimSelection" /></item>
+                               <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>
@@ -46,19 +48,29 @@
                        </menu>
                        <menu text="System">
                                <id val="system" />
-                               <item text="Language"><screen module="LanguageSelection" /></item>
-                               <item text="Usage Settings"><setup id="usage" /></item>
-                               <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="HarddiskSetup" screen="HarddiskSelection"/></item>
+                               <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 text="LCD"><setup id="lcd" /></item>
-                               <item text="Network"><screen module="NetworkSetup" screen="NetworkSetup" /></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"><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>
@@ -66,7 +78,8 @@
                <menu text="Standby / Restart">
                        <id val="shutdown" />
                        <!--<item text="Standby"><code>quitMainloop(0)</code></item>-->
-                       <item text="Restart"><code>quitMainloop(2)</code></item>
-                       <item text="Deep Standby"><code>quitMainloop(1)</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>