add language selection

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

diff --git a/lib/python/Screens/HarddiskSetup.py b/lib/python/Screens/HarddiskSetup.py
index 9c7f65e8ed43f28b1ce8bf98255c375b54e9e934..1f936010340e167ffe31dad8c7d64dd366b2f449 100644 (file)
--- 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()
+               result = self.hdd.initialize()
+               self.close(result)
 
-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,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]))
+               else:
+                       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 +71,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])