X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FClock.py;h=338101ef5994b333177360e312ee979f30b7dcfb;hb=c84a2daabcb0396d99ea179240cbacfc0ebf1425;hp=d47ac78b8c2f46cb506cbbff30c087dbc2b3a513;hpb=8dd41ca870f8d9fda806bc49295f464a3cf18bd3;p=vuplus_dvbapp

diff --git a/lib/python/Components/Clock.py b/lib/python/Components/Clock.py
index d47ac78..338101e 100644
--- a/lib/python/Components/Clock.py
+++ b/lib/python/Components/Clock.py
@@ -1,41 +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 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()
 		self.clockTimer.start(1000)
+	
+	def onHide(self):
+		self.clockTimer.stop()
 
-# "funktionalitaet"	
 	def doClock(self):
 		t = time.localtime()
-		#HACK use timezone settings
-		timestr = "%2d:%02d:%02d" % (t[3] + 2, t[4], t[5])
+		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
 
-# ...und als HTML:
 	def produceHTML(self):
 		return self.getText()
-