git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revert local change
[enigma2.git]
/
lib
/
python
/
Screens
/
About.py
diff --git
a/lib/python/Screens/About.py
b/lib/python/Screens/About.py
index 5bd5f273ed6d53464f0d6330052028d401718002..8270210a9273100583d752ea35d33883437f078a 100644
(file)
--- a/
lib/python/Screens/About.py
+++ b/
lib/python/Screens/About.py
@@
-6,6
+6,8
@@
from Components.NimManager import nimmanager
from Components.MenuList import MenuList
from Components.About import about
from Components.MenuList import MenuList
from Components.About import about
+from Tools.DreamboxHardware import getFPVersion
+
class About(Screen):
def __init__(self, session):
Screen.__init__(self, session)
class About(Screen):
def __init__(self, session):
Screen.__init__(self, session)
@@
-13,17
+15,27
@@
class About(Screen):
self["text"] = Label("Enigma v" + about.getVersionString())
self["tuner"] = Label(_("Detected NIMs:"))
self["text"] = Label("Enigma v" + about.getVersionString())
self["tuner"] = Label(_("Detected NIMs:"))
+
+ fp_version = getFPVersion()
+ if fp_version is None:
+ fp_version = ""
+ else:
+ fp_version = _("Frontprocessor version: %d") % fp_version
+
+ self["fpVersion"] = Label(fp_version)
nims = nimmanager.nimList()
nims = nimmanager.nimList()
- count = 0
- for i in nims:
- self["tuner" + str(count)] = Label(i[0])
- count += 1
+ for count in range(2):
+ print "count:", nimmanager.nimCount
+ if count < nimmanager.nimCount:
+ self["tuner" + str(count)] = Label(nims[count][0])
+ else:
+ self["tuner" + str(count)] = Label("")
self["hdd"] = Label(_("Detected HDD:"))
hdd = Harddisk(0)
if hdd.model() != "":
self["hdd"] = Label(_("Detected HDD:"))
hdd = Harddisk(0)
if hdd.model() != "":
- self["hddA"] = Label(_("%s
(%s, %d MB free)") % (hdd.model(), hdd.capacity(),hdd.free()))
+ self["hddA"] = Label(_("%s
\n
(%s, %d MB free)") % (hdd.model(), hdd.capacity(),hdd.free()))
else:
self["hddA"] = Label(_("none"))
else:
self["hddA"] = Label(_("none"))
@@
-32,4
+44,3
@@
class About(Screen):
"cancel": self.close,
"ok": self.close,
})
"cancel": self.close,
"ok": self.close,
})
-
\ No newline at end of file