follow itemHeight changes

10 files changed, 14 insertions, 13 deletions

diff --git a/lib/python/Components/ChoiceList.py b/lib/python/Components/ChoiceList.py
index a2070c7d..a7a5e483 100644
--- a/lib/python/Components/ChoiceList.py
+++ b/lib/python/Components/ChoiceList.py
@@ -24,11 +24,11 @@ class ChoiceList(MenuList, HTMLComponent, GUIComponent):
 		self.list = list
 		self.l.setList(list)
 		self.l.setFont(0, gFont("Regular", 20))
+		self.l.setItemHeight(25)
 		self.selection = selection
 
 	GUI_WIDGET = eListbox
 		
 	def postWidgetCreate(self, instance):
 		instance.setContent(self.l)
-		instance.setItemHeight(25)
 		self.moveToIndex(self.selection)
diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index b85b8ea3..01358d53 100644
--- a/lib/python/Components/FileList.py
+++ b/lib/python/Components/FileList.py
@@ -58,7 +58,8 @@ class FileList(MenuList, HTMLComponent, GUIComponent):
 		self.changeDir(directory)
 
 		self.l.setFont(0, gFont("Regular", 18))
-		
+		self.l.setItemHeight(23)
+
 	def getSelection(self):
 		if self.l.getCurrentSelection() is None:
 			return None
@@ -186,4 +187,3 @@ class FileList(MenuList, HTMLComponent, GUIComponent):
 
 	def postWidgetCreate(self, instance):
 		instance.setContent(self.l)
-		instance.setItemHeight(23)
diff --git a/lib/python/Components/HelpMenuList.py b/lib/python/Components/HelpMenuList.py
index 48802f7b..7dc51fae 100644
--- a/lib/python/Components/HelpMenuList.py
+++ b/lib/python/Components/HelpMenuList.py
@@ -36,6 +36,7 @@ class HelpMenuList(GUIComponent):
 		self.l.setList(l)
 		
 		self.l.setFont(0, gFont("Regular", 26))
+		self.l.setItemHeight(42)
 	
 	def ok(self):
 		# a list entry has a "private" tuple as first entry...
@@ -54,9 +55,9 @@ class HelpMenuList(GUIComponent):
 
 	def postWidgetCreate(self, instance):
 		instance.setContent(self.l)
-		instance.setItemHeight(42)
+
 		instance.selectionChanged.get().append(self.selectionChanged)
-		
+
 	def selectionChanged(self):
 		for x in self.onSelChanged:
 			x()
diff --git a/lib/python/Components/MediaPlayer.py b/lib/python/Components/MediaPlayer.py
index aff19199..20638876 100644
--- a/lib/python/Components/MediaPlayer.py
+++ b/lib/python/Components/MediaPlayer.py
@@ -48,6 +48,7 @@ class PlayList(MenuList, HTMLComponent, GUIComponent):
 		self.list = []
 		self.l.setList(self.list)
 		self.l.setFont(0, gFont("Regular", 18))
+		self.l.setItemHeight(22)
 		self.currPlaying = -1
 		self.oldCurrPlaying = -1
 	
@@ -61,7 +62,6 @@ class PlayList(MenuList, HTMLComponent, GUIComponent):
 
 	def postWidgetCreate(self, instance):
 		instance.setContent(self.l)
-		instance.setItemHeight(22)
 
 	def getSelection(self):
 		return self.l.getCurrentSelection()[0]
diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py
index dcd99fea..c3ec1b16 100644
--- a/lib/python/Components/MovieList.py
+++ b/lib/python/Components/MovieList.py
@@ -17,6 +17,7 @@ class MovieList(GUIComponent):
 		self.l.setFont(1, gFont("Regular", 18))
 		self.l.setFont(2, gFont("Regular", 16))
 		self.l.setBuildFunc(self.buildMovieListEntry)
+		self.l.setItemHeight(75)
 
 	#
 	# | name of movie              |
@@ -68,7 +69,6 @@ class MovieList(GUIComponent):
 	
 	def postWidgetCreate(self, instance):
 		instance.setContent(self.l)
-		instance.setItemHeight(75)
 	
 	def reload(self, root = None, filter_tags = None):
 		if root is not None:
diff --git a/lib/python/Components/ParentalControlList.py b/lib/python/Components/ParentalControlList.py
index 02e88002..db8fd8e2 100644
--- a/lib/python/Components/ParentalControlList.py
+++ b/lib/python/Components/ParentalControlList.py
@@ -23,6 +23,7 @@ class ParentalControlList(MenuList, HTMLComponent, GUIComponent):
 		self.list = list
 		self.l.setList(list)
 		self.l.setFont(0, gFont("Regular", 20))
+		self.l.setItemHeight(32)
 
 	GUI_WIDGET = eListbox
 	
@@ -32,7 +33,6 @@ class ParentalControlList(MenuList, HTMLComponent, GUIComponent):
 		
 	def postWidgetCreate(self, instance):
 		instance.setContent(self.l)
-		instance.setItemHeight(32)
 
 	def toggleSelectedLock(self):
 		print "self.l.getCurrentSelection():", self.l.getCurrentSelection()
diff --git a/lib/python/Components/PluginList.py b/lib/python/Components/PluginList.py
index fd988065..07a71748 100644
--- a/lib/python/Components/PluginList.py
+++ b/lib/python/Components/PluginList.py
@@ -52,9 +52,9 @@ class PluginList(MenuList, HTMLComponent, GUIComponent):
 		self.l.setList(list)
 		self.l.setFont(0, gFont("Regular", 20))
 		self.l.setFont(1, gFont("Regular", 14))
+		self.l.setItemHeight(50)
 
 	GUI_WIDGET = eListbox
 
 	def postWidgetCreate(self, instance):
 		instance.setContent(self.l)
-		instance.setItemHeight(50)
diff --git a/lib/python/Components/SelectionList.py b/lib/python/Components/SelectionList.py
index 1500254a..6019fffa 100644
--- a/lib/python/Components/SelectionList.py
+++ b/lib/python/Components/SelectionList.py
@@ -19,12 +19,12 @@ class SelectionList(MenuList, GUIComponent):
 		self.list = list
 		self.setList(list)
 		self.l.setFont(0, gFont("Regular", 20))
+		self.l.setItemHeight(30)
 
 	GUI_WIDGET = eListbox
 		
 	def postWidgetCreate(self, instance):
 		instance.setContent(self.l)
-		instance.setItemHeight(30)
 
 	def addSelection(self, description, value, index, selected = True):
 		self.list.append(SelectionEntryComponent(description, value, index, selected))
diff --git a/lib/python/Components/ServiceList.py b/lib/python/Components/ServiceList.py
index 0532d248..7dfcd05d 100644
--- a/lib/python/Components/ServiceList.py
+++ b/lib/python/Components/ServiceList.py
@@ -160,13 +160,13 @@ class ServiceList(HTMLComponent, GUIComponent):
 		self.mode = mode
 
 		if mode == self.MODE_NORMAL:
-			self.instance.setItemHeight(28)
+			self.l.setItemHeight(28)
 			self.l.setVisualMode(eListboxServiceContent.visModeComplex)
 			self.l.setElementFont(self.l.celServiceName, gFont("Regular", 22))
 			self.l.setElementPosition(self.l.celServiceName, eRect(0, 0, self.instance.size().width(), 28))
 			self.l.setElementFont(self.l.celServiceInfo, gFont("Regular", 18))
 		else:
-			self.instance.setItemHeight(28)
+			self.l.setItemHeight(28)
 			self.l.setVisualMode(eListboxServiceContent.visModeComplex)
 			self.l.setElementFont(self.l.celServiceNumber, gFont("Regular", 20))
 			self.l.setElementPosition(self.l.celServiceNumber, eRect(0, 0, 50, 28))
diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py
index d2ccbb9c..c732e947 100644
--- a/lib/python/Components/TimerList.py
+++ b/lib/python/Components/TimerList.py
@@ -71,6 +71,7 @@ class TimerList(HTMLComponent, GUIComponent, object):
 		self.l.setList(list)
 		self.l.setFont(0, gFont("Regular", 20))
 		self.l.setFont(1, gFont("Regular", 18))
+		self.l.setItemHeight(70)
 	
 	def getCurrent(self):
 		return self.l.getCurrentSelection()
@@ -79,7 +80,6 @@ class TimerList(HTMLComponent, GUIComponent, object):
 	
 	def postWidgetCreate(self, instance):
 		instance.setContent(self.l)
-		instance.setItemHeight(70)
 
 	def moveToIndex(self, index):
 		self.instance.moveSelectionTo(index)