X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9dc29bf90e1c24fefc79a3f9622d379e5d4b5bb9..4531ea135c84d78d96d66a08b67f1f5e09475c55:/data/menu.xml

diff --git a/data/menu.xml b/data/menu.xml
index 2ff3a235..56b3ee65 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>
@@ -64,11 +64,13 @@
 				<!--<item text="Keyboard"><setup id="keyboard" /></item>-->
 				<!--<item text="OSD"><setup id="osd" /></item>-->
 				<item requires="Display"><setup level="1" id="lcd" /></item>
-				<menu level="1" text="Network..." entryID="network_setup">
+				<item level="0" text="Network..." entryID="network_setup"><screen module="NetworkSetup" screen="NetworkAdapterSelection" /></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>
+				</menu>-->
+				<item level="2" text="Timeshift path..." entryId="timeshift_path"><screen module="LocationBox" screen="TimeshiftLocationBox" /></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>
@@ -80,20 +82,17 @@ self.session.open(DefaultWizard, silent = False)
 </code>
 			</item>
 			<item level="0" text="Factory reset" entryID="factory_reset">
-<code>
-from Screens.MessageBox import MessageBox
+				<code>
+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>
@@ -101,6 +100,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>