diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2005-12-17 00:17:10 +0000 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2005-12-17 00:17:10 +0000 |
| commit | 7a4cd5866bdfef8cef5dda04649788447d717376 (patch) | |
| tree | 32ac6083265caa8e4d85eadd75e43433773af58b /lib/python | |
| parent | e1ea45e881637c29c87677ef0cb15fcc600cf502 (diff) | |
| download | enigma2-7a4cd5866bdfef8cef5dda04649788447d717376.tar.gz enigma2-7a4cd5866bdfef8cef5dda04649788447d717376.zip | |
add a "nothing connected" option to the sat setup for nim b
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Components/NimManager.py | 10 | ||||
| -rw-r--r-- | lib/python/Screens/Satconfig.py | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index a8ad6320..38047cbd 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -83,7 +83,7 @@ class SecConfigure: nim = config.Nims[x] if slot.nimType == self.NimManager.nimType["DVB-S"]: print "slot: " + str(x) + " configmode: " + str(nim.configMode.value) - if nim.configMode.value == 1: + if nim.configMode.value == 2: self.linkNIMs(x, nim.linkedTo.value) nim = config.Nims[nim.linkedTo.value] if nim.configMode.value == 0: #simple config @@ -350,10 +350,10 @@ class NimManager: #callbacks for c++ config def nimConfigModeChanged(self, slotid, mode): - if (mode != 1): # not linked + if (mode != 2): # not linked print "Unlinking slot " + str(slotid) # TODO call c++ to unlink nim in slot slotid - if (mode == 1): # linked + if (mode == 2): # linked pass #FIXME!!! #if (len(self.getNimListOfType(self.nimType["DVB-S"], slotid)) > 0): @@ -406,10 +406,10 @@ def InitNimManager(nimmgr): nim = config.Nims[x] if slot.nimType == nimmgr.nimType["DVB-S"]: - nim.configMode = configElement(cname + "configMode", configSelection, 0, (_("Simple"), _("Loopthrough to Socket A"))) # "Advanced")); + nim.configMode = configElement(cname + "configMode", configSelection, 0, (_("Simple"), _("Nothing connected"), _("Loopthrough to Socket A"))) # "Advanced")); #important - check if just the 2nd one is LT only and the first one is DVB-S - if nim.configMode.value == 1: #linked + if nim.configMode.value == 2: #linked if x == 0: #first one can never be linked to anything nim.configMode.value = 0 #reset to simple nim.configMode.save() diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py index 969d4d0c..6c5608b5 100644 --- a/lib/python/Screens/Satconfig.py +++ b/lib/python/Screens/Satconfig.py @@ -45,11 +45,11 @@ 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) - elif config.Nims[self.nim.slotid].configMode.value == 1: # linked tuner + elif config.Nims[self.nim.slotid].configMode.value == 1: # nothing #self.list.append(getConfigListEntry(_("Linked to"), config.Nims[self.nim.slotid].linkedTo)) pass - elif config.Nims[self.nim.slotid].configMode.value == 2: # advanced mode - print "FIXME: implement advanced mode" + elif config.Nims[self.nim.slotid].configMode.value == 2: # linked + pass elif (nimmanager.getNimType(self.nim.slotid) == nimmanager.nimType["DVB-C"]): self.list.append(getConfigListEntry(_("Cable provider"), config.Nims[self.nim.slotid].cable)) |