X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/aa3e781f31a04223416f0a34b25ab95fc0bef429..daa673f3b6bc40c4d1251335e233ffb1956f1722:/lib/python/Components/Label.py

diff --git a/lib/python/Components/Label.py b/lib/python/Components/Label.py
index 609c6deb..4d90badc 100644
--- a/lib/python/Components/Label.py
+++ b/lib/python/Components/Label.py
@@ -2,9 +2,11 @@ from HTMLComponent import *
 from GUIComponent import *
 from VariableText import *
 
+from ConditionalWidget import *
+
 from enigma import eLabel
 
-class Label(HTMLComponent, GUIComponent, VariableText):
+class Label(VariableText, HTMLComponent, GUIComponent):
 	def __init__(self, text=""):
 		GUIComponent.__init__(self)
 		VariableText.__init__(self)
@@ -15,6 +17,23 @@ class Label(HTMLComponent, GUIComponent, VariableText):
 		return self.getText()
 
 # GUI:
-	def createWidget(self, parent, skindata):
-		return eLabel(parent)
-	
+	GUI_WIDGET = eLabel
+
+	def getSize(self):
+		s = self.instance.calculateSize()
+		return (s.width(), s.height())
+
+class LabelConditional(Label, ConditionalWidget):
+	def __init__(self, text = "", withTimer = True):
+		ConditionalWidget.__init__(self, withTimer = withTimer)
+		Label.__init__(self, text = text)
+		
+class BlinkingLabel(Label, BlinkingWidget):
+	def __init__(self, text = ""):
+		Label.__init__(text = text)
+		BlinkingWidget.__init__()
+
+class BlinkingLabelConditional(BlinkingWidgetConditional, LabelConditional):
+	def __init__(self, text = ""):
+		LabelConditional.__init__(self, text = text)
+		BlinkingWidgetConditional.__init__(self)