honor horizontal alignment also when a mark is present

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

diff --git a/lib/python/Components/Clock.py b/lib/python/Components/Clock.py
index 982d1c4a6f11fb951784213b2659d9248a888be3..ae828c4f01769069ffcd9a202d51704aff272bdf 100644 (file)
--- a/lib/python/Components/Clock.py
+++ b/lib/python/Components/Clock.py
@@ -12,7 +12,7 @@ from config import config
 import time
 # now some "real" components:
 
-class Clock(HTMLComponent, GUIComponent, VariableText):
+class Clock(VariableText, HTMLComponent, GUIComponent):
        def __init__(self):
                VariableText.__init__(self)
                GUIComponent.__init__(self)
@@ -21,7 +21,8 @@ class Clock(HTMLComponent, GUIComponent, VariableText):
                self.clockTimer = eTimer()
                self.clockTimer.timeout.get().append(self.doClock)
 
-       def onShow(self):               
+       def onShow(self):
+               self.doClock()
                self.clockTimer.start(1000)
        
        def onHide(self):
@@ -32,7 +33,6 @@ class Clock(HTMLComponent, GUIComponent, VariableText):
                t = time.localtime()
                timestr = "%2d:%02d:%02d" % (t.tm_hour, t.tm_min, t.tm_sec)
                self.setText(timestr)
-               setLCDClock(timestr)
 
 # realisierung als GUI
        def createWidget(self, parent):
@@ -43,4 +43,5 @@ class Clock(HTMLComponent, GUIComponent, VariableText):
 
 # ...und als HTML:
        def produceHTML(self):
+       #       return T.b[self.getText()]
                return self.getText()