fix bluescreen

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

diff --git a/lib/python/Screens/HarddiskSetup.py b/lib/python/Screens/HarddiskSetup.py
index 3d605924a0b2fc85f155fa2ebb68096ee7a68650..582b5ba85b6d16129b6c91e783d69afd6ce26780 100644 (file)
--- a/lib/python/Screens/HarddiskSetup.py
+++ b/lib/python/Screens/HarddiskSetup.py
@@ -3,17 +3,34 @@ 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()
+               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"] = Pixmap()
+               self["initializetext"] = Label(_("Initialize"))
 
                self["actions"] = ActionMap(["OkCancelActions"],
                {
@@ -26,20 +43,27 @@ 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]), MessageBox.TYPE_ERROR)
+               else:
+                       self.close()
+                       
        def hddInitialize(self):
-               #some protection for the exhibition (IFA 2005)
-               #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:  
                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):
                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"],
                {
@@ -49,4 +73,5 @@ class HarddiskSelection(Screen):
 
        def okbuttonClick(self):
                selection = self["hddlist"].getCurrent()
-               self.session.open(HarddiskSetup, selection[1])
+               if selection[1] != 0:
+                       self.session.open(HarddiskSetup, selection[1])