git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use cElementTree instead of minidom for xml parsing (thx to Moritz Venn)
[enigma2.git]
/
lib
/
python
/
Screens
/
About.py
diff --git
a/lib/python/Screens/About.py
b/lib/python/Screens/About.py
index 8db58e73664a0f6aecf54e26d205fd812141ad09..e184512b8ca5ca847b432971039c28fb56e79023 100644
(file)
--- a/
lib/python/Screens/About.py
+++ b/
lib/python/Screens/About.py
@@
-1,8
+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.Sources.Source import ObsoleteSource
-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
@@
-33,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"],