fix inverted setting (meaning was inverted too)

[enigma2.git] / lib / python / Components / Label.py

diff --git a/lib/python/Components/Label.py b/lib/python/Components/Label.py
index 609c6deb5822232eb6fa3a7bcead6ac2aa8ee25c..129180f4e7b7476985785d266f6bb4eb5f955f6b 100644 (file)
--- a/lib/python/Components/Label.py
+++ b/lib/python/Components/Label.py
@@ -2,6 +2,8 @@ from HTMLComponent import *
 from GUIComponent import *
 from VariableText import *
 
 from GUIComponent import *
 from VariableText import *
 

+from ConditionalWidget import *
+

 from enigma import eLabel
 
 class Label(HTMLComponent, GUIComponent, VariableText):
 from enigma import eLabel
 
 class Label(HTMLComponent, GUIComponent, VariableText):


@@ -15,6 +17,43 @@ class Label(HTMLComponent, GUIComponent, VariableText):
                return self.getText()
 
 # GUI:
                return self.getText()
 
 # GUI:

-       def createWidget(self, parent, skindata):
+       def createWidget(self, parent):

                return eLabel(parent)
        
                return eLabel(parent)
        

+       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)
+               Label.__init__(self, text = text)
+               
+class BlinkingLabel(Label, BlinkingWidget):
+       def __init__(self, text = ""):
+               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