From 9388629a4f48442984dcf3dc0f2c244c6633618c Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Fri, 11 Jul 2008 15:53:19 +0000 Subject: [PATCH] use harddiskmanager in about screen --- lib/python/Components/Harddisk.py | 1 - lib/python/Screens/About.py | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py index e0b6687..9c695a2 100644 --- a/lib/python/Components/Harddisk.py +++ b/lib/python/Components/Harddisk.py @@ -355,7 +355,6 @@ class HarddiskManager: if cap != "": hdd += " (" + cap + ")" list.append((hdd, hd)) - print "list", list return list def getMountedPartitions(self, onlyhotplug = False): diff --git a/lib/python/Screens/About.py b/lib/python/Screens/About.py index 0e77aba..e184512 100644 --- a/lib/python/Screens/About.py +++ b/lib/python/Screens/About.py @@ -1,7 +1,7 @@ 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 @@ -32,10 +32,11 @@ class About(Screen): 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())) - else: + else: self["hddA"] = StaticText(_("none")) self["actions"] = ActionMap(["SetupActions", "ColorActions"], -- 2.7.4