make some stuff even simpler

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

diff --git a/lib/python/Screens/HarddiskSetup.py b/lib/python/Screens/HarddiskSetup.py
index a2b3ed4f8500160cee6d1efe0fcee8c68b8906a0..00158288913d11cf698f5e350ef5e7de395b7ef5 100644 (file)
--- a/lib/python/Screens/HarddiskSetup.py
+++ b/lib/python/Screens/HarddiskSetup.py
@@ -3,24 +3,16 @@ from Components.ActionMap import ActionMap
 from Components.Harddisk import harddiskmanager                        #global harddiskmanager
 from Components.MenuList import MenuList
 from Components.Label import Label
 from Components.Harddisk import harddiskmanager                        #global harddiskmanager
 from Components.MenuList import MenuList
 from Components.Label import Label

+from Screens.MessageBox import MessageBox

 
 class HarddiskSetup(Screen):
        def __init__(self, session, hdd):
                Screen.__init__(self, session)
                self.hdd = hdd
                
 
 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["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"],
                self["initialize"] = Label("Initialize")
 
                self["actions"] = ActionMap(["OkCancelActions"],


@@ -35,7 +27,12 @@ class HarddiskSetup(Screen):
                })
 
        def hddInitialize(self):
                })
 
        def hddInitialize(self):

-               self.hdd.initialize()
+               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()

 
 class HarddiskSelection(Screen):
        def __init__(self, session):
 
 class HarddiskSelection(Screen):
        def __init__(self, session):