X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ee0903f520403c5e03caef287f813e7b062d05ab..03dba41f691f1ae6a315d0a13c5af66fdf93fbfd:/lib/python/Components/Renderer/Listbox.py

diff --git a/lib/python/Components/Renderer/Listbox.py b/lib/python/Components/Renderer/Listbox.py
old mode 100644
new mode 100755
index fb787bfa..716fe445
--- a/lib/python/Components/Renderer/Listbox.py
+++ b/lib/python/Components/Renderer/Listbox.py
@@ -1,10 +1,7 @@
-from Components.VariableText import VariableText
 from Renderer import Renderer
-from Tools.Event import Event
-
 from enigma import eListbox
 
-# the listbox renderer is the listbox, but no listbox content
+# the listbox renderer is the listbox, but no listbox content.
 # the content will be provided by the source (or converter).
 
 # the source should emit the 'changed' signal whenever
@@ -22,6 +19,7 @@ class Listbox(Renderer, object):
 		self.__content = None
 		self.__wrap_around = False
 		self.__selection_enabled = True
+		self.__scrollbarMode = "showOnDemand"
 
 	GUI_WIDGET = eListbox
 
@@ -41,29 +39,34 @@ class Listbox(Renderer, object):
 		instance.selectionChanged.get().append(self.selectionChanged)
 		self.wrap_around = self.wrap_around # trigger
 		self.selection_enabled = self.selection_enabled # trigger
+		self.scrollbarMode = self.scrollbarMode # trigger
+
+	def preWidgetRemove(self, instance):
+		instance.setContent(None)
+		instance.selectionChanged.get().remove(self.selectionChanged)
 
 	def setWrapAround(self, wrap_around):
 		self.__wrap_around = wrap_around
 		if self.instance is not None:
 			self.instance.setWrapAround(self.__wrap_around)
-	
+
 	wrap_around = property(lambda self: self.__wrap_around, setWrapAround)
 
 	def selectionChanged(self):
-		self.upstream_elements.selectionChanged(self.index)
+		self.source.selectionChanged(self.index)
 
 	def getIndex(self):
 		if self.instance is None:
-			return None
+			return 0
 		return self.instance.getCurrentIndex()
-		
+
 	def moveToIndex(self, index):
 		if self.instance is None:
 			return
 		self.instance.moveSelectionTo(index)
 
 	index = property(getIndex, moveToIndex)
-	
+
 	def move(self, direction):
 		if self.instance is not None:
 			self.instance.moveSelection(direction)
@@ -75,5 +78,26 @@ class Listbox(Renderer, object):
 
 	selection_enabled = property(lambda self: self.__selection_enabled, setSelectionEnabled)
 
-	def changed(self):
+	def setScrollbarMode(self, mode):
+		self.__scrollbarMode = mode
+		if self.instance is not None:
+			self.instance.setScrollbarMode(int(
+				{ "showOnDemand": 0,
+				  "showAlways": 1,
+				  "showNever": 2,
+				}[mode]))
+
+	scrollbarMode = property(lambda self: self.__scrollbarMode, setScrollbarMode)
+	
+	def changed(self, what):
+		if hasattr(self.source, "selectionEnabled"):
+			self.selection_enabled = self.source.selectionEnabled
+		if hasattr(self.source, "scrollbarMode"):
+			self.scrollbarMode = self.source.scrollbarMode
+		if len(what) > 1 and isinstance(what[1], str) and what[1] == "style":
+			return
 		self.content = self.source.content
+
+	def entry_changed(self, index):
+		if self.instance is not None:
+			self.instance.entryChanged(index)