X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ad18693bb398fd6aef82b0d99a6cbc87cff51858..89b408592c0f5756b0049a60832761646477cfa0:/lib/python/Components/Clock.py

diff --git a/lib/python/Components/Clock.py b/lib/python/Components/Clock.py
index 68fabb90..338101ef 100644
--- a/lib/python/Components/Clock.py
+++ b/lib/python/Components/Clock.py
@@ -1,43 +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:
 
-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()
-		hour = (t[3] + config.timezone.val.value) % 24;
-		timestr = "%2d:%02d:%02d" % (hour, 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()
-