X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ae61cad19c3d66a8e15bc0096cff5742e7841f9d..811adc0b841cadc54fd8f07f6d0925a558684178:/lib/python/Components/NimManager.py diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 51fd7913..31c09446 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -321,8 +321,16 @@ class NimManager: #callbacks for c++ config def nimConfigModeChanged(self, slotid, mode): - #print "nimConfigModeChanged set to " + str(mode) - pass + if (mode != 1): # not linked + print "Unlinking slot " + str(slotid) + # TODO call c++ to unlink nim in slot slotid + if (mode == 1): # linked + if (len(self.getNimListOfType(self.nimType["DVB-S"], slotid)) > 0): + print "Linking slot " + str(slotid) + " to " + str(nimmgr.getConfigPrefix(slotid).value) + # TODO call c++ to link nim in slot slotid with nim in slot nimmgr.getConfigPrefix(slotid).value + def nimLinkedToChanged(self, slotid, val): + print "Linking slot " + str(slotid) + " to " + str(val) + # TODO call c++ to link nim in slot slotid with nim in slot val def nimDiseqcModeChanged(self, slotid, mode): #print "nimDiseqcModeChanged set to " + str(mode) pass @@ -340,7 +348,6 @@ class NimManager: #print "nimDiseqcD set to " + str(val) pass - def InitNimManager(nimmgr): config.Nims = [] for x in range(nimmgr.nimCount): @@ -348,6 +355,8 @@ def InitNimManager(nimmgr): def nimConfigModeChanged(slotid, configElement): nimmgr.nimConfigModeChanged(slotid, configElement.value) + def nimLinkedToChanged(slotid, configElement): + nimmgr.nimLinkedToChanged(slotid, configElement.value) def nimDiseqcModeChanged(slotid, configElement): nimmgr.nimDiseqcModeChanged(slotid, configElement.value) @@ -378,7 +387,7 @@ def InitNimManager(nimmgr): satNimList = nimmgr.getNimListOfType(nimmgr.nimType["DVB-S"], slot.slotid) satNimListNames = [] for x in satNimList: - satNimListNames.append(nimmgr.getNimName(x)) + satNimListNames.append(_("Slot ") + ("A", "B", "C", "D")[x] + ": " + nimmgr.getNimName(x)) nim.linkedTo = configElement(cname + "linkedTo", configSelection, 0, satNimListNames); #perhaps the instance of the slot is more useful? @@ -388,6 +397,7 @@ def InitNimManager(nimmgr): nim.diseqcB.addNotifier(boundFunction(nimPortBChanged,x)) nim.diseqcC.addNotifier(boundFunction(nimPortCChanged,x)) nim.diseqcD.addNotifier(boundFunction(nimPortDChanged,x)) + nim.linkedTo.addNotifier(boundFunction(nimLinkedToChanged,x)) elif slot.nimType == nimmgr.nimType["DVB-C"]: nim.cable = configElement(cname + "cable", configSelection, 0, nimmgr.cablesList); elif slot.nimType == nimmgr.nimType["DVB-T"]: