from Components.ConfigList import ConfigListScreen
from Components.MenuList import MenuList
from Components.NimManager import nimmanager
-from Components.config import getConfigListEntry, config, ConfigNothing, ConfigSelection, updateConfigElement
+from Components.config import getConfigListEntry, config, ConfigNothing, ConfigSelection, updateConfigElement,\
+ ConfigSatlist
from Components.Sources.List import List
from Screens.MessageBox import MessageBox
+from Screens.ChoiceBox import ChoiceBox
+from Screens.ServiceStopScreen import ServiceStopScreen
from time import mktime, localtime
from datetime import datetime
-class NimSetup(Screen, ConfigListScreen):
+class NimSetup(Screen, ConfigListScreen, ServiceStopScreen):
def createSimpleSetup(self, list, mode):
nim = self.nimConfig
if mode == "single":
else:
list.append(getConfigListEntry(_("Port A"), nim.diseqcA))
- if mode in ["toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
+ if mode in ("toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"):
list.append(getConfigListEntry(_("Port B"), nim.diseqcB))
if mode == "diseqc_a_b_c_d":
list.append(getConfigListEntry(_("Port C"), nim.diseqcC))
def createConfigMode(self):
if self.nim.isCompatible("DVB-S"):
- choices = { "nothing": _("nothing connected"),
+ choices = { "nothing": _("not configured"),
"simple": _("simple"),
"advanced": _("advanced")}
#if len(nimmanager.getNimListOfType(nimmanager.getNimType(self.slotid), exception = x)) > 0:
print "Creating setup"
self.list = [ ]
+ self.multiType = None
self.configMode = None
self.diseqcModeEntry = None
self.advancedSatsEntry = None
self.advancedType = None
self.advancedManufacturer = None
self.advancedSCR = None
+ self.advancedConnected = None
+
+ if self.nim.isMultiType():
+ multiType = self.nimConfig.multiType
+ self.multiType = getConfigListEntry(_("Tuner type"), multiType)
+ self.list.append(self.multiType)
if self.nim.isCompatible("DVB-S"):
self.configMode = getConfigListEntry(_("Configuration Mode"), self.nimConfig.configMode)
if self.nimConfig.configMode.value == "simple": #simple setup
self.diseqcModeEntry = getConfigListEntry(_("Mode"), self.nimConfig.diseqcMode)
self.list.append(self.diseqcModeEntry)
- if self.nimConfig.diseqcMode.value in ["single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
+ if self.nimConfig.diseqcMode.value in ("single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"):
self.createSimpleSetup(self.list, self.nimConfig.diseqcMode.value)
if self.nimConfig.diseqcMode.value == "positioner":
self.createPositionerSetup(self.list)
currSat = self.nimConfig.advanced.sat[cur_orb_pos]
self.fillListWithAdvancedSatEntrys(currSat)
self.have_advanced = True
+ if self.nim.description == "Alps BSBE2" and config.usage.setup_level.index >= 2: # expert
+ self.list.append(getConfigListEntry(_("Tone Amplitude"), self.nimConfig.toneAmplitude))
elif self.nim.isCompatible("DVB-C"):
self.configMode = getConfigListEntry(_("Configuration Mode"), self.nimConfig.configMode)
self.list.append(self.configMode)
checkList = (self.configMode, self.diseqcModeEntry, self.advancedSatsEntry, \
self.advancedLnbsEntry, self.advancedDiseqcMode, self.advancedUsalsEntry, \
self.advancedLof, self.advancedPowerMeasurement, self.turningSpeed, \
- self.advancedType, self.advancedSCR, self.advancedManufacturer, self.advancedUnicable, \
- self.uncommittedDiseqcCommand, self.cableScanType)
+ self.advancedType, self.advancedSCR, self.advancedManufacturer, self.advancedUnicable, self.advancedConnected, \
+ self.uncommittedDiseqcCommand, self.cableScanType, self.multiType)
+ if self["config"].getCurrent() == self.multiType:
+ from Components.NimManager import InitNimManager
+ InitNimManager(nimmanager)
+ self.nim = nimmanager.nim_slots[self.slotid]
+ self.nimConfig = self.nim.config
+
for x in checkList:
if self["config"].getCurrent() == x:
self.createSetup()
+ break
def run(self):
if self.have_advanced and self.nim.config_mode == "advanced":
self.fillAdvancedList()
for x in self.list:
- if x in [self.turnFastEpochBegin, self.turnFastEpochEnd]:
+ if x in (self.turnFastEpochBegin, self.turnFastEpochEnd):
# workaround for storing only hour*3600+min*60 value in configfile
# not really needed.. just for cosmetics..
tm = localtime(x[1].value)
self.list.append(self.advancedType)
self.list.append(self.advancedSCR)
self.list.append(getConfigListEntry(_("Frequency"), manufacturer.vco[product_name][manufacturer.scr[product_name].index]))
+
+ choices = []
+ connectable = nimmanager.canConnectTo(self.slotid)
+ for id in connectable:
+ choices.append((str(id), nimmanager.getNimDescription(id)))
+ if len(choices):
+ self.advancedConnected = getConfigListEntry(_("connected"), self.nimConfig.advanced.unicableconnected)
+ self.list.append(self.advancedConnected)
+ if self.nimConfig.advanced.unicableconnected.value == True:
+ self.nimConfig.advanced.unicableconnectedTo.setChoices(choices)
+ self.list.append(getConfigListEntry(_("Connected to"),self.nimConfig.advanced.unicableconnectedTo))
+
else: #kein Unicable
self.list.append(getConfigListEntry(_("Voltage mode"), Sat.voltage))
self.list.append(getConfigListEntry(_("Increased voltage"), currLnb.increased_voltage))
new_configured_sats = nimmanager.getConfiguredSats()
self.unconfed_sats = old_configured_sats - new_configured_sats
self.satpos_to_remove = None
- self.deleteConfirmed(False)
+ self.deleteConfirmed((None, "no"))
def deleteConfirmed(self, confirmed):
- if confirmed:
+ if confirmed[1] == "yes" or confirmed[1] == "yestoall":
eDVBDB.getInstance().removeServices(-1, -1, -1, self.satpos_to_remove)
if self.satpos_to_remove is not None:
else:
h = _("E")
sat_name = ("%d.%d" + h) % (orbpos / 10, orbpos % 10)
- self.session.openWithCallback(self.deleteConfirmed, MessageBox, _("Delete no more configured satellite\n%s?") %(sat_name))
+
+ if confirmed[1] == "yes" or confirmed[1] == "no":
+ self.session.openWithCallback(self.deleteConfirmed, ChoiceBox, _("Delete no more configured satellite\n%s?") %(sat_name), [(_("Yes"), "yes"), (_("No"), "no"), (_("Yes to all"), "yestoall"), (_("No to all"), "notoall")])
+ if confirmed[1] == "yestoall" or confirmed[1] == "notoall":
+ self.deleteConfirmed(confirmed)
break
- if not self.satpos_to_remove:
- self.close()
+ else:
+ self.restoreService(_("Zap back to service before tuner setup?"))
def __init__(self, session, slotid):
Screen.__init__(self, session)
self.list = [ ]
+
+ ServiceStopScreen.__init__(self)
+ self.stopService()
ConfigListScreen.__init__(self, self.list)
- self["actions"] = ActionMap(["SetupActions"],
+ self["actions"] = ActionMap(["SetupActions", "SatlistShortcutAction"],
{
"ok": self.keySave,
"cancel": self.keyCancel,
+ "nothingconnected": self.nothingConnectedShortcut
}, -2)
self.slotid = slotid
ConfigListScreen.keyRight(self)
self.newConfig()
+ def keyCancel(self):
+ if self["config"].isChanged():
+ self.session.openWithCallback(self.cancelConfirm, MessageBox, _("Really close without saving settings?"))
+ else:
+ self.restoreService(_("Zap back to service before tuner setup?"))
+
def saveAll(self):
if self.nim.isCompatible("DVB-S"):
# reset connectedTo to all choices to properly store the default value
x[1].cancel()
# we need to call saveAll to reset the connectedTo choices
self.saveAll()
- self.close()
+ self.restoreService(_("Zap back to service before tuner setup?"))
+
+ def nothingConnectedShortcut(self):
+ if type(self["config"].getCurrent()[1]) is ConfigSatlist:
+ self["config"].getCurrent()[1].setValue("3601")
+ self["config"].invalidateCurrent()
class NimSelection(Screen):
def __init__(self, session):
def okbuttonClick(self):
nim = self["nimlist"].getCurrent()
nim = nim and nim[3]
- if nim is not None and not nim.empty:
+ if nim is not None and not nim.empty and nim.isSupported():
self.session.openWithCallback(self.updateList, self.resultclass, nim.slot)
def showNim(self, nim):
text = nimConfig.configMode.value
if self.showNim(x):
if x.isCompatible("DVB-S"):
- if nimConfig.configMode.value in ["loopthrough", "equal", "satposdepends"]:
+ if nimConfig.configMode.value in ("loopthrough", "equal", "satposdepends"):
text = { "loopthrough": _("loopthrough to"),
"equal": _("equal to"),
"satposdepends": _("second cable of motorized LNB") } [nimConfig.configMode.value]
text += " " + _("Tuner") + " " + ["A", "B", "C", "D"][int(nimConfig.connectedTo.value)]
elif nimConfig.configMode.value == "nothing":
- text = _("nothing connected")
+ text = _("not configured")
elif nimConfig.configMode.value == "simple":
- if nimConfig.diseqcMode.value in ["single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
- text = _("Sats") + ": "
+ if nimConfig.diseqcMode.value in ("single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"):
+ text = {"single": _("Single"), "toneburst_a_b": _("Toneburst A/B"), "diseqc_a_b": _("DiSEqC A/B"), "diseqc_a_b_c_d": _("DiSEqC A/B/C/D")}[nimConfig.diseqcMode.value] + "\n"
+ text += _("Sats") + ": "
+ satnames = []
if nimConfig.diseqcA.orbital_position != 3601:
- text += nimmanager.getSatName(int(nimConfig.diseqcA.value))
- if nimConfig.diseqcMode.value in ["toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
+ satnames.append(nimmanager.getSatName(int(nimConfig.diseqcA.value)))
+ if nimConfig.diseqcMode.value in ("toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"):
if nimConfig.diseqcB.orbital_position != 3601:
- text += "," + nimmanager.getSatName(int(nimConfig.diseqcB.value))
+ satnames.append(nimmanager.getSatName(int(nimConfig.diseqcB.value)))
if nimConfig.diseqcMode.value == "diseqc_a_b_c_d":
if nimConfig.diseqcC.orbital_position != 3601:
- text += "," + nimmanager.getSatName(int(nimConfig.diseqcC.value))
+ satnames.append(nimmanager.getSatName(int(nimConfig.diseqcC.value)))
if nimConfig.diseqcD.orbital_position != 3601:
- text += "," + nimmanager.getSatName(int(nimConfig.diseqcD.value))
+ satnames.append(nimmanager.getSatName(int(nimConfig.diseqcD.value)))
+ if len(satnames) <= 2:
+ text += ", ".join(satnames)
+ elif len(satnames) > 2:
+ # we need a newline here, since multi content lists don't support automtic line wrapping
+ text += ", ".join(satnames[:2]) + ",\n"
+ text += " " + ", ".join(satnames[2:])
elif nimConfig.diseqcMode.value == "positioner":
text = _("Positioner") + ":"
if nimConfig.positionerMode.value == "usals":
text = _("nothing connected")
elif nimConfig.configMode.value == "enabled":
text = _("enabled")
+ if x.isMultiType():
+ text = _("Switchable tuner types:") + "(" + ','.join(x.getMultiTypeList().values()) + ")" + "\n" + text
+ if not x.isSupported():
+ text = _("tuner is not supported")
self.list.append((slotid, x.friendly_full_description, text, x))
self["nimlist"].setList(self.list)
- self["nimlist"].updateList(self.list)
\ No newline at end of file
+ self["nimlist"].updateList(self.list)
git.cweiske.de / enigma2.git / blobdiff