X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1e8da5bf1b50c41eba7b5ec8c10be4762f46015d..2fcfe7e7703ce61ccb532939b6e2132b8423b7c3:/lib/python/Screens/HarddiskSetup.py

diff --git a/lib/python/Screens/HarddiskSetup.py b/lib/python/Screens/HarddiskSetup.py
index 9c7f65e8..3e90d4fb 100644
--- a/lib/python/Screens/HarddiskSetup.py
+++ b/lib/python/Screens/HarddiskSetup.py
@@ -4,27 +4,31 @@ from Components.Harddisk import harddiskmanager			#global harddiskmanager
 from Components.MenuList import MenuList
 from Components.Label import Label
 from Screens.MessageBox import MessageBox
+from enigma import eTimer
+
+class HarddiskWait(Screen):
+	def doInit(self):
+		self.timer.stop()
+		self.hdd.initialize()
+		self.close()
 
-class HarddiskSetup(Screen):
 	def __init__(self, session, hdd):
 		Screen.__init__(self, session)
 		self.hdd = hdd
-		
-		cap = hdd.capacity() / 1000 * 512 / 1000
-		capstr = "Capacity: %d.%03d GB" % (cap / 1000, cap % 1000)
+		self["wait"] = Label(_("Initializing Harddisk..."));
+		self.timer = eTimer()
+		self.timer.timeout.get().append(self.doInit)
+		self.timer.start(100)
 
-		self["model"] = Label("Model: " + hdd.model())
-		self["capacity"] = Label(capstr)
-
-		idx = hdd.getIndex()
-		
-		if idx & 1:
-			busstr = "Slave"
-		else:	
-			busstr = "Master"
+class HarddiskSetup(Screen):
+	def __init__(self, session, hdd):
+		Screen.__init__(self, session)
+		self.hdd = hdd
 		
-		self["bus"] = Label("Bus: " + busstr)
-		self["initialize"] = Label("Initialize")
+		self["model"] = Label(_("Model: ") + hdd.model())
+		self["capacity"] = Label(_("Capacity: ") + hdd.capacity())
+		self["bus"] = Label(_("Bus: ") + hdd.bus())
+		self["initialize"] = Label(_("Initialize"))
 
 		self["actions"] = ActionMap(["OkCancelActions"],
 		{
@@ -37,19 +41,23 @@ class HarddiskSetup(Screen):
 			"red": self.hddInitialize
 		})
 
+	def hddReady(self):
+		self.close()
+
 	def hddInitialize(self):
-		if self.hdd.getIndex() == 2:		#CF
-			print "not a good idea!"
-			self.session.open(MessageBox, "not a good idea - this will kill our rootfs!")
-		else:	
-			pass
-			#self.hdd.initialize()
+		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)
-
-		self["hddlist"] = MenuList(harddiskmanager.HDDList())
+		
+		if harddiskmanager.HDDCount() == 0:
+			tlist = []
+			tlist.append((_("no HDD found"), 0))
+			self["hddlist"] = MenuList(tlist)
+		else:			
+			self["hddlist"] = MenuList(harddiskmanager.HDDList())
 		
 		self["actions"] = ActionMap(["OkCancelActions"],
 		{
@@ -59,6 +67,5 @@ class HarddiskSelection(Screen):
 
 	def okbuttonClick(self):
 		selection = self["hddlist"].getCurrent()
-		self.session.open(HarddiskSetup, selection[1])
-		print "ok"
-		pass
+		if selection[1] != 0:
+			self.session.open(HarddiskSetup, selection[1])