added nims to the about box

diff --git a/data/skin.xml b/data/skin.xml
index 84c89f67713ed5b13c450ea86deb9b62553893f5..7de1276cdd5b37f0550bbfeec13ba1fb16c793d4 100644 (file)
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -68,8 +68,8 @@
                <screen name="About" position="140,125" size="360,250" title="About">
                        <widget name="text" position="10,30" size="420,40" font="Arial;18"/>
                        <widget name="tuner" position="10,80" size="420,20" font="Arial;18"/>
                <screen name="About" position="140,125" size="360,250" title="About">
                        <widget name="text" position="10,30" size="420,40" font="Arial;18"/>
                        <widget name="tuner" position="10,80" size="420,20" font="Arial;18"/>

-                       <widget name="tunerA" position="10,100" size="420,20" font="Arial;18"/>
-                       <widget name="tunerB" position="10,120" size="420,20" font="Arial;18"/>
+                       <widget name="tuner0" position="10,100" size="420,20" font="Arial;18"/>
+                       <widget name="tuner1" position="10,120" size="420,20" font="Arial;18"/>

                        <widget name="hdd" position="10,170" size="420,20" font="Arial;18"/>
                        <widget name="hddA" position="10,190" size="420,20" font="Arial;18"/>
                </screen>
                        <widget name="hdd" position="10,170" size="420,20" font="Arial;18"/>
                        <widget name="hddA" position="10,190" size="420,20" font="Arial;18"/>
                </screen>

diff --git a/lib/python/Screens/About.py b/lib/python/Screens/About.py
index 2e32e7d70d0a61db25fb599ffdc3f23988008950..542bee6a02199eff30b7a2c7181adb0ee1a2f532 100644 (file)
--- a/lib/python/Screens/About.py
+++ b/lib/python/Screens/About.py
@@ -2,6 +2,8 @@ from Screen import Screen
 from Components.ActionMap import ActionMap
 from Components.Label import Label
 from Components.Harddisk import Harddisk
 from Components.ActionMap import ActionMap
 from Components.Label import Label
 from Components.Harddisk import Harddisk

+from Components.NimManager import nimmanager
+from Components.MenuList import MenuList

 
 class About(Screen):
        def __init__(self, session):
 
 class About(Screen):
        def __init__(self, session):


@@ -10,13 +12,17 @@ class About(Screen):
                self["text"] = Label("Enigma v2.0b")
 
                self["tuner"] = Label("Detected NIMs:")
                self["text"] = Label("Enigma v2.0b")
 
                self["tuner"] = Label("Detected NIMs:")

-               self["tunerA"] = Label("   Tuner A: Alps BSBE1 (DVB-S)")
-               self["tunerB"] = Label("   Tuner B: Alps BSBE1 (DVB-S)")
+               
+               nims = nimmanager.nimList()
+               count = 0
+               for i in nims:
+                       self["tuner" + str(count)] = Label(i[0])
+                       count += 1

 
                self["hdd"] = Label("Detected HDD:")
                hdd = Harddisk(0)
 
                self["hdd"] = Label("Detected HDD:")
                hdd = Harddisk(0)

-               #self["hddA"] = Label("%s (%s, %d MB free)" % (hdd.model(), hdd.capacity(),hdd.free()))
-               self["hddA"] = Label("Seagate 398 GByte (323 GByte free)")
+               self["hddA"] = Label("%s (%s, %d MB free)" % (hdd.model(), hdd.capacity(),hdd.free()))
+               #self["hddA"] = Label("Seagate 398 GByte (323 GByte free)")

 
                self["actions"] = ActionMap(["SetupActions"], 
                        {
 
                self["actions"] = ActionMap(["SetupActions"], 
                        {