update unicable stuff (by adenin)

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

diff --git a/lib/python/Components/Clock.py b/lib/python/Components/Clock.py
index 982d1c4a6f11fb951784213b2659d9248a888be3..338101ef5994b333177360e312ee979f30b7dcfb 100644 (file)
--- a/lib/python/Components/Clock.py
+++ b/lib/python/Components/Clock.py
@@ -1,46 +1,38 @@
-from HTMLComponent import *
-from GUIComponent import *
-from VariableText import *
+from HTMLComponent import HTMLComponent
+from GUIComponent import GUIComponent
+from VariableText import VariableText

 
 

-#from enigma import eTimer
-#from enigma import eLabel
-
-from enigma import *
-
-from config import config
+from enigma import eTimer, eLabel

 
 import time
 # now some "real" components:
 
 
 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)
                self.doClock()
                
                self.clockTimer = eTimer()
        def __init__(self):
                VariableText.__init__(self)
                GUIComponent.__init__(self)
                self.doClock()
                
                self.clockTimer = eTimer()

-               self.clockTimer.timeout.get().append(self.doClock)
+               self.clockTimer.callback.append(self.doClock)

 
 

-       def onShow(self):               
+       def onShow(self):
+               self.doClock()

                self.clockTimer.start(1000)
        
        def onHide(self):
                self.clockTimer.stop()
 
                self.clockTimer.start(1000)
        
        def onHide(self):
                self.clockTimer.stop()
 

-# "funktionalitaet"    

        def doClock(self):
                t = time.localtime()
                timestr = "%2d:%02d:%02d" % (t.tm_hour, t.tm_min, t.tm_sec)
                self.setText(timestr)
        def doClock(self):
                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):
                return eLabel(parent)
 
        def removeWidget(self, w):
                del self.clockTimer
 
        def createWidget(self, parent):
                return eLabel(parent)
 
        def removeWidget(self, w):
                del self.clockTimer
 

-# ...und als HTML:

        def produceHTML(self):
                return self.getText()
        def produceHTML(self):
                return self.getText()