hdd format (initialize) works now

actual theres no additional question when you use the red shortcut ;)
(msgbox is missing)

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index 3c2425103c1fce829b8bab8c129a2b190d4ff40a..e925acd1337c2eafd0d0d23b79599d4c0ab929f0 100644 (file)
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -21,6 +21,9 @@ class Harddisk:
                self.prochdx = num2prochdx(index)
                self.devidex = "/dev/ide/host%d/bus%d/target%d/lun0/" % (host, bus, target)
 
+       def index(self):
+               return self.index
+
        def capacity(self):
                procfile = tryOpen(self.prochdx + "capacity")
                

diff --git a/lib/python/Screens/HarddiskSetup.py b/lib/python/Screens/HarddiskSetup.py
index 45ce9543fb562ac112264b08afacf89e5a80fee5..a2b3ed4f8500160cee6d1efe0fcee8c68b8906a0 100644 (file)
--- a/lib/python/Screens/HarddiskSetup.py
+++ b/lib/python/Screens/HarddiskSetup.py
@@ -2,6 +2,40 @@ from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.Harddisk import harddiskmanager                        #global harddiskmanager
 from Components.MenuList import MenuList
+from Components.Label import Label
+
+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["initialize"] = Label("Initialize")
+
+               self["actions"] = ActionMap(["OkCancelActions"],
+               {
+                       "ok": self.close,
+                       "cancel": self.close
+               })
+               
+               self["shortcuts"] = ActionMap(["ShortcutActions"],
+               {
+                       "red": self.hddInitialize
+               })
+
+       def hddInitialize(self):
+               self.hdd.initialize()
 
 class HarddiskSelection(Screen):
        def __init__(self, session):
@@ -16,5 +50,7 @@ class HarddiskSelection(Screen):
                })
 
        def okbuttonClick(self):
+               selection = self["hddlist"].getCurrent()
+               self.session.open(HarddiskSetup, selection[1])
                print "ok"
                pass