X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FHarddiskSetup.py;h=a6e14cb8515e0957088df3fcbc99f9d8f749f63f;hb=5824a5dd33390117c70ff1cdfdf76afaaaac71ac;hp=3e90d4fb0dc6cf6d0cb78f0917e3e04516accfcf;hpb=2fcfe7e7703ce61ccb532939b6e2132b8423b7c3;p=vuplus_dvbapp

diff --git a/lib/python/Screens/HarddiskSetup.py b/lib/python/Screens/HarddiskSetup.py
index 3e90d4f..a6e14cb 100644
--- a/lib/python/Screens/HarddiskSetup.py
+++ b/lib/python/Screens/HarddiskSetup.py
@@ -3,14 +3,15 @@ from Components.ActionMap import ActionMap
 from Components.Harddisk import harddiskmanager			#global harddiskmanager
 from Components.MenuList import MenuList
 from Components.Label import Label
+from Components.Pixmap import Pixmap
 from Screens.MessageBox import MessageBox
 from enigma import eTimer
 
 class HarddiskWait(Screen):
 	def doInit(self):
 		self.timer.stop()
-		self.hdd.initialize()
-		self.close()
+		result = self.hdd.initialize()
+		self.close(result)
 
 	def __init__(self, session, hdd):
 		Screen.__init__(self, session)
@@ -28,7 +29,8 @@ class HarddiskSetup(Screen):
 		self["model"] = Label(_("Model: ") + hdd.model())
 		self["capacity"] = Label(_("Capacity: ") + hdd.capacity())
 		self["bus"] = Label(_("Bus: ") + hdd.bus())
-		self["initialize"] = Label(_("Initialize"))
+		self["initialize"] = Pixmap()
+		self["initializetext"] = Label(_("Initialize"))
 
 		self["actions"] = ActionMap(["OkCancelActions"],
 		{
@@ -41,13 +43,23 @@ class HarddiskSetup(Screen):
 			"red": self.hddInitialize
 		})
 
-	def hddReady(self):
-		self.close()
+	def hddReady(self, result):
+		print "Result: " + str(result)
+		if (result != 0):
+			self.session.open(MessageBox, _("Unable to initialize harddisk.\nPlease refer to the user manual.\nError: ") + str(self.hdd.errorList[0 - result]), MessageBox.TYPE_ERROR)
+		else:
+			self.close()
 
 	def hddInitialize(self):
+		self.session.openWithCallback(self.hddInitConfirmed, MessageBox, _("Do you really want to initialize the harddisk?\nAll data on the disk will be lost!"))
+
+	def hddInitConfirmed(self, confirmed):
+		if not confirmed:
+			return
+
 		print "this will start the initialize now!"
 		self.session.openWithCallback(self.hddReady, HarddiskWait, self.hdd)
-
+			
 class HarddiskSelection(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)