diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-02-11 12:52:48 +0100 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-02-11 12:52:48 +0100 |
| commit | bbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b (patch) | |
| tree | c5945c791698c14723e989449e6b4bfcc275c05d /data/menu.xml | |
| parent | 4f7990ff2a55874b9eb65e3c9cd47dacb9f76deb (diff) | |
| parent | 5e6f814d005a01caa437a532e61f4b338617ff67 (diff) | |
| download | enigma2-bbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b.tar.gz enigma2-bbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b.zip | |
Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
Conflicts:
lib/dvb/decoder.cpp
Diffstat (limited to 'data/menu.xml')
| -rw-r--r-- | data/menu.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/data/menu.xml b/data/menu.xml index 369b20e0..7dc764ac 100644 --- a/data/menu.xml +++ b/data/menu.xml @@ -54,7 +54,7 @@ <item level="0" entryID="av_setup"><setup id="avsetup"/></item> <!--<item level="0" text="Video Setup" entryID="video_setup"><screen module="VideoSetup" /></item>--> <item level="1" entryID="rfmod_setup" requires="RfModulator"><setup id="RFmod"/></item> - <menu level="0" text="Harddisk" entryID="hardisk_selection" requires="Harddisc"> + <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> @@ -103,6 +103,7 @@ self.session.openWithCallback(msgClosed, MessageBox, _("When you do a factory re <menu text="Standby / Restart" entryID="standby_restart_list"> <id val="shutdown" /> <!--<item text="Standby"><code>quitMainloop(0)</code></item>--> + <item text="Sleep Timer" entryID="sleep"><screen module="SleepTimerEdit" screen="SleepTimerEdit" /></item> <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> |