git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for stupid servicename *duck* - defer zap to lastservice
[enigma2.git]
/
lib
/
python
/
Screens
/
EventView.py
diff --git
a/lib/python/Screens/EventView.py
b/lib/python/Screens/EventView.py
index 6dfb389480583ff6bd756462c21d059a183d5364..275b8952008cad50d6aa3a7e17cd3ae475238a92 100644
(file)
--- a/
lib/python/Screens/EventView.py
+++ b/
lib/python/Screens/EventView.py
@@
-2,12
+2,14
@@
from Screen import Screen
from Components.ActionMap import ActionMap
from Components.Label import Label
from Components.ScrollLabel import ScrollLabel
from Components.ActionMap import ActionMap
from Components.Label import Label
from Components.ScrollLabel import ScrollLabel
-from enigma import eWidget, eServiceEventPtr, eLabel
+from enigma import eServiceEventPtr
+from ServiceReference import ServiceReference
class EventView(Screen):
class EventView(Screen):
- def __init__(self, session, Event, callback=None):
+ def __init__(self, session, Event,
Ref,
callback=None):
Screen.__init__(self, session)
self.cbFunc = callback
Screen.__init__(self, session)
self.cbFunc = callback
+ self.currentService=None
self["epg_description"] = ScrollLabel()
self["datetime"] = Label()
self["channel"] = Label()
self["epg_description"] = ScrollLabel()
self["datetime"] = Label()
self["channel"] = Label()
@@
-22,6
+24,7
@@
class EventView(Screen):
"nextEvent": self.nextEvent
})
self.setEvent(Event)
"nextEvent": self.nextEvent
})
self.setEvent(Event)
+ self.setService(Ref)
def prevEvent(self):
if self.cbFunc is not None:
def prevEvent(self):
if self.cbFunc is not None:
@@
-31,14
+34,23
@@
class EventView(Screen):
if self.cbFunc is not None:
self.cbFunc(self.setEvent, +1)
if self.cbFunc is not None:
self.cbFunc(self.setEvent, +1)
+ def setService(self, service):
+ self.currentService=service
+ name = self.currentService.getServiceName()
+ if name is not None:
+ self["channel"].setText(name)
+ else:
+ self["channel"].setText("unknown service")
+
def setEvent(self, event):
def setEvent(self, event):
+# FIXME .. how to set eWindow titlebar?
+# self.instance.setTitle(event.getEventName())
text = event.getShortDescription()
if len(text) > 0:
text = text + '\n\n'
text = text + event.getExtendedDescription()
self["epg_description"].setText(text)
self["datetime"].setText(event.getBeginTimeString())
text = event.getShortDescription()
if len(text) > 0:
text = text + '\n\n'
text = text + event.getExtendedDescription()
self["epg_description"].setText(text)
self["datetime"].setText(event.getBeginTimeString())
- self["channel"].setText("Unknown Service")
self["duration"].setText("%d min"%(event.getDuration()/60))
def pageUp(self):
self["duration"].setText("%d min"%(event.getDuration()/60))
def pageUp(self):