diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2005-11-22 10:05:06 +0000 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2005-11-22 10:05:06 +0000 |
| commit | c88b15f091165037ee7f2bcca55c9949e62a00f1 (patch) | |
| tree | 9b034eddd6864ab4dfcd6a9029dbf4a0528beaca /lib/python | |
| parent | d791fb8522a5b2fe7859fee6158ed99f1714dd22 (diff) | |
| download | enigma2-c88b15f091165037ee7f2bcca55c9949e62a00f1.tar.gz enigma2-c88b15f091165037ee7f2bcca55c9949e62a00f1.zip | |
add config options for linked NIMs
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Components/NimManager.py | 3 | ||||
| -rw-r--r-- | lib/python/Screens/Satconfig.py | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 437c51da..5a2e16fa 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -359,7 +359,7 @@ def InitNimManager(nimmgr): nim = config.Nims[x] if slot.nimType == nimmgr.nimType["DVB-S"]: - nim.configMode = configElement(cname + "configMode", configSelection, 0, (_("Simple"), _("Advanced"))); + nim.configMode = configElement(cname + "configMode", configSelection, 0, (_("Simple"), _("Linked tuner"))) # _("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); @@ -367,6 +367,7 @@ def InitNimManager(nimmgr): 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.linkedTo = configElement(cname + "linkedTo", configSelection, 1 - slot.slotid, (_("Slot A"), _("Slot B"))); #perhaps the instance of the slot is more useful? nim.configMode.addNotifier(boundFunction(nimConfigModeChanged,x)) diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py index db200ee1..30e2d5d5 100644 --- a/lib/python/Screens/Satconfig.py +++ b/lib/python/Screens/Satconfig.py @@ -37,7 +37,9 @@ class NimSetup(Screen): self.createSimpleSetup(self.nim, self.list, config.Nims[self.nim.slotid].diseqcMode.value) if (config.Nims[self.nim.slotid].diseqcMode.value == 4): self.createPositionerSetup(self.nim, self.list) - else: + elif config.Nims[self.nim.slotid].configMode.value == 1: # linked tuner + self.list.append(getConfigListEntry(_("Linked to"), config.Nims[self.nim.slotid].linkedTo)) + elif config.Nims[self.nim.slotid].configMode.value == 2: # advanced mode print "FIXME: implement advanced mode" elif (nimmanager.getNimType(self.nim.slotid) == nimmanager.nimType["DVB-C"]): @@ -61,8 +63,8 @@ class NimSetup(Screen): def keyRight(self): #forbid to enable advanced mode until its ready - if self["config"].getCurrent()[0] != _("Configmode"): - self["config"].handleKey(config.key["nextElement"]) + #if self["config"].getCurrent()[0] != _("Configmode"): + self["config"].handleKey(config.key["nextElement"]) self.newConfig() def keyNumberGlobal(self, number): |