Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs

4 files changed, 5 insertions, 155 deletions

diff --git a/data/countries/lv.png b/data/countries/lv.png
new file mode 100644
index 00000000..3a29dad2
--- /dev/null
+++ b/data/countries/lv.png
diff --git a/data/imagewizard.xml b/data/imagewizard.xml
deleted file mode 100644
index 8c40e3f9..00000000
--- a/data/imagewizard.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<wizard>
-		<step id="restorequestion">
-			<condition>
-from Screens.ImageWizard import checkConfigBackup
-self.backuppath = checkConfigBackup()
-self.condition = (self.backuppath is not None)
-			</condition>
-			<text value="Do you want to restore your settings?" />
-			<list>
-				<listentry caption="Yes, restore the settings now" step="restore" />
-				<listentry caption="No, just start my dreambox" step="end" />
-			</list>
-		</step>
-
-		<step id="welcome">
-			<text value="Welcome to the Image upgrade wizard. The wizard will assist you in upgrading the firmware of your Dreambox by providing a backup facility for your current settings and a short explanation of how to upgrade your firmware." />
-			<list>
-				<listentry caption="OK, guide me through the upgrade process" step="backupquestion" />
-				<listentry caption="Exit the wizard" step="end" />
-			</list>
-		</step>
-
-		<step id="backupquestion">
-			<text value="The wizard can backup your current settings. Do you want to do a backup now?" />
-			<list>
-				<listentry caption="Yes, backup my settings!" step="backupwhere" />
-				<listentry caption="No backup needed" step="upgrade" />
-			</list>
-		</step>
-
-		<step id="backupwhere">
-			<text value="Where do you want to backup your settings?" />
-			<list>
-				<listentry caption="Harddisk" step="hdd" />
-				<listentry caption="Compact flash card" step="cf" />
-				<listentry caption="USB" step="usb" />
-				<listentry caption="Somewhere else" step="file" />
-			</list>
-		</step>
-
-		<step id="hdd" nextstep="backup">
-			<condition>
-from Components.Harddisk import harddiskmanager
-self.condition = harddiskmanager.HDDCount() > 0
-			</condition>
-			<text value="You have chosen to backup to your harddisk. Please press OK to start the backup now." />
-			<code pos="after">
-self.backuppath = '/media/hdd/'
-			</code>
-		</step>
-
-		<step id="hddfailed" nextstep="backupwhere">
-			<condition>
-from Components.Harddisk import harddiskmanager
-self.condition = harddiskmanager.HDDCount() == 0
-			</condition>
-			<text value="You do not seem to have a harddisk in your Dreambox. So backing up to a harddisk is not an option for you." />
-		</step>
-		
-		<step id="cf" nextstep="backup">
-			<text value="You have chosen to backup to a compact flash card. The card must be in the slot. We do not verify if it is really used at the moment. So better backup to the harddisk!\nPlease press OK to start the backup now." />
-			<code pos="after">
-self.backuppath = '/media/cf/'
-			</code>
-		</step>
-
-		<step id="usb" nextstep="backup">
-			<text value="You have chosen to backup to an usb drive. Better backup to the harddisk!\nPlease press OK to start the backup now." />
-			<code pos="after">
-self.backuppath = '/media/usb/'
-			</code>
-		</step>
-
-		<step id="file" nextstep="backupwhere">
-			<text value="This is unsupported at the moment." />
-		</step>
-
-		<step id="backup" nextstep="backupresult">
-			<code>
-from Screens.ImageWizard import doBackup
-doBackup(self.backuppath)
-			</code>
-			<text value="Backup is done. Please press OK to see the result." />
-		</step>
-		
-		<step id="backupresult" nextstep="upgrade">
-			<condition>
-from Screens.ImageWizard import checkConfigBackup
-self.backuppath = checkConfigBackup()
-self.condition = (self.backuppath is not None)
-			</condition>
-			<text value="Your backup succeeded. We will now continue to explain the further upgrade process." />
-		</step>
-
-		<step id="backupresultfailed" nextstep="backupwhere">
-			<condition>
-from Screens.ImageWizard import checkConfigBackup
-self.backuppath = checkConfigBackup()
-self.condition = (self.backuppath is None)
-			</condition>
-			<text value="The backup failed. Please choose a different backup location." />
-		</step>
-		
-		<step id="restore" nextstep="activate">
-			<code>
-from Screens.ImageWizard import doRestore
-doRestore(self.backuppath)
-			</code>
-			<text value="Restoring the settings is done. Please press OK to activate the restored settings now." />
-		</step>
-		
-		<step id="activate" nextstep="activate">
-			<code>
-import os
-from Screens.ImageWizard import backupfile
-print 'mv ' + self.backuppath + backupfile + ' ' + self.backuppath + backupfile + '.old'
-os.system('mv ' + self.backuppath + backupfile + ' ' + self.backuppath + backupfile + '.old')
-os.system('killall -9 enigma2') # ugly... no better solution atm
-			</code>
-		</step>
-		
-		<step id="upgrade">
-			<text value="You need a PC connected to your dreambox. If you need further instructions, please visit the website http://www.dm7025.de.\nYour dreambox will now be halted. After you have performed the update instructions from the website, your new firmware will ask you to restore your settings." />
-			<list>
-				<listentry caption="Yes, perform a shutdown now." step="shutdown" />
-				<listentry caption="No, do nothing." step="end" />
-			</list>
-		</step>
-
-		<step id="shutdown" nextstep="shutdown">
-			<code>
-from enigma import quitMainloop
-quitMainloop(1)
-			</code>
-			<text value="Your dreambox is shutting down. Please stand by..." />
-		</step>
-		
-		<step id="end">
-			<text value="The wizard is finished now." />
-		</step>
-</wizard>
diff --git a/data/menu.xml b/data/menu.xml
index 7dc764ac..56b3ee65 100644
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -82,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>
diff --git a/data/skin_default.xml b/data/skin_default.xml
index d60933eb..f99e1a76 100755
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -368,12 +368,6 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count &gt; 7 and 2 or 3)
 		<widget name="arrowup2" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" alphatest="on" />
 		<widget name="long_key" position="320,520" size="350,50" font="Regular;25" halign="right" foregroundColor="yellow" />
 	</screen>
-	<!-- Image Wizard -->
-	<screen name="ImageWizard" position="0,0" size="720,576" title="Welcome..." flags="wfNoBorder">
-		<widget name="text" position="50,100" size="440,250" font="Regular;22" />
-		<widget name="list" position="50,350" zPosition="1" size="440,200" />
-		<widget name="config" position="50,350" zPosition="1" size="440,200" transparent="1" scrollbarMode="showOnDemand" />
-	</screen>
 	<!-- Inputbox -->
 	<screen name="InputBox" position="80,250" size="550,90" title="Input">
 		<widget name="text" position="10,20" size="550,25" font="Regular;23" />