comment out assertion as long no other solution for recursive close all open windows...

[enigma2.git] / data / menu.xml

diff --git a/data/menu.xml b/data/menu.xml
index 9483a2ab8e994fea8da8ea9fdfc3eb624db6132e..db3c95ef5e1fe90b7a23b61301e4f7aba61b81e8 100644 (file)
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -1,5 +1,5 @@
 <menu text="Mainmenu" title="Mainmenu">
 <menu text="Mainmenu" title="Mainmenu">

-
+       <id val="mainmenu" />

 <!-- the following types are allowed:
        <screen [module="mod"] [screen="classname"]>[arguments]</screen> 
                executes Screen called "classname" from module "Screen.mod"
 <!-- the following types are allowed:
        <screen [module="mod"] [screen="classname"]>[arguments]</screen> 
                executes Screen called "classname" from module "Screen.mod"


@@ -14,24 +14,29 @@
                "exec"s code
 -->
                <!--<item text="Standby debug">quitMainloop(0)</item>
                "exec"s code
 -->
                <!--<item text="Standby debug">quitMainloop(0)</item>

-               <item text="Networksetup">self.openSetup("network")</item>-->
+               <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="CI"><screen module="Ci" screen="CiSelection" /></item>-->
                <!--<item text="Radio"><code>print "radio mode"</code></item>-->

+               <item text="Media player"><screen module="MediaPlayer" screen="MediaPlayer" /></item>

                <item text="Timer"><screen module="TimerEdit" screen="TimerEditList" /></item>
                <item text="Timer"><screen module="TimerEdit" screen="TimerEditList" /></item>

+               <item text="VCR scart"><screen module="Scart" screen="Scart" /></item>

 
                <menu text="Information">
 
                <menu text="Information">

+                       <id val="information" />

                        <item text="Service"><screen module="ServiceInfo" screen="ServiceInfo"/></item>
                        <item text="About..."><screen module="About" /></item>
                </menu>
 
                        <item text="Service"><screen module="ServiceInfo" screen="ServiceInfo"/></item>
                        <item text="About..."><screen module="About" /></item>
                </menu>
 

-               <item text="Games / Plugins"><screen module="PluginBrowser" /></item>
-               <menu text="Setup">
+               <item text="Games / Plugins"><screen module="PluginBrowser" screen="PluginBrowser" /></item>
+               <menu text="Setup" flushConfigOnClose="1" >
+                       <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">
                        <!--<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">

+                               <id val="scan" />

                                <item text="Satelliteconfig"><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="Satelliteconfig"><screen module="Satconfig" screen="NimSelection" /></item>
                                <item text="Automatic Scan"><screen module="ScanSetup" screen="ScanSimple" /></item>
                                <!--<item text="Automatic Scan"><screen module="ServiceScan" /></item>-->


@@ -41,23 +46,27 @@
                                <!--<item text="Satfinder"></item>-->
                        </menu>
                        <menu text="System">
                                <!--<item text="Satfinder"></item>-->
                        </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="Timezone"><setup id="timezone" /></item>

-                               <item text="Video Audio"><setup id="avsetup" /></item>
+                               <item text="Audio / Video"><setup id="avsetup" /></item>

                                <item text="UHF Modulator"><setup id="RFmod" /></item>
                                <item text="Harddisk"><screen module="HarddiskSetup" screen="HarddiskSelection"/></item>
                                <!--<item text="Remote Control"><setup id="rc" /></item>-->
                                <!--<item text="Keyboard"><setup id="keyboard" /></item>-->
                                <item text="UHF Modulator"><setup id="RFmod" /></item>
                                <item text="Harddisk"><screen module="HarddiskSetup" screen="HarddiskSelection"/></item>
                                <!--<item text="Remote Control"><setup id="rc" /></item>-->
                                <!--<item text="Keyboard"><setup id="keyboard" /></item>-->

-                               <item text="OSD"><setup id="osd" /></item>
+                               <!--<item text="OSD"><setup id="osd" /></item>-->

                                <item text="LCD"><setup id="lcd" /></item>
                                <item text="Network"><screen module="NetworkSetup" screen="NetworkSetup" /></item>
                        </menu>
                        <item text="Common Interface"><screen module="Ci" screen="CiSelection" /></item>
                        <!--<item text="Parental Control"><setup id="parental" /></item>-->
                                <item text="LCD"><setup id="lcd" /></item>
                                <item text="Network"><screen module="NetworkSetup" screen="NetworkSetup" /></item>
                        </menu>
                        <item text="Common Interface"><screen module="Ci" screen="CiSelection" /></item>
                        <!--<item text="Parental Control"><setup id="parental" /></item>-->

-                       <item text="Expert"><setup id="expert" /></item>
+                       <!--<item text="Expert -disabled-"><setup id="expert" /></item>-->

                </menu>
                <!--<item text="Unser Setup">self.openSetup("Blaselfasel")</item>-->
                <menu text="Standby / Restart">
                </menu>
                <!--<item text="Unser Setup">self.openSetup("Blaselfasel")</item>-->
                <menu text="Standby / Restart">

-                       <item text="Standby"><code>quitMainloop(0)</code></item>
+                       <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>
                </menu>
                        <item text="Restart"><code>quitMainloop(2)</code></item>
                        <item text="Deep Standby"><code>quitMainloop(1)</code></item>
                </menu>