git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some German translations (especially for the parental control)
[enigma2.git]
/
lib
/
python
/
Components
/
NimManager.py
diff --git
a/lib/python/Components/NimManager.py
b/lib/python/Components/NimManager.py
index 783288ec5d643c271d6a6df68c07dde49adeb6b1..7677a5026192181ec46413c8092f7e9c1cd61ff5 100644
(file)
--- a/
lib/python/Components/NimManager.py
+++ b/
lib/python/Components/NimManager.py
@@
-1,4
+1,4
@@
-from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, Config
Dummy
, ConfigSubDict
+from config import config, ConfigSubsection, ConfigSelection, ConfigFloat, ConfigSatlist, ConfigYesNo, ConfigInteger, ConfigSubList, Config
Nothing
, ConfigSubDict
from enigma import eDVBSatelliteEquipmentControl, \
eDVBSatelliteLNBParameters as lnbParam, \
from enigma import eDVBSatelliteEquipmentControl, \
eDVBSatelliteLNBParameters as lnbParam, \
@@
-212,14
+212,13
@@
class SecConfigure:
# Committed Diseqc Command
cdc = currLnb.commitedDiseqcCommand.value
# Committed Diseqc Command
cdc = currLnb.commitedDiseqcCommand.value
- c = [
- ("none", diseqcParam.SENDNO),
- ("AA", diseqcParam.AA),
- ("AB", diseqcParam.AB),
- ("BA", diseqcParam.BA),
- ("BB", diseqcParam.BB)]
-
- if cdc in c:
+ c = { "none": diseqcParam.SENDNO,
+ "AA": diseqcParam.AA,
+ "AB": diseqcParam.AB,
+ "BA": diseqcParam.BA,
+ "BB": diseqcParam.BB }
+
+ if c.has_key(cdc):
sec.setCommittedCommand(c[cdc])
else:
sec.setCommittedCommand(long(cdc))
sec.setCommittedCommand(c[cdc])
else:
sec.setCommittedCommand(long(cdc))
@@
-354,14
+353,14
@@
class NimManager:
self.parsedCab = str(tname)
elif (name == "transponder"):
freq = int(attrs.get('frequency',""))
self.parsedCab = str(tname)
elif (name == "transponder"):
freq = int(attrs.get('frequency',""))
- sr = int(attrs.get('symbol_rate',""))
- mod = int(attrs.get('modulation',"3")) # QAM64 default
- fec = int(attrs.get('fec_inner',"0")) # AUTO default
+
#
sr = int(attrs.get('symbol_rate',""))
+
#
mod = int(attrs.get('modulation',"3")) # QAM64 default
+
#
fec = int(attrs.get('fec_inner',"0")) # AUTO default
if self.parsedCab in self.transponders:
pass
else:
self.transponders[self.parsedCab] = [ ]
if self.parsedCab in self.transponders:
pass
else:
self.transponders[self.parsedCab] = [ ]
- self.transponders[self.parsedCab].append((1, freq
, sr, mod, fec
))
+ self.transponders[self.parsedCab].append((1, freq))
class parseTerrestrials(ContentHandler):
def __init__(self, terrestrialsList, transponders):
class parseTerrestrials(ContentHandler):
def __init__(self, terrestrialsList, transponders):
@@
-411,7
+410,10
@@
class NimManager:
return self.transpondersterrestrial[region]
def getCableDescription(self, nim):
return self.transpondersterrestrial[region]
def getCableDescription(self, nim):
- return self.cablesList[config.Nims[nim].cable.value]
+ return self.cablesList[0]
+
+ def getCableTrustNit(self, nim):
+ return (config.Nims[nim].cabletype.value == "quick")
def getTerrestrialDescription(self, nim):
return self.terrestrialsList[config.Nims[nim].terrestrial.value][0]
def getTerrestrialDescription(self, nim):
return self.terrestrialsList[config.Nims[nim].terrestrial.value][0]
@@
-609,7
+611,7
@@
class NimManager:
lnbnum = int(nim.advanced.sat[x[0]].lnb.value)
if lnbnum != 0:
lnb = nim.advanced.lnb[lnbnum]
lnbnum = int(nim.advanced.sat[x[0]].lnb.value)
if lnbnum != 0:
lnb = nim.advanced.lnb[lnbnum]
- if lnb.diseqcMode.value == "
diseqc_a_b_c_d
":
+ if lnb.diseqcMode.value == "
1_2
":
list.append(x)
return list
list.append(x)
return list
@@
-745,13
+747,13
@@
def InitNimManager(nimmgr):
csw = [("none", _("None")), ("AA", _("AA")), ("AB", _("AB")), ("BA", _("BA")), ("BB", _("BB"))]
for y in range(0, 16):
csw.append((str(0xF0|y), "Input " + str(y+1)))
csw = [("none", _("None")), ("AA", _("AA")), ("AB", _("AB")), ("BA", _("BA")), ("BB", _("BB"))]
for y in range(0, 16):
csw.append((str(0xF0|y), "Input " + str(y+1)))
-
+
ucsw = [("0", _("None"))]
for y in range(1, 17):
ucsw.append((str(y), "Input " + str(y)))
ucsw = [("0", _("None"))]
for y in range(1, 17):
ucsw.append((str(y), "Input " + str(y)))
-
+
nim.advanced.lnb = ConfigSubList()
nim.advanced.lnb = ConfigSubList()
- nim.advanced.lnb.append(Config
Dummy
())
+ nim.advanced.lnb.append(Config
Nothing
())
for x in range(1, 33):
nim.advanced.lnb.append(ConfigSubsection())
nim.advanced.lnb[x].lof = ConfigSelection(choices={"universal_lnb": _("Universal LNB"), "c_band": _("C-Band"), "user_defined": _("User defined")}, default="universal_lnb")
for x in range(1, 33):
nim.advanced.lnb.append(ConfigSubsection())
nim.advanced.lnb[x].lof = ConfigSelection(choices={"universal_lnb": _("Universal LNB"), "c_band": _("C-Band"), "user_defined": _("User defined")}, default="universal_lnb")
@@
-784,7
+786,7
@@
def InitNimManager(nimmgr):
nim.advanced.lnb[x].powerThreshold = ConfigInteger(default=50, limits=(0, 100))
elif slot.nimType == nimmgr.nimType["DVB-C"]:
nim.advanced.lnb[x].powerThreshold = ConfigInteger(default=50, limits=(0, 100))
elif slot.nimType == nimmgr.nimType["DVB-C"]:
- nim.cable
= ConfigSelection(choices = nimmgr.cablesList
)
+ nim.cable
type = ConfigSelection(choices = [("quick", _("Quick")), ("complete", _("Complete"))]
)
elif slot.nimType == nimmgr.nimType["DVB-T"]:
list = []
for x in nimmgr.terrestrialsList:
elif slot.nimType == nimmgr.nimType["DVB-T"]:
list = []
for x in nimmgr.terrestrialsList: