use harddiskmanager in about screen
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>
Fri, 11 Jul 2008 15:53:19 +0000 (15:53 +0000)
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>
Fri, 11 Jul 2008 15:53:19 +0000 (15:53 +0000)
lib/python/Components/Harddisk.py
lib/python/Screens/About.py

index e0b6687..9c695a2 100644 (file)
@@ -355,7 +355,6 @@ class HarddiskManager:
                        if cap != "":
                                hdd += " (" + cap + ")"
                        list.append((hdd, hd))
                        if cap != "":
                                hdd += " (" + cap + ")"
                        list.append((hdd, hd))
-               print "list", list
                return list
 
        def getMountedPartitions(self, onlyhotplug = False):
                return list
 
        def getMountedPartitions(self, onlyhotplug = False):
index 0e77aba..e184512 100644 (file)
@@ -1,7 +1,7 @@
 from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.Sources.StaticText import StaticText
 from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.Sources.StaticText import StaticText
-from Components.Harddisk import Harddisk
+from Components.Harddisk import harddiskmanager
 from Components.NimManager import nimmanager
 from Components.About import about
 
 from Components.NimManager import nimmanager
 from Components.About import about
 
@@ -32,10 +32,11 @@ class About(Screen):
                                self["Tuner" + str(count)] = StaticText("")
 
                self["HDDHeader"] = StaticText(_("Detected HDD:"))
                                self["Tuner" + str(count)] = StaticText("")
 
                self["HDDHeader"] = StaticText(_("Detected HDD:"))
-               hdd = Harddisk(0)
-               if hdd.model() != "":
+               hddlist = harddiskmanager.HDDList()
+               hdd = len(hddlist) > 0 and hddlist[0][1] or None
+               if hdd is not None and hdd.model() != "":
                        self["hddA"] = StaticText(_("%s\n(%s, %d MB free)") % (hdd.model(), hdd.capacity(),hdd.free()))
                        self["hddA"] = StaticText(_("%s\n(%s, %d MB free)") % (hdd.model(), hdd.capacity(),hdd.free()))
-               else:                   
+               else:
                        self["hddA"] = StaticText(_("none"))
 
                self["actions"] = ActionMap(["SetupActions", "ColorActions"], 
                        self["hddA"] = StaticText(_("none"))
 
                self["actions"] = ActionMap(["SetupActions", "ColorActions"],