parsing for /etc/timezone.xml added

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

diff --git a/lib/python/Screens/HarddiskSetup.py b/lib/python/Screens/HarddiskSetup.py
index a2b3ed4f8500160cee6d1efe0fcee8c68b8906a0..73e3d6464785cc1610a0b2e8ce69c2490918f16b 100644 (file)
--- a/lib/python/Screens/HarddiskSetup.py
+++ b/lib/python/Screens/HarddiskSetup.py
@@ -3,24 +3,31 @@ from Components.ActionMap import ActionMap
 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()
+
+       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
                
-               cap = hdd.capacity() / 1000 * 512 / 1000
-               capstr = "Capacity: %d.%03d GB" % (cap / 1000, cap % 1000)
-
                self["model"] = Label("Model: " + hdd.model())
-               self["capacity"] = Label(capstr)
-               
-               if hdd.index & 1:
-                       busstr = "Slave"
-               else:   
-                       busstr = "Master"
-               
-               self["bus"] = Label("Bus: " + busstr)
+               self["capacity"] = Label("Capacity: " + hdd.capacity())
+               self["bus"] = Label("Bus: " + hdd.bus())
                self["initialize"] = Label("Initialize")
 
                self["actions"] = ActionMap(["OkCancelActions"],
@@ -34,14 +41,23 @@ class HarddiskSetup(Screen):
                        "red": self.hddInitialize
                })
 
+       def hddReady(self):
+               self.close()
+
        def hddInitialize(self):
-               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"],
                {
@@ -51,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])