diff options
Diffstat (limited to 'lib/python/Plugins')
5 files changed, 62 insertions, 63 deletions
diff --git a/lib/python/Plugins/Extensions/FritzCall/plugin.py b/lib/python/Plugins/Extensions/FritzCall/plugin.py index 9d20f415..816d3c35 100644 --- a/lib/python/Plugins/Extensions/FritzCall/plugin.py +++ b/lib/python/Plugins/Extensions/FritzCall/plugin.py @@ -13,12 +13,12 @@ from enigma import eTimer my_global_session = None -from Components.config import config, ConfigSubsection, configElement, configSequence, getConfigListEntry, configsequencearg, configElementBoolean +from Components.config import config, ConfigSubsection, ConfigIP, ConfigEnableDisable from Components.ConfigList import ConfigList config.FritzCall = ConfigSubsection() -config.FritzCall.hostname = configElement("config.FritzCall.hostname", configSequence, [192,168,178,254], configsequencearg.get("IP")) -config.FritzCall.enable = configElementBoolean("config.FritzCall.enable", 0) +config.FritzCall.hostname = ConfigIP(default = [192,168,178,254]) +config.FritzCall.enable = ConfigEnableDisable() class FritzCallSetup(Screen): skin = """ diff --git a/lib/python/Plugins/Extensions/Makefile.am b/lib/python/Plugins/Extensions/Makefile.am index c5e92f63..dca63faf 100644 --- a/lib/python/Plugins/Extensions/Makefile.am +++ b/lib/python/Plugins/Extensions/Makefile.am @@ -1,2 +1,3 @@ -SUBDIRS = TuxboxPlugins WebInterface FileManager CutListEditor ZappingAlternatives +SUBDIRS = TuxboxPlugins WebInterface FileManager CutListEditor ZappingAlternatives SimpleRSS FritzCall + diff --git a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py index f47886c2..ebdaa7c8 100644 --- a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py +++ b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py @@ -7,7 +7,7 @@ from Components.Pixmap import * from Components.Pixmap import Pixmap from Components.Label import Label from Components.MenuList import MenuList -from Components.config import config, configSelection, configSelection, getConfigListEntry, configElement, ConfigSubsection, currentConfigSelectionElement +from Components.config import config, ConfigSelection, ConfigSubsection from Components.ConfigList import ConfigList from Plugins.Plugin import PluginDescriptor @@ -107,8 +107,8 @@ class BackupSetup(Screen): self.list = [ ] self["config"] = ConfigList(self.list) config.backup = ConfigSubsection() - config.backup.type = configElement("config.backup.type", configSelection, 0, (("full", _("full /etc directory")), ("settings", _("only /etc/enigma2 directory")), ("var", _("/var directory")), ("skin", _("/usr/share/enigma2 directory")))) - config.backup.location = configElement("config.backup.location", configSelection, 0, (("usb", _("USB Stick")), ("cf", _("CF Drive")), ("hdd", _("Harddisk")))) + config.backup.type = ConfigSelection(choices = [("full", _("full /etc directory")), ("settings", _("only /etc/enigma2 directory")), ("var", _("/var directory")), ("skin", _("/usr/share/enigma2 directory"))]) + config.backup.location = ConfigSelection(choices = [("usb", _("USB Stick")), ("cf", _("CF Drive")), ("hdd", _("Harddisk"))]) self.list.append(getConfigListEntry(_("Backup Mode"), config.backup.type)) self.list.append(getConfigListEntry(_("Backup Location"), config.backup.location)) @@ -192,7 +192,7 @@ class RestoreMenu(Screen): def fill_list(self): self.flist = [] - self.path = BackupPath[str(currentConfigSelectionElement(config.backup.location))] + self.path = BackupPath[config.backup.location.value] if (os.path.exists(str(self.path)) == False): os.makedirs(str(self.path)) for file in os.listdir(str(self.path)): diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py index 13bf85f3..6cb0c087 100644 --- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py +++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py @@ -10,7 +10,7 @@ from Components.TunerInfo import TunerInfo from Components.ActionMap import ActionMap from Components.NimManager import nimmanager from Components.MenuList import MenuList -from Components.config import config, ConfigSubsection, configElement_nonSave, configNothing, getConfigListEntry, configSelection, currentConfigSelectionElement, configSatlist +from Components.config import ConfigDummy, ConfigSelection class PositionerSetup(Screen): skin = """ @@ -114,24 +114,23 @@ class PositionerSetup(Screen): self.statusTimer.start(50, False) def createConfig(self): - config.positioner = ConfigSubsection() - config.positioner.tune = configElement_nonSave("tune", configNothing, 0, None) - config.positioner.move = configElement_nonSave("move", configNothing, 0, None) - config.positioner.finemove = configElement_nonSave("finemove", configNothing, 0, None) - config.positioner.limits = configElement_nonSave("limits", configNothing, 0, None) - config.positioner.goto0 = configElement_nonSave("goto0", configNothing, 0, None) + self.positioner_tune = ConfigDummy() + self.positioner_move = ConfigDummy() + self.positioner_finemove = ConfigDummy() + self.positioner_limits = ConfigDummy() + self.positioner_goto0 = ConfigDummy() storepos = [] for x in range(1,255): storepos.append(str(x)) - config.positioner.storage = configElement_nonSave("storage", configSelection, 0, storepos) + self.positioner_storage = ConfigSelection(choices = storepos) def createSetup(self): - self.list.append(getConfigListEntry(_("Tune"), config.positioner.tune)) - self.list.append(getConfigListEntry(_("Positioner movement"), config.positioner.move)) - self.list.append(getConfigListEntry(_("Positioner fine movement"), config.positioner.finemove)) - self.list.append(getConfigListEntry(_("Set limits"), config.positioner.limits)) - self.list.append(getConfigListEntry(_("Positioner storage"), config.positioner.storage)) - self.list.append(getConfigListEntry(_("Goto 0"), config.positioner.goto0)) + self.list.append(getConfigListEntry(_("Tune"), self.positioner_tune)) + self.list.append(getConfigListEntry(_("Positioner movement"), self.positioner_move)) + self.list.append(getConfigListEntry(_("Positioner fine movement"), self.positioner_finemove)) + self.list.append(getConfigListEntry(_("Set limits"), self.positioner_limits)) + self.list.append(getConfigListEntry(_("Positioner storage"), self.positioner_storage)) + self.list.append(getConfigListEntry(_("Goto 0"), self.positioner_goto0)) self["list"].l.setList(self.list) def go(self): @@ -234,8 +233,8 @@ class PositionerSetup(Screen): print "stepping west" self.diseqccommand("moveWest", 0xFF) # one step elif entry == "storage": - print "store at position", (config.positioner.storage.value + 1) - self.diseqccommand("store", config.positioner.storage.value + 1) + print "store at position", (self.positioner_storage.value + 1) + self.diseqccommand("store", self.positioner_storage.value + 1) elif entry == "limits": self.diseqccommand("limitWest") @@ -255,8 +254,8 @@ class PositionerSetup(Screen): print "stepping east" self.diseqccommand("moveEast", 0xFF) # one step elif entry == "storage": - print "move to position", (config.positioner.storage.value + 1) - self.diseqccommand("moveTo", config.positioner.storage.value + 1) + print "move to position", (self.positioner_storage.value + 1) + self.diseqccommand("moveTo", self.positioner_storage.value + 1) elif entry == "limits": self.diseqccommand("limitEast") # diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py index d915b91f..f9075a1d 100644 --- a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py +++ b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py @@ -10,7 +10,7 @@ from Components.TunerInfo import TunerInfo from Components.ActionMap import ActionMap from Components.NimManager import nimmanager from Components.MenuList import MenuList -from Components.config import config, ConfigSubsection, configElement_nonSave, configNothing, getConfigListEntry, configSelection, currentConfigSelectionElement, configSatlist +from Components.config import ConfigSelection, ConfigSatlist class Tuner: def __init__(self, frontend): @@ -128,18 +128,18 @@ class Satfinder(ScanSetup): self.satEntry = None self.list = [] - self.typeOfTuningEntry = getConfigListEntry(_('Tune'), config.tuning.type) + self.typeOfTuningEntry = getConfigListEntry(_('Tune'), self.tuning_type) self.list.append(self.typeOfTuningEntry) - self.satEntry = getConfigListEntry(_('Satellite'), config.tuning.sat) + self.satEntry = getConfigListEntry(_('Satellite'), self.tuning_sat) self.list.append(self.satEntry) - if currentConfigSelectionElement(config.tuning.type) == "manual_transponder": - self.list.append(getConfigListEntry(_('Frequency'), config.scan.sat.frequency)) - self.list.append(getConfigListEntry(_('Inversion'), config.scan.sat.inversion)) - self.list.append(getConfigListEntry(_('Symbol Rate'), config.scan.sat.symbolrate)) - self.list.append(getConfigListEntry(_("Polarity"), config.scan.sat.polarization)) - self.list.append(getConfigListEntry(_("FEC"), config.scan.sat.fec)) - elif config.tuning.transponder and currentConfigSelectionElement(config.tuning.type) == "predefined_transponder": - self.list.append(getConfigListEntry(_("Transponder"), config.tuning.transponder)) + if currentConfigSelectionElement(self.tuning_type) == "manual_transponder": + self.list.append(getConfigListEntry(_('Frequency'), self.scan_sat.frequency)) + self.list.append(getConfigListEntry(_('Inversion'), self.scan_sat.inversion)) + self.list.append(getConfigListEntry(_('Symbol Rate'), self.scan_sat.symbolrate)) + self.list.append(getConfigListEntry(_("Polarity"), self.scan_sat.polarization)) + self.list.append(getConfigListEntry(_("FEC"), self.scan_sat.fec)) + elif self.tuning_transponder and currentConfigSelectionElement(self.tuning_type) == "predefined_transponder": + self.list.append(getConfigListEntry(_("Transponder"), self.tuning_transponder)) self["config"].list = self.list self["config"].l.setList(self.list) @@ -152,42 +152,41 @@ class Satfinder(ScanSetup): def retune(self, configElement): returnvalue = (0, 0, 0, 0, 0, 0, 0) - val = config.tuning.sat.value - if val > 0 and len(config.tuning.sat.vals) > val: - satpos = config.tuning.sat.vals[config.tuning.sat.value][1] - elif len(config.tuning.sat.vals) > 0: - satpos = config.tuning.sat.vals[0][1] + val = self.tuning_sat.orbital_positioon + if val > 0 and len(self.tuning_sat.vals) > val: + satpos = self.tuning_sat.vals[self.tuning_sat.value][1] + elif len(self.tuning_sat.vals) > 0: + satpos = self.tuning_sat.vals[0][1] else: satpos = None if satpos: - if currentConfigSelectionElement(config.tuning.type) == "manual_transponder": - returnvalue = (config.scan.sat.frequency.value[0], config.scan.sat.symbolrate.value[0], config.scan.sat.polarization.value, config.scan.sat.fec.value, config.scan.sat.inversion.value, satpos) - elif currentConfigSelectionElement(config.tuning.type) == "predefined_transponder": - transponder = nimmanager.getTransponders(config.tuning.sat.vals[config.tuning.sat.value][1])[config.tuning.transponder.value] - returnvalue = (int(transponder[1] / 1000), int(transponder[2] / 1000), transponder[3], transponder[4], 2, config.tuning.sat.vals[config.tuning.sat.value][1], satpos) + if currentConfigSelectionElement(self.tuning_type) == "manual_transponder": + returnvalue = (self.scan_sat.frequency.value[0], self.scan_sat.symbolrate.value[0], self.scan_sat.polarization.value, self.scan_sat.fec.value, self.scan_sat.inversion.value, satpos) + elif currentConfigSelectionElement(self.tuning_type) == "predefined_transponder": + transponder = nimmanager.getTransponders(self.tuning_sat.vals[self.tuning_sat.value][1])[self.tuning_transponder.value] + returnvalue = (int(transponder[1] / 1000), int(transponder[2] / 1000), transponder[3], transponder[4], 2, self.tuning_sat.vals[self.tuning_sat.value][1], satpos) self.tune(returnvalue) def createConfig(self, foo): - config.tuning = ConfigSubsection() - config.tuning.transponder = None - config.tuning.type = configElement_nonSave("config.tuning.type", configSelection, 0, (("manual_transponder", _("Manual transponder")), ("predefined_transponder", _("Predefined satellite")))) - config.tuning.sat = configElement_nonSave("config.tuning.sat", configSatlist, 192, nimmanager.getSatListForNim(self.feid)) + self.tuning_transponder = None + self.tuning_type = ConfigSelection(choices = [("manual_transponder", _("Manual transponder")), ("predefined_transponder", _("Predefined satellite"))]) + self.tuning_sat = ConfigSatlist(default = 192, satlist = nimmanager.getSatListForNim(self.feid)) ScanSetup.createConfig(self, None) self.updateSats() - config.tuning.type.addNotifier(self.retune) - config.tuning.sat.addNotifier(self.retune) - config.scan.sat.frequency.addNotifier(self.retune) - config.scan.sat.inversion.addNotifier(self.retune) - config.scan.sat.symbolrate.addNotifier(self.retune) - config.scan.sat.polarization.addNotifier(self.retune) - config.scan.sat.fec.addNotifier(self.retune) + self.tuning_type.addNotifier(self.retune) + self.tuning_sat.addNotifier(self.retune) + self.scan_sat.frequency.addNotifier(self.retune) + self.scan_sat.inversion.addNotifier(self.retune) + self.scan_sat.symbolrate.addNotifier(self.retune) + self.scan_sat.polarization.addNotifier(self.retune) + self.scan_sat.fec.addNotifier(self.retune) def updateSats(self): - satnum = config.tuning.sat.value - satlist = config.tuning.sat.vals + satnum = self.tuning_sat.value + satlist = self.tuning_sat.vals if len(satlist): transponderlist = nimmanager.getTransponders(satlist[satnum][1]) list = [] @@ -217,11 +216,11 @@ class Satfinder(ScanSetup): elif x[4] == 6: fec = "FEC_None" list.append(str(x[1]) + "," + str(x[2]) + "," + pol + "," + fec) - config.tuning.transponder = configElement_nonSave("config.tuning.transponder", configSelection, 0, list) - config.tuning.transponder.addNotifier(self.retune) + self.tuning_transponder = ConfigSelection(choices = list) + self.tuning_transponder.addNotifier(self.retune) def keyGo(self): - self.retune(config.tuning.type) + self.retune(self.tuning_type) def keyCancel(self): if self.oldref: |