From da1955116b7e8b8c203e27c7e5994537219a0632 Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Fri, 15 Feb 2008 17:04:38 +0000 Subject: [PATCH] fix --- lib/python/Components/ChoiceList.py | 2 +- lib/python/Components/FileList.py | 2 +- lib/python/Components/MediaPlayer.py | 2 +- lib/python/Components/MenuList.py | 4 ++-- lib/python/Components/ParentalControlList.py | 2 +- lib/python/Components/PluginList.py | 2 +- lib/python/Components/SelectionList.py | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/python/Components/ChoiceList.py b/lib/python/Components/ChoiceList.py index af9f950e..2a7a0904 100644 --- 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): - 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 diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py index e7b5ca2c..d842cfef 100644 --- 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): - MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent()) + MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent) 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 2579b279..c5b0efec 100644 --- 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): - MenuList.__init__(self, [], enableWrapAround, eListboxPythonMultiContent()) + MenuList.__init__(self, [], enableWrapAround, eListboxPythonMultiContent) 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 a7a68727..7fa1ae97 100644 --- 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): - 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 diff --git a/lib/python/Components/ParentalControlList.py b/lib/python/Components/ParentalControlList.py index 602e1e5f..5415fe24 100644 --- 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): - MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent()) + MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent) 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 7b995fa5..538cb029 100644 --- 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): - 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) diff --git a/lib/python/Components/SelectionList.py b/lib/python/Components/SelectionList.py index 2bc3e0f6..d5215dc0 100644 --- 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): - 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) -- 2.30.2