X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FLabel.py;h=4d90badc58b03085fc6aab0eb739ec138c70cb16;hb=92456d9542585d58e011fa4f0b501de3ef9c1819;hp=129180f4e7b7476985785d266f6bb4eb5f955f6b;hpb=7aaa13924d6d60f6fb66a262ce6ecd8088aee9b6;p=vuplus_dvbapp diff --git a/lib/python/Components/Label.py b/lib/python/Components/Label.py index 129180f..4d90bad 100644 --- a/lib/python/Components/Label.py +++ b/lib/python/Components/Label.py @@ -6,7 +6,7 @@ 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) @@ -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