From 5d697369d7df003246d66e8af6d305035d2488bd Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Fri, 13 Feb 2009 12:26:07 +0100 Subject: Fix entry_changed in Listbox --- lib/python/Components/Converter/StringList.py | 3 +++ lib/python/Components/Renderer/Listbox.py | 4 ++++ 2 files changed, 7 insertions(+) (limited to 'lib/python') diff --git a/lib/python/Components/Converter/StringList.py b/lib/python/Components/Converter/StringList.py index c9488db0..acbba344 100644 --- a/lib/python/Components/Converter/StringList.py +++ b/lib/python/Components/Converter/StringList.py @@ -43,3 +43,6 @@ class StringList(Converter): self.master.index = index index = property(getIndex, setIndex) + + def entry_changed(self, index): + self.downstream_elements.entry_changed(index) diff --git a/lib/python/Components/Renderer/Listbox.py b/lib/python/Components/Renderer/Listbox.py index 8e510b4c..7a895330 100644 --- a/lib/python/Components/Renderer/Listbox.py +++ b/lib/python/Components/Renderer/Listbox.py @@ -78,3 +78,7 @@ class Listbox(Renderer, object): def changed(self, what): self.content = self.source.content + + def entry_changed(self, index): + if self.instance is not None: + self.instance.entryChanged(index) -- cgit v1.2.3 From 20007678238c8cfd9c7d74209f03e1c19f1ce58c Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Fri, 13 Feb 2009 12:54:15 +0100 Subject: filter illegal (newline) characters to fix Dr.Dish TV records --- RecordTimer.py | 4 ++-- lib/python/Tools/Directories.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/python') diff --git a/RecordTimer.py b/RecordTimer.py index f8e0dbd7..aeff9d05 100644 --- a/RecordTimer.py +++ b/RecordTimer.py @@ -192,8 +192,8 @@ class RecordTimerEntry(timer.TimerEntry, object): try: f = open(self.Filename + ".ts.meta", "w") f.write(rec_ref.toString() + "\n") - f.write(self.name + "\n") - f.write(self.description + "\n") + f.write(self.name.replace("\n", "") + "\n") + f.write(self.description.replace("\n", "") + "\n") f.write(str(self.begin) + "\n") f.write(' '.join(self.tags)) f.close() diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py index 7dcd5876..b2e43a49 100644 --- a/lib/python/Tools/Directories.py +++ b/lib/python/Tools/Directories.py @@ -167,7 +167,7 @@ def getRecordingFilename(basename, dirname = None): basename = basename.replace('\xc2\x86', '').replace('\xc2\x87', '') for c in basename: - if c in non_allowed_characters: + if c in non_allowed_characters or ord(c) < 32: c = "_" filename += c -- cgit v1.2.3 From 64b5a4111134ff98a5cb22e481508a2045ec9cd3 Mon Sep 17 00:00:00 2001 From: ghost Date: Fri, 13 Feb 2009 13:03:59 +0100 Subject: add possibility to override tuner type in ConvertToHumanReadable --- lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py | 2 +- lib/python/Tools/Transponder.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'lib/python') diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py index 6d2ddce3..fa533c0b 100644 --- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py +++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py @@ -355,7 +355,7 @@ class PositionerSetup(Screen): self["snr_bar"].update() self["ber_bar"].update() self["lock_state"].update() - transponderdata = ConvertToHumanReadable(self.tuner.getTransponderData()) + transponderdata = ConvertToHumanReadable(self.tuner.getTransponderData(), "DVB-S") self["frequency_value"].setText(str(transponderdata.get("frequency"))) self["symbolrate_value"].setText(str(transponderdata.get("symbol_rate"))) self["fec_value"].setText(str(transponderdata.get("fec_inner"))) diff --git a/lib/python/Tools/Transponder.py b/lib/python/Tools/Transponder.py index f37603c5..6868929c 100644 --- a/lib/python/Tools/Transponder.py +++ b/lib/python/Tools/Transponder.py @@ -1,8 +1,9 @@ from enigma import eDVBFrontendParametersSatellite, eDVBFrontendParametersCable, eDVBFrontendParametersTerrestrial -def ConvertToHumanReadable(tp): +def ConvertToHumanReadable(tp, type = None): ret = { } - type = tp.get("tuner_type", "None") + if type is None: + type = tp.get("tuner_type", "None") if type == "DVB-S": ret["tuner_type"] = _("Satellite") ret["inversion"] = { @@ -111,6 +112,8 @@ def ConvertToHumanReadable(tp): eDVBFrontendParametersTerrestrial.Inversion_Unknown : _("Auto"), eDVBFrontendParametersTerrestrial.Inversion_On : _("On"), eDVBFrontendParametersTerrestrial.Inversion_Off : _("Off")}[tp["inversion"]] + else: + print "ConvertToHumanReadable: no or unknown type in tpdata dict!" for x in tp.keys(): if not ret.has_key(x): ret[x] = tp[x] -- cgit v1.2.3