fix
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>
Fri, 15 Feb 2008 17:04:38 +0000 (17:04 +0000)
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>
Fri, 15 Feb 2008 17:04:38 +0000 (17:04 +0000)
lib/python/Components/ChoiceList.py
lib/python/Components/FileList.py
lib/python/Components/MediaPlayer.py
lib/python/Components/MenuList.py
lib/python/Components/ParentalControlList.py
lib/python/Components/PluginList.py
lib/python/Components/SelectionList.py

index af9f950..2a7a090 100644 (file)
@@ -18,7 +18,7 @@ def ChoiceEntryComponent(key, text):
 
 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
index e7b5ca2..d842cfe 100644 (file)
@@ -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):
-               MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent())
+               MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent)
                self.mount_point = None
                self.current_directory = None
                self.useServiceRef = useServiceRef
index 2579b27..c5b0efe 100644 (file)
@@ -42,7 +42,7 @@ def PlaylistEntryComponent(serviceref, state):
 
 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
index a7a6872..7fa1ae9 100644 (file)
@@ -4,10 +4,10 @@ from GUIComponent import 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
-               self.l = content
+               self.l = content()
                self.l.setList(self.list)
                self.onSelectionChanged = [ ]
                self.enableWrapAround = enableWrapAround
index 602e1e5..5415fe2 100644 (file)
@@ -16,7 +16,7 @@ def ParentalControlEntryComponent(service, name, locked = True):
 
 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)
 
index 7b995fa..538cb02 100644 (file)
@@ -44,7 +44,7 @@ def PluginDownloadComponent(plugin, name):
 
 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)
index 2bc3e0f..d5215dc 100644 (file)
@@ -14,7 +14,7 @@ def SelectionEntryComponent(description, value, index, selected):
 
 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)