use slotid as parameter for the SatSetup instead of nim for easier inclusing into...

[enigma2.git] / lib / python / Screens / HarddiskSetup.py

diff --git a/lib/python/Screens/HarddiskSetup.py b/lib/python/Screens/HarddiskSetup.py
index 8a683a5452a15fc8cbec83a9d501ba269270ac18..1f936010340e167ffe31dad8c7d64dd366b2f449 100644 (file)
--- a/lib/python/Screens/HarddiskSetup.py
+++ b/lib/python/Screens/HarddiskSetup.py
@@ -4,16 +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()
+               result = self.hdd.initialize()
+               self.close(result)
+
+       def __init__(self, session, hdd):
+               Screen.__init__(self, session)
+               self.hdd = hdd
+               self["wait"] = Label(_("Initializing Harddisk..."));
+               self.timer = eTimer()
+               self.timer.timeout.get().append(self.doInit)
+               self.timer.start(100)
 
 class HarddiskSetup(Screen):
        def __init__(self, session, hdd):
                Screen.__init__(self, session)
                self.hdd = hdd
                
-               self["model"] = Label("Model: " + hdd.model())
-               self["capacity"] = Label("Capacity: " + hdd.capacity())
-               self["bus"] = Label("Bus: " + hdd.bus())
-               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"],
                {
@@ -26,9 +41,16 @@ class HarddiskSetup(Screen):
                        "red": self.hddInitialize
                })
 
+       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]))
+               else:
+                       self.close()
+                       
        def hddInitialize(self):
                print "this will start the initialize now!"
-               self.hdd.initialize()
+               self.session.openWithCallback(self.hddReady, HarddiskWait, self.hdd)
 
 class HarddiskSelection(Screen):
        def __init__(self, session):
@@ -36,7 +58,7 @@ class HarddiskSelection(Screen):
                
                if harddiskmanager.HDDCount() == 0:
                        tlist = []
-                       tlist.append(("no HDD found", 0))
+                       tlist.append((_("no HDD found"), 0))
                        self["hddlist"] = MenuList(tlist)
                else:                   
                        self["hddlist"] = MenuList(harddiskmanager.HDDList())