git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "disable m2ts support for release 2.6"
[enigma2.git]
/
lib
/
python
/
Screens
/
EventView.py
diff --git
a/lib/python/Screens/EventView.py
b/lib/python/Screens/EventView.py
index 6aed1e113d88b3fbbe8b2984b8ed662b1429705c..c1ffb5851d3e3e34c064076aabdddc90b47480ef 100644
(file)
--- a/
lib/python/Screens/EventView.py
+++ b/
lib/python/Screens/EventView.py
@@
-20,7
+20,7
@@
class EventViewBase:
self.similarEPGCB = similarEPGCB
self.cbFunc = callback
self.currentService=Ref
self.similarEPGCB = similarEPGCB
self.cbFunc = callback
self.currentService=Ref
- self.isRecording = (not Ref.ref.flags & eServiceReference.isGroup) and
len(Ref.ref.getPath()
)
+ self.isRecording = (not Ref.ref.flags & eServiceReference.isGroup) and
Ref.ref.getPath(
)
self.event = Event
self["epg_description"] = ScrollLabel()
self["datetime"] = Label()
self.event = Event
self["epg_description"] = ScrollLabel()
self["datetime"] = Label()
@@
-71,6
+71,8
@@
class EventViewBase:
self.key_green_choice = self.ADD_TIMER
def timerAdd(self):
self.key_green_choice = self.ADD_TIMER
def timerAdd(self):
+ if self.isRecording:
+ return
event = self.event
serviceref = self.currentService
if event is None:
event = self.event
serviceref = self.currentService
if event is None:
@@
-134,12
+136,12
@@
class EventViewBase:
text = event.getEventName()
short = event.getShortDescription()
ext = event.getExtendedDescription()
text = event.getEventName()
short = event.getShortDescription()
ext = event.getExtendedDescription()
- if
len(short) > 0
and short != text:
- text
= text +
'\n\n' + short
- if
len(ext) > 0
:
- if
len(text) > 0
:
- text
= text +
'\n\n'
- text
= text +
ext
+ if
short
and short != text:
+ text
+=
'\n\n' + short
+ if
ext
:
+ if
text
:
+ text
+=
'\n\n'
+ text
+=
ext
self.setTitle(event.getEventName())
self["epg_description"].setText(text)
self.setTitle(event.getEventName())
self["epg_description"].setText(text)
@@
-189,7
+191,7
@@
class EventViewBase:
self["key_red"].setText(_("Similar"))
def openSimilarList(self):
self["key_red"].setText(_("Similar"))
def openSimilarList(self):
- if self.similarEPGCB is not None and
len(self["key_red"].getText()
):
+ if self.similarEPGCB is not None and
self["key_red"].getText(
):
id = self.event and self.event.getEventId()
refstr = str(self.currentService)
if id is not None:
id = self.event and self.event.getEventId()
refstr = str(self.currentService)
if id is not None: