provider-selection is now possible for cable and terrestrial

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 52c943a44577a9965fec44def704b0df086aee82..e7593200d20a22d455114aa40266028604631198 100644 (file)
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -364,14 +364,14 @@ def InitNimManager(nimmgr):
                nim = config.Nims[x]
                
                if slot.nimType == nimmgr.nimType["DVB-S"]:
-                       nim.configMode = configElement(cname + "configMode",configSelection, 0, (_("Simple"), _("Advanced")));
-                       nim.diseqcMode = configElement(cname + "diseqcMode",configSelection, 2, (_("Single"), _("Toneburst A/B"), _("DiSEqC A/B"), _("DiSEqC A/B/C/D"), _("Positioner")));
-                       nim.diseqcA = configElement(cname + "diseqcA",configSatlist, 192, nimmgr.satList);
-                       nim.diseqcB = configElement(cname + "diseqcB",configSatlist, 130, nimmgr.satList);
-                       nim.diseqcC = configElement(cname + "diseqcC",configSatlist, 0, nimmgr.satList);
-                       nim.diseqcD = configElement(cname + "diseqcD",configSatlist, 0, nimmgr.satList);
-                       nim.longitude = configElement(cname + "longitude",configSequence, [0,0], configsequencearg.get("FLOAT", [(0,90),(0,999)]));
-                       nim.latitude = configElement(cname + "latitude",configSequence, [0,0], configsequencearg.get("FLOAT", [(0,90),(0,999)]));
+                       nim.configMode = configElement(cname + "configMode", configSelection, 0, (_("Simple"), _("Advanced")));
+                       nim.diseqcMode = configElement(cname + "diseqcMode", configSelection, 2, (_("Single"), _("Toneburst A/B"), _("DiSEqC A/B"), _("DiSEqC A/B/C/D"), _("Positioner")));
+                       nim.diseqcA = configElement(cname + "diseqcA", configSatlist, 192, nimmgr.satList);
+                       nim.diseqcB = configElement(cname + "diseqcB", configSatlist, 130, nimmgr.satList);
+                       nim.diseqcC = configElement(cname + "diseqcC", configSatlist, 0, nimmgr.satList);
+                       nim.diseqcD = configElement(cname + "diseqcD", configSatlist, 0, nimmgr.satList);
+                       nim.longitude = configElement(cname + "longitude", configSequence, [0,0], configsequencearg.get("FLOAT", [(0,90),(0,999)]));
+                       nim.latitude = configElement(cname + "latitude", configSequence, [0,0], configsequencearg.get("FLOAT", [(0,90),(0,999)]));
                        
                        #perhaps the instance of the slot is more useful?
                        nim.configMode.addNotifier(boundFunction(nimConfigModeChanged,x))
@@ -381,9 +381,9 @@ def InitNimManager(nimmgr):
                        nim.diseqcC.addNotifier(boundFunction(nimPortCChanged,x))
                        nim.diseqcD.addNotifier(boundFunction(nimPortDChanged,x))
                elif slot.nimType == nimmgr.nimType["DVB-C"]:
-                       pass
+                       nim.cable = configElement(cname + "cable", configSelection, 0, nimmgr.cablesList);
                elif slot.nimType == nimmgr.nimType["DVB-T"]:
-                       pass
+                       nim.cable = configElement(cname + "terrestrial", configSelection, 0, nimmgr.terrestrialsList);
                else:
                        print "pls add support for this frontend type!"         
 

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 1371e6ee39f341d1504ceede1f967a6416ef57f6..db200ee1a1a318d7710a90d8e9a056cd135ec51f 100644 (file)
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -39,6 +39,12 @@ class NimSetup(Screen):
                                        self.createPositionerSetup(self.nim, self.list)
                        else:   
                                print "FIXME: implement advanced mode"
+               
+               elif (nimmanager.getNimType(self.nim.slotid) == nimmanager.nimType["DVB-C"]):
+                       self.list.append(getConfigListEntry(_("Cable provider"), config.Nims[self.nim.slotid].cable))
+               elif (nimmanager.getNimType(self.nim.slotid) == nimmanager.nimType["DVB-T"]):
+                       self.list.append(getConfigListEntry(_("Terrestrial provider"), config.Nims[self.nim.slotid].terrestrial))
+
 
                self["config"].list = self.list
                self["config"].l.setList(self.list)

diff --git a/po/de.po b/po/de.po
index 6128890b1832f8af6e97e593a5806b158f6dbc73..f02bc218f57a1116933332b98fe1b674e294436f 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxbox-enigma 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-21 16:28+0100\n"
+"POT-Creation-Date: 2005-11-21 19:10+0100\n"
 "PO-Revision-Date: 2005-11-17 20:53+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -30,7 +30,7 @@ msgstr ""
 msgid "Add"
 msgstr "Hinzufuegen"
 
-#: ../lib/python/Components/NimManager.py:289
+#: ../lib/python/Components/NimManager.py:367
 msgid "Advanced"
 msgstr "Erweitert"
 
@@ -38,6 +38,10 @@ msgstr "Erweitert"
 msgid "Bus: "
 msgstr ""
 
+#: ../lib/python/Screens/Satconfig.py:44
+msgid "Cable provider"
+msgstr "Kabelanbieter"
+
 #: ../lib/python/Screens/HarddiskSetup.py:29
 msgid "Capacity: "
 msgstr "Kapazitaet"
@@ -46,8 +50,8 @@ msgstr "Kapazitaet"
 msgid "Classic"
 msgstr "klassisch"
 
-#: ../lib/python/Screens/Satconfig.py:30 ../lib/python/Screens/Satconfig.py:48
-#: ../lib/python/Screens/Satconfig.py:57 ../data/
+#: ../lib/python/Screens/Satconfig.py:31 ../lib/python/Screens/Satconfig.py:55
+#: ../lib/python/Screens/Satconfig.py:64 ../data/
 msgid "Configmode"
 msgstr "Konfigurationsmodus"
 
@@ -67,11 +71,11 @@ msgstr "Erkannte Festplatten"
 msgid "Detected NIMs:"
 msgstr "Erkannte Tuner:"
 
-#: ../lib/python/Components/NimManager.py:290
+#: ../lib/python/Components/NimManager.py:368
 msgid "DiSEqC A/B"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:290
+#: ../lib/python/Components/NimManager.py:368
 msgid "DiSEqC A/B/C/D"
 msgstr ""
 
@@ -85,7 +89,7 @@ msgstr ""
 msgid "Disable"
 msgstr "Aus"
 
-#: ../lib/python/Screens/Satconfig.py:33 ../lib/python/Screens/Satconfig.py:46
+#: ../lib/python/Screens/Satconfig.py:34 ../lib/python/Screens/Satconfig.py:53
 msgid "Diseqcmode"
 msgstr "Diseqcmodus"
 
@@ -145,6 +149,10 @@ msgstr "Laengengrad"
 msgid "Model: "
 msgstr "Modell:"
 
+#: ../lib/python/Components/NimManager.py:241
+msgid "N/A"
+msgstr ""
+
 #: ../lib/python/Screens/NetworkSetup.py:45 ../data/
 msgid "Nameserver"
 msgstr ""
@@ -169,7 +177,7 @@ msgstr ""
 msgid "Port D"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:290
+#: ../lib/python/Components/NimManager.py:368
 msgid "Positioner"
 msgstr "Motor"
 
@@ -177,15 +185,15 @@ msgstr "Motor"
 msgid "Satellite"
 msgstr "Satellit"
 
-#: ../lib/python/Components/NimManager.py:289
+#: ../lib/python/Components/NimManager.py:367
 msgid "Simple"
 msgstr "Einfach"
 
-#: ../lib/python/Components/NimManager.py:290
+#: ../lib/python/Components/NimManager.py:368
 msgid "Single"
 msgstr "Einzeln"
 
-#: ../lib/python/Components/NimManager.py:217
+#: ../lib/python/Components/NimManager.py:295
 msgid "Socket "
 msgstr "Sockel "
 
@@ -197,7 +205,11 @@ msgstr "Das Abspielen dieses Films beenden?"
 msgid "Symbolrate"
 msgstr ""
 
-#: ../lib/python/Components/NimManager.py:290
+#: ../lib/python/Screens/Satconfig.py:46
+msgid "Terrestrial provider"
+msgstr "Region"
+
+#: ../lib/python/Components/NimManager.py:368
 msgid "Toneburst A/B"
 msgstr ""
 
@@ -206,7 +218,7 @@ msgstr ""
 msgid "Use DHCP"
 msgstr "Adresse automatisch beziehen (DHCP)"
 
-#: ../lib/python/Components/NimManager.py:219
+#: ../lib/python/Components/NimManager.py:297
 msgid "empty/unknown"
 msgstr ""