git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs bug #429
[enigma2.git]
/
lib
/
python
/
Components
/
Clock.py
diff --git
a/lib/python/Components/Clock.py
b/lib/python/Components/Clock.py
index ae828c4f01769069ffcd9a202d51704aff272bdf..338101ef5994b333177360e312ee979f30b7dcfb 100644
(file)
--- a/
lib/python/Components/Clock.py
+++ b/
lib/python/Components/Clock.py
@@
-1,13
+1,8
@@
-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:
import time
# now some "real" components:
@@
-19,7
+14,7
@@
class Clock(VariableText, HTMLComponent, GUIComponent):
self.doClock()
self.clockTimer = eTimer()
self.doClock()
self.clockTimer = eTimer()
- self.clockTimer.
timeout.get()
.append(self.doClock)
+ self.clockTimer.
callback
.append(self.doClock)
def onShow(self):
self.doClock()
def onShow(self):
self.doClock()
@@
-28,20
+23,16
@@
class Clock(VariableText, HTMLComponent, GUIComponent):
def onHide(self):
self.clockTimer.stop()
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)
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
def createWidget(self, parent):
return eLabel(parent)
def removeWidget(self, w):
del self.clockTimer
-# ...und als HTML:
def produceHTML(self):
def produceHTML(self):
- # return T.b[self.getText()]
return self.getText()
return self.getText()