X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7aaa13924d6d60f6fb66a262ce6ecd8088aee9b6..4347756c56a155ffe3c0ad61c74b385fdad923b4:/lib/python/Components/Label.py

diff --git a/lib/python/Components/Label.py b/lib/python/Components/Label.py
index 129180f4..7e61275b 100644
--- a/lib/python/Components/Label.py
+++ b/lib/python/Components/Label.py
@@ -1,12 +1,12 @@
-from HTMLComponent import *
-from GUIComponent import *
-from VariableText import *
+from HTMLComponent import HTMLComponent
+from GUIComponent import GUIComponent
+from VariableText import VariableText
 
-from ConditionalWidget import *
+from ConditionalWidget import ConditionalWidget, BlinkingWidget, BlinkingWidgetConditional
 
 from enigma import eLabel
 
-class Label(HTMLComponent, GUIComponent, VariableText):
+class Label(VariableText, HTMLComponent, GUIComponent):
 	def __init__(self, text=""):
 		GUIComponent.__init__(self)
 		VariableText.__init__(self)
@@ -17,19 +17,12 @@ class Label(HTMLComponent, GUIComponent, VariableText):
 		return self.getText()
 
 # GUI:
-	def createWidget(self, parent):
-		return eLabel(parent)
-	
+	GUI_WIDGET = eLabel
+
 	def getSize(self):
 		s = self.instance.calculateSize()
 		return (s.width(), s.height())
 
-	def show(self):
-		self.instance.show()
-
-	def hide(self):
-		self.instance.hide()
-
 class LabelConditional(Label, ConditionalWidget):
 	def __init__(self, text = "", withTimer = True):
 		ConditionalWidget.__init__(self, withTimer = withTimer)
@@ -40,20 +33,7 @@ class BlinkingLabel(Label, BlinkingWidget):
 		Label.__init__(text = text)
 		BlinkingWidget.__init__()
 
-	def GUIcreate(self, parent):
-		LabelConditional.GUIcreate(self, parent)
-	
-	def GUIdelete(self):
-		LabelConditional.GUIcreate(self)
-		
 class BlinkingLabelConditional(BlinkingWidgetConditional, LabelConditional):
 	def __init__(self, text = ""):
 		LabelConditional.__init__(self, text = text)
 		BlinkingWidgetConditional.__init__(self)
-		
-	def GUIcreate(self, parent):
-		LabelConditional.GUIcreate(self, parent)
-	
-	def GUIdelete(self):
-		LabelConditional.GUIcreate(self)
-		
\ No newline at end of file