X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7f8d4d2a7d36008888785e61481ccd41fe489f12..896d63aa5605a9b6ef641830eae4038addc53c60:/lib/python/Components/ScrollLabel.py

diff --git a/lib/python/Components/ScrollLabel.py b/lib/python/Components/ScrollLabel.py
index 4a5caf6a..253353bb 100644
--- a/lib/python/Components/ScrollLabel.py
+++ b/lib/python/Components/ScrollLabel.py
@@ -1,10 +1,11 @@
 import skin
-from HTMLComponent import *
-from GUIComponent import *
+from HTMLComponent import HTMLComponent
+from GUIComponent import GUIComponent
 from enigma import eLabel, eWidget, eSlider, fontRenderClass, ePoint, eSize
 
 class ScrollLabel(HTMLComponent, GUIComponent):
 	def __init__(self, text=""):
+		GUIComponent.__init__(self)
 		self.message = text
 		self.instance = None
 		self.long_text = None
@@ -13,24 +14,40 @@ class ScrollLabel(HTMLComponent, GUIComponent):
 		self.total = None
 
 	def applySkin(self, desktop):
-		skin.applyAllAttributes(self.long_text, desktop, self.skinAttributes)
+		ret = False
+		if self.skinAttributes is not None:
+			skin.applyAllAttributes(self.long_text, desktop, self.skinAttributes)
+			widget_attribs = [ ]
+			scrollbar_attribs = [ ]
+			for (attrib, value) in self.skinAttributes:
+				if attrib.find("borderColor") != -1 or attrib.find("borderWidth") != -1:
+					scrollbar_attribs.append((attrib,value))
+				if attrib.find("transparent") != -1 or attrib.find("backgroundColor") != -1:
+					widget_attribs.append((attrib,value))
+			skin.applyAllAttributes(self.instance, desktop, widget_attribs)
+			skin.applyAllAttributes(self.scrollbar, desktop, scrollbar_attribs+widget_attribs)
+			ret = True
 		s = self.long_text.size()
 		self.instance.move(self.long_text.position())
-		self.scrollbar.move(ePoint(s.width()-20,0))
-		self.scrollbar.resize(eSize(20,s.height()))
-		self.scrollbar.setOrientation(eSlider.orVertical);
-		self.scrollbar.setRange(0,100)
 		lineheight=fontRenderClass.getInstance().getLineHeight( self.long_text.getFont() )
+		if not lineheight:
+			lineheight = 30 # assume a random lineheight if nothing is visible
 		lines = (int)(s.height() / lineheight)
 		self.pageHeight = (int)(lines * lineheight)
 		self.instance.resize(eSize(s.width(), self.pageHeight+(int)(lineheight/6)))
+		self.scrollbar.move(ePoint(s.width()-20,0))
+		self.scrollbar.resize(eSize(20,self.pageHeight+(int)(lineheight/6)))
+		self.scrollbar.setOrientation(eSlider.orVertical);
+		self.scrollbar.setRange(0,100)
+		self.scrollbar.setBorderWidth(1)
 		self.long_text.move(ePoint(0,0))
 		self.long_text.resize(eSize(s.width()-30, self.pageHeight*16))
 		self.setText(self.message)
+		return ret
 
 	def setText(self, text):
 		self.message = text
-		if self.long_text is not None:
+		if self.long_text is not None and self.pageHeight:
 			self.long_text.move(ePoint(0,0))
 			self.long_text.setText(self.message)
 			text_height=self.long_text.calculateSize().height()
@@ -49,6 +66,30 @@ class ScrollLabel(HTMLComponent, GUIComponent):
 				self.total = None
 				self.pages = None
 
+	def appendText(self, text):
+		old_text = self.getText()
+		if len(str(old_text)) >0:
+			self.message += text
+		else:
+			self.message = text
+		if self.long_text is not None:
+			self.long_text.setText(self.message)
+			text_height=self.long_text.calculateSize().height()
+			total=self.pageHeight
+			pages=1
+			while total < text_height:
+				total=total+self.pageHeight
+				pages=pages+1
+			if pages > 1:
+				self.scrollbar.show()
+				self.total = total
+				self.pages = pages
+				self.updateScrollbar()
+			else:
+				self.scrollbar.hide()
+				self.total = None
+				self.pages = None
+
 	def updateScrollbar(self):
 		start = -self.long_text.position().y() * 100 / self.total
 		vis = self.pageHeight * 100 / self.total;
@@ -81,5 +122,12 @@ class ScrollLabel(HTMLComponent, GUIComponent):
 				self.long_text.move( ePoint( curPos.x(), curPos.y() - self.pageHeight ) )
 				self.updateScrollbar()
 
+	def lastPage(self):
+		i=1
+		while i < self.pages:
+			self.pageDown()
+			i += 1 
+			self.updateScrollbar()
+
 	def produceHTML(self):
 		return self.getText()