beautify the ok, cancel and initialize buttons

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

diff --git a/lib/python/Screens/HarddiskSetup.py b/lib/python/Screens/HarddiskSetup.py
index 73e3d6464785cc1610a0b2e8ce69c2490918f16b..582b5ba85b6d16129b6c91e783d69afd6ce26780 100644 (file)
--- a/lib/python/Screens/HarddiskSetup.py
+++ b/lib/python/Screens/HarddiskSetup.py
@@ -3,19 +3,20 @@ 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()
-               self.hdd.initialize()
-               self.close()
+               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["wait"] = Label(_("Initializing Harddisk..."));
                self.timer = eTimer()
                self.timer.timeout.get().append(self.doInit)
                self.timer.start(100)
@@ -25,10 +26,11 @@ class HarddiskSetup(Screen):
                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"],
                {
@@ -41,9 +43,13 @@ class HarddiskSetup(Screen):
                        "red": self.hddInitialize
                })
 
-       def hddReady(self):
-               self.close()
-
+       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):
                print "this will start the initialize now!"
                self.session.openWithCallback(self.hddReady, HarddiskWait, self.hdd)
@@ -54,7 +60,7 @@ class HarddiskSelection(Screen):
                
                if harddiskmanager.HDDCount() == 0:
                        tlist = []
-                       tlist.append(("no HDD found", 0))
+                       tlist.append((_("no HDD found"), 0))
                        self["hddlist"] = MenuList(tlist)
                else:                   
                        self["hddlist"] = MenuList(harddiskmanager.HDDList())