aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Components
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2009-02-12 16:56:49 +0100
committerFelix Domke <tmbinc@elitedvb.net>2009-02-12 16:56:49 +0100
commit99ac184fdce7f1469851ed79dfb9a481c786ec23 (patch)
tree9ad8088a075a6e82de7e3a9c886a43cd1f430e76 /lib/python/Components
parent89a55fb89dbfb1d78255b48a50a8b4d28e83cdef (diff)
parentcb769b5e061ed1df519fc557ec8265dafadaab3c (diff)
downloadenigma2-99ac184fdce7f1469851ed79dfb9a481c786ec23.tar.gz
enigma2-99ac184fdce7f1469851ed79dfb9a481c786ec23.zip
Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
Diffstat (limited to 'lib/python/Components')
-rw-r--r--lib/python/Components/Converter/TemplatedMultiContent.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/python/Components/Converter/TemplatedMultiContent.py b/lib/python/Components/Converter/TemplatedMultiContent.py
index 5f1d4f24..203af23d 100644
--- a/lib/python/Components/Converter/TemplatedMultiContent.py
+++ b/lib/python/Components/Converter/TemplatedMultiContent.py
@@ -4,7 +4,7 @@ class TemplatedMultiContent(StringList):
"""Turns a python tuple list into a multi-content list which can be used in a listbox renderer."""
def __init__(self, args):
StringList.__init__(self, args)
- from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT, RT_HALIGN_CENTER, RT_HALIGN_RIGHT, RT_VALIGN_TOP, RT_VALIGN_CENTER, RT_VALIGN_BOTTOM
+ from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT, RT_HALIGN_CENTER, RT_HALIGN_RIGHT, RT_VALIGN_TOP, RT_VALIGN_CENTER, RT_VALIGN_BOTTOM, RT_WRAP
from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmap, MultiContentEntryPixmapAlphaTest, MultiContentTemplateColor
l = locals()
del l["self"] # cleanup locals a bit