fix calculation in calculateDifference for cable and terrestrial which should complet...

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

diff --git a/lib/python/Components/Label.py b/lib/python/Components/Label.py
index c4efcda4753b3fd0165620d3196d8e34d2239140..5ad071abbfcdb2843548836751c2ce0ccac95972 100644 (file)
--- a/lib/python/Components/Label.py
+++ b/lib/python/Components/Label.py
@@ -24,13 +24,30 @@ class Label(HTMLComponent, GUIComponent, VariableText):
                s = self.instance.calculateSize()
                return (s.width(), s.height())
 
-       def show(self):
-               self.instance.show()
-
-       def hide(self):
-               self.instance.hide()
-
-class LabelConditional(ConditionalWidget, Label):
+class LabelConditional(Label, ConditionalWidget):
        def __init__(self, text = "", withTimer = True):
                ConditionalWidget.__init__(self, withTimer = withTimer)
-               Label.__init__(self, text = text)
\ No newline at end of file
+               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