X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/301bab11f8453a6899153b7be338a352803b22cb..f0a0f6b79c99fb346c32e435a543c1649a197f54:/lib/python/Components/Clock.py

diff --git a/lib/python/Components/Clock.py b/lib/python/Components/Clock.py
index eba5ea27..ae828c4f 100644
--- a/lib/python/Components/Clock.py
+++ b/lib/python/Components/Clock.py
@@ -2,13 +2,17 @@ from HTMLComponent import *
 from GUIComponent import *
 from VariableText import *
 
-from enigma import eTimer
-from enigma import eLabel
+#from enigma import eTimer
+#from enigma import eLabel
+
+from enigma import *
+
+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)
@@ -16,13 +20,19 @@ class Clock(HTMLComponent, GUIComponent, VariableText):
 		
 		self.clockTimer = eTimer()
 		self.clockTimer.timeout.get().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
-		self.setText("%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)
 
 # realisierung als GUI
 	def createWidget(self, parent):
@@ -33,5 +43,5 @@ class Clock(HTMLComponent, GUIComponent, VariableText):
 
 # ...und als HTML:
 	def produceHTML(self):
+	#	return T.b[self.getText()]
 		return self.getText()
-