diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2005-11-21 18:12:41 +0000 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2005-11-21 18:12:41 +0000 |
| commit | 350338b92543c7753db8753dca89adb885d30e9b (patch) | |
| tree | ddb9921e8135b8c913f684c6940e9be64a4a0e38 /lib/python | |
| parent | 82cafa6d31a2023abf2afc300ba963080ad21806 (diff) | |
| download | enigma2-350338b92543c7753db8753dca89adb885d30e9b.tar.gz enigma2-350338b92543c7753db8753dca89adb885d30e9b.zip | |
provider-selection is now possible for cable and terrestrial
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Components/NimManager.py | 20 | ||||
| -rw-r--r-- | lib/python/Screens/Satconfig.py | 6 |
2 files changed, 16 insertions, 10 deletions
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 52c943a4..e7593200 100644 --- 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 1371e6ee..db200ee1 100644 --- 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) |