fix

diff --git a/lib/python/Components/ChoiceList.py b/lib/python/Components/ChoiceList.py
index af9f950e940b8cf6f5c60f5af1f916a8623ada30..2a7a09040bbbfd391e0128f5c38bfd104ab39265 100644 (file)
--- a/lib/python/Components/ChoiceList.py
+++ b/lib/python/Components/ChoiceList.py
@@ -18,7 +18,7 @@ def ChoiceEntryComponent(key, text):
 
 class ChoiceList(MenuList):
        def __init__(self, list, selection = 0, enableWrapAround=False):
 
 class ChoiceList(MenuList):
        def __init__(self, list, selection = 0, enableWrapAround=False):

-               MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent())
+               MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent)

                self.l.setFont(0, gFont("Regular", 20))
                self.l.setItemHeight(25)
                self.selection = selection
                self.l.setFont(0, gFont("Regular", 20))
                self.l.setItemHeight(25)
                self.selection = selection

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index e7b5ca2cb45bb6221aeeb62b25190e788ea8a85c..d842cfefbe353de786cdb353f0bff09a3b0fbdf9 100644 (file)
--- a/lib/python/Components/FileList.py
+++ b/lib/python/Components/FileList.py
@@ -43,7 +43,7 @@ def FileEntryComponent(name, absolute = None, isDir = False):
 
 class FileList(MenuList):
        def __init__(self, directory, showDirectories = True, showFiles = True, matchingPattern = None, useServiceRef = False, isTop = False, enableWrapAround = False):
 
 class FileList(MenuList):
        def __init__(self, directory, showDirectories = True, showFiles = True, matchingPattern = None, useServiceRef = False, isTop = False, enableWrapAround = False):

-               MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent())
+               MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent)

                self.mount_point = None
                self.current_directory = None
                self.useServiceRef = useServiceRef
                self.mount_point = None
                self.current_directory = None
                self.useServiceRef = useServiceRef

diff --git a/lib/python/Components/MediaPlayer.py b/lib/python/Components/MediaPlayer.py
index 2579b2796647041312de3c6ed7db0761b26acc1a..c5b0efec208227b0e2eb1aa0361587dfcb29c371 100644 (file)
--- a/lib/python/Components/MediaPlayer.py
+++ b/lib/python/Components/MediaPlayer.py
@@ -42,7 +42,7 @@ def PlaylistEntryComponent(serviceref, state):
 
 class PlayList(MenuList):
        def __init__(self, enableWrapAround = False):
 
 class PlayList(MenuList):
        def __init__(self, enableWrapAround = False):

-               MenuList.__init__(self, [], enableWrapAround, eListboxPythonMultiContent())
+               MenuList.__init__(self, [], enableWrapAround, eListboxPythonMultiContent)

                self.l.setFont(0, gFont("Regular", 18))
                self.l.setItemHeight(22)
                self.currPlaying = -1
                self.l.setFont(0, gFont("Regular", 18))
                self.l.setItemHeight(22)
                self.currPlaying = -1

diff --git a/lib/python/Components/MenuList.py b/lib/python/Components/MenuList.py
index a7a6872784768ef9efa28d1b7eecb79d1cca4bef..7fa1ae9776dbedce60814cdcda2ac5c6d1865644 100644 (file)
--- a/lib/python/Components/MenuList.py
+++ b/lib/python/Components/MenuList.py
@@ -4,10 +4,10 @@ from GUIComponent import GUIComponent
 from enigma import eListboxPythonStringContent, eListbox
 
 class MenuList(HTMLComponent, GUIComponent):
 from enigma import eListboxPythonStringContent, eListbox
 
 class MenuList(HTMLComponent, GUIComponent):

-       def __init__(self, list, enableWrapAround=False, content=eListboxPythonStringContent()):
+       def __init__(self, list, enableWrapAround=False, content=eListboxPythonStringContent):

                GUIComponent.__init__(self)
                self.list = list
                GUIComponent.__init__(self)
                self.list = list

-               self.l = content
+               self.l = content()

                self.l.setList(self.list)
                self.onSelectionChanged = [ ]
                self.enableWrapAround = enableWrapAround
                self.l.setList(self.list)
                self.onSelectionChanged = [ ]
                self.enableWrapAround = enableWrapAround

diff --git a/lib/python/Components/ParentalControlList.py b/lib/python/Components/ParentalControlList.py
index 602e1e5f75ea38b1dc923ca264771226db66838c..5415fe24e27070eb43605b8fb2d207477bec0864 100644 (file)
--- a/lib/python/Components/ParentalControlList.py
+++ b/lib/python/Components/ParentalControlList.py
@@ -16,7 +16,7 @@ def ParentalControlEntryComponent(service, name, locked = True):
 
 class ParentalControlList(MenuList):
        def __init__(self, list, enableWrapAround = False):
 
 class ParentalControlList(MenuList):
        def __init__(self, list, enableWrapAround = False):

-               MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent())
+               MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent)

                self.l.setFont(0, gFont("Regular", 20))
                self.l.setItemHeight(32)
 
                self.l.setFont(0, gFont("Regular", 20))
                self.l.setItemHeight(32)
 

diff --git a/lib/python/Components/PluginList.py b/lib/python/Components/PluginList.py
index 7b995fa5c81f0a2105fa90e9f132889e2469f3c7..538cb029e0756e388e2709287fb38f1b740b31c2 100644 (file)
--- a/lib/python/Components/PluginList.py
+++ b/lib/python/Components/PluginList.py
@@ -44,7 +44,7 @@ def PluginDownloadComponent(plugin, name):
 
 class PluginList(MenuList):
        def __init__(self, list, enableWrapAround=False):
 
 class PluginList(MenuList):
        def __init__(self, list, enableWrapAround=False):

-               MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent())
+               MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent)

                self.l.setFont(0, gFont("Regular", 20))
                self.l.setFont(1, gFont("Regular", 14))
                self.l.setItemHeight(50)
                self.l.setFont(0, gFont("Regular", 20))
                self.l.setFont(1, gFont("Regular", 14))
                self.l.setItemHeight(50)

diff --git a/lib/python/Components/SelectionList.py b/lib/python/Components/SelectionList.py
index 2bc3e0f64c1c4543ff79fbd23c0b0fb9f8259f48..d5215dc07fa82ffb8881cdb63bf6f7d83d421e09 100644 (file)
--- a/lib/python/Components/SelectionList.py
+++ b/lib/python/Components/SelectionList.py
@@ -14,7 +14,7 @@ def SelectionEntryComponent(description, value, index, selected):
 
 class SelectionList(MenuList):
        def __init__(self, list = None, enableWrapAround = False):
 
 class SelectionList(MenuList):
        def __init__(self, list = None, enableWrapAround = False):

-               MenuList.__init__(self, list or [], enableWrapAround, content = eListboxPythonMultiContent())
+               MenuList.__init__(self, list or [], enableWrapAround, content = eListboxPythonMultiContent)

                self.l.setFont(0, gFont("Regular", 20))
                self.l.setItemHeight(30)
 
                self.l.setFont(0, gFont("Regular", 20))
                self.l.setItemHeight(30)