X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FClock.py;h=338101ef5994b333177360e312ee979f30b7dcfb;hp=9129acafc5b8d6aa69978d7d64b4c953aba05901;hb=6f73e6abddf4170357c490966d0e1c622eb376f5;hpb=6c90aaaf2c10115bcb80f130f60a99529c0272b2

diff --git a/lib/python/Components/Clock.py b/lib/python/Components/Clock.py
index 9129aca..338101e 100644
--- a/lib/python/Components/Clock.py
+++ b/lib/python/Components/Clock.py
@@ -1,25 +1,20 @@
-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:
 
-class Clock(HTMLComponent, GUIComponent, VariableText):
+class Clock(VariableText, HTMLComponent, GUIComponent):
 	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):
 		self.doClock()
@@ -28,19 +23,16 @@ class Clock(HTMLComponent, GUIComponent, VariableText):
 	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)
 
-# realisierung als GUI
 	def createWidget(self, parent):
 		return eLabel(parent)
 
 	def removeWidget(self, w):
 		del self.clockTimer
 
-# ...und als HTML:
 	def produceHTML(self):
 		return self.getText()