From ff51af1d6d5547b8e8be08bd5660598e02a56eb6 Mon Sep 17 00:00:00 2001 From: Mladen Horvat Date: Mon, 18 Apr 2011 19:39:59 +0200 Subject: Components/Converter: add ValueToPixmap converter to convert a given path or language code to a pixmap pointer e.g. used by the pixmap renderer. refs #750 --- lib/python/Components/Converter/Makefile.am | 2 +- lib/python/Components/Converter/ValueToPixmap.py | 40 ++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 lib/python/Components/Converter/ValueToPixmap.py (limited to 'lib/python/Components') diff --git a/lib/python/Components/Converter/Makefile.am b/lib/python/Components/Converter/Makefile.am index 3b6fd3e8..b73f6d5a 100644 --- a/lib/python/Components/Converter/Makefile.am +++ b/lib/python/Components/Converter/Makefile.am @@ -6,4 +6,4 @@ install_PYTHON = \ ConditionalShowHide.py ServicePosition.py ValueRange.py RdsInfo.py Streaming.py \ StaticMultiList.py ServiceTime.py MovieInfo.py MenuEntryCompare.py StringListSelection.py \ ValueBitTest.py TunerInfo.py ConfigEntryTest.py TemplatedMultiContent.py ProgressToText.py \ - Combine.py SensorToText.py + Combine.py SensorToText.py ValueToPixmap.py diff --git a/lib/python/Components/Converter/ValueToPixmap.py b/lib/python/Components/Converter/ValueToPixmap.py new file mode 100644 index 00000000..2ab695ad --- /dev/null +++ b/lib/python/Components/Converter/ValueToPixmap.py @@ -0,0 +1,40 @@ +from Components.Converter.Converter import Converter +from Components.Element import cached, ElementError +from Tools.Directories import fileExists, SCOPE_SKIN_IMAGE, SCOPE_CURRENT_SKIN, resolveFilename +from Tools.LoadPixmap import LoadPixmap + + +class ValueToPixmap(Converter, object): + LANGUAGE_CODE = 0 + PATH = 1 + + def __init__(self, type): + Converter.__init__(self, type) + if type == "LanguageCode": + self.type = self.LANGUAGE_CODE + elif type == "Path": + self.type = self.PATH + else: + raise ElementError("'%s' is not for ValueToPixmap converter" % type) + + @cached + def getPixmap(self): + if self.source: + val = self.source.text + if val in (None, ""): + return None + if self.type == self.PATH: + return LoadPixmap(val) + if self.type == self.LANGUAGE_CODE: + png = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "countries/" + val[3:].lower() + ".png")) + if png == None: + png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "countries/missing.png")) + return png + return None + + pixmap = property(getPixmap) + + def changed(self, what): + if what[0] != self.CHANGED_SPECIFIC or what[1] == self.type: + Converter.changed(self, what) + -- cgit v1.2.3 From d9a765120a16c5c1fe8efc5e4ab733e4a30fea4a Mon Sep 17 00:00:00 2001 From: Mladen Horvat Date: Tue, 19 Apr 2011 12:08:09 +0200 Subject: Converter/ValueToPixmap.py, Renderer/Pixmap.py: use cache for LoadPixmap inside ValueToPixmap converter, look for pixmap attribute inside Pixmap renderer and react on changes. refs #750 --- lib/python/Components/Converter/ValueToPixmap.py | 6 +++--- lib/python/Components/Renderer/Pixmap.py | 13 +++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'lib/python/Components') diff --git a/lib/python/Components/Converter/ValueToPixmap.py b/lib/python/Components/Converter/ValueToPixmap.py index 2ab695ad..ed9f7700 100644 --- a/lib/python/Components/Converter/ValueToPixmap.py +++ b/lib/python/Components/Converter/ValueToPixmap.py @@ -24,11 +24,11 @@ class ValueToPixmap(Converter, object): if val in (None, ""): return None if self.type == self.PATH: - return LoadPixmap(val) + return LoadPixmap(cached=True, path=val) if self.type == self.LANGUAGE_CODE: - png = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "countries/" + val[3:].lower() + ".png")) + png = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, "countries/" + val[3:].lower() + ".png")) if png == None: - png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "countries/missing.png")) + png = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "countries/missing.png")) return png return None diff --git a/lib/python/Components/Renderer/Pixmap.py b/lib/python/Components/Renderer/Pixmap.py index d67cd559..7c6b5795 100644 --- a/lib/python/Components/Renderer/Pixmap.py +++ b/lib/python/Components/Renderer/Pixmap.py @@ -3,4 +3,17 @@ from Renderer import Renderer from enigma import ePixmap class Pixmap(Renderer): + def __init__(self): + Renderer.__init__(self) + GUI_WIDGET = ePixmap + + def postWidgetCreate(self, instance): + self.changed((self.CHANGED_DEFAULT,)) + + def changed(self, what): + if what[0] != self.CHANGED_CLEAR: + if self.source and hasattr(self.source, "pixmap"): + if self.instance: + self.instance.setPixmap(self.source.pixmap) + -- cgit v1.2.3 From 1976ce9ce95e9e2ec75958a2c7e89c71d0778048 Mon Sep 17 00:00:00 2001 From: Mladen Horvat Date: Tue, 19 Apr 2011 12:19:19 +0200 Subject: Converter/ValueToPixmap.py: don't use cache with "Path" argument. refs #750 --- lib/python/Components/Converter/ValueToPixmap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/python/Components') diff --git a/lib/python/Components/Converter/ValueToPixmap.py b/lib/python/Components/Converter/ValueToPixmap.py index ed9f7700..0acd2639 100644 --- a/lib/python/Components/Converter/ValueToPixmap.py +++ b/lib/python/Components/Converter/ValueToPixmap.py @@ -24,7 +24,7 @@ class ValueToPixmap(Converter, object): if val in (None, ""): return None if self.type == self.PATH: - return LoadPixmap(cached=True, path=val) + return LoadPixmap(val) if self.type == self.LANGUAGE_CODE: png = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, "countries/" + val[3:].lower() + ".png")) if png == None: -- cgit v1.2.3