git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.opendreambox.org:/git/enigma2
[enigma2.git]
/
lib
/
python
/
Components
/
Clock.py
diff --git
a/lib/python/Components/Clock.py
b/lib/python/Components/Clock.py
index 3beed551dc0c92e9bb34b848fd7a88daa8697088..338101ef5994b333177360e312ee979f30b7dcfb 100644
(file)
--- a/
lib/python/Components/Clock.py
+++ b/
lib/python/Components/Clock.py
@@
-1,36
+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 eTimer, eLabel
import time
# now some "real" components:
import time
# now some "real" components:
-class Clock(
HTMLComponent, GUIComponent, VariableTex
t):
+class Clock(
VariableText, HTMLComponent, GUIComponen
t):
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):
+ self.doClock()
self.clockTimer.start(1000)
self.clockTimer.start(1000)
+
+ def onHide(self):
+ self.clockTimer.stop()
-# "funktionalitaet"
def doClock(self):
t = time.localtime()
def doClock(self):
t = time.localtime()
- self.setText("%2d:%02d:%02d" % (t[3], 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):
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()
-