git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dont try to install no more existing ScartLoopThrough.py
[enigma2.git]
/
lib
/
python
/
Screens
/
EpgSelection.py
diff --git
a/lib/python/Screens/EpgSelection.py
b/lib/python/Screens/EpgSelection.py
index 3dbba0fd6b162b4e619b25af7dc1cc41bae7d132..5d29df0d1410e0875c7081081f240657a720b2c9 100644
(file)
--- a/
lib/python/Screens/EpgSelection.py
+++ b/
lib/python/Screens/EpgSelection.py
@@
-13,8
+13,7
@@
from RecordTimer import RecordTimerEntry, parseEvent
from TimerEdit import TimerEditList
from TimerEntry import TimerEntry
from ServiceReference import ServiceReference
from TimerEdit import TimerEditList
from TimerEntry import TimerEntry
from ServiceReference import ServiceReference
-from Components.config import config, currentConfigSelectionElement
-from time import localtime
+from time import localtime, time
import xml.dom.minidom
import xml.dom.minidom
@@
-103,13
+102,9
@@
class EPGSelection(Screen):
self.close(self.closeRecursive)
def infoKeyPressed(self):
self.close(self.closeRecursive)
def infoKeyPressed(self):
- if self.type == EPG_TYPE_MULTI or self.type == EPG_TYPE_SIMILAR:
- cur = self["list"].getCurrent()
- event = cur[0]
- service = cur[1]
- else:
- event = self["list"].getCurrent()
- service = self.currentService
+ cur = self["list"].getCurrent()
+ event = cur[0]
+ service = cur[1]
if event is not None:
if self.type != EPG_TYPE_SIMILAR:
self.session.open(EventViewSimple, event, service, self.eventViewCallback, self.openSimilarList)
if event is not None:
if self.type != EPG_TYPE_SIMILAR:
self.session.open(EventViewSimple, event, service, self.eventViewCallback, self.openSimilarList)
@@
-126,15
+121,12
@@
class EPGSelection(Screen):
#just used in multipeg
def onCreate(self):
l = self["list"]
#just used in multipeg
def onCreate(self):
l = self["list"]
+ l.recalcEntrySize()
if self.type == EPG_TYPE_MULTI:
if self.type == EPG_TYPE_MULTI:
- l.recalcEntrySize()
l.fillMultiEPG(self.services, self.ask_time)
elif self.type == EPG_TYPE_SINGLE:
l.fillMultiEPG(self.services, self.ask_time)
elif self.type == EPG_TYPE_SINGLE:
- if SINGLE_CPP == 0:
- l.recalcEntrySize()
l.fillSingleEPG(self.currentService)
else:
l.fillSingleEPG(self.currentService)
else:
- l.recalcEntrySize()
l.fillSimilarList(self.currentService, self.eventid)
def eventViewCallback(self, setEvent, setService, val):
l.fillSimilarList(self.currentService, self.eventid)
def eventViewCallback(self, setEvent, setService, val):
@@
-145,14
+137,11
@@
class EPGSelection(Screen):
elif val == +1:
self.moveDown()
cur = l.getCurrent()
elif val == +1:
self.moveDown()
cur = l.getCurrent()
- if self.type == EPG_TYPE_
SINGLE
:
- se
tEvent(cur
)
+ if self.type == EPG_TYPE_
MULTI and cur[0] is None and cur[1].ref != old[1].ref
:
+ se
lf.eventViewCallback(setEvent, setService, val
)
else:
else:
- if self.type == EPG_TYPE_MULTI and cur[0] is None and cur[1].ref != old[1].ref:
- self.eventViewCallback(setEvent, setService, val)
- else:
- setService(cur[1])
- setEvent(cur[0])
+ setService(cur[1])
+ setEvent(cur[0])
def zapTo(self): # just used in multiepg
if self.zapFunc and self["key_red"].getText() == "Zap":
def zapTo(self): # just used in multiepg
if self.zapFunc and self["key_red"].getText() == "Zap":
@@
-175,16
+164,12
@@
class EPGSelection(Screen):
self["list"].updateMultiEPG(1)
def timerAdd(self):
self["list"].updateMultiEPG(1)
def timerAdd(self):
- if self.type == EPG_TYPE_SINGLE:
- event = self["list"].getCurrent()
- serviceref = self.currentService
- else:
- cur = self["list"].getCurrent()
- event = cur[0]
- serviceref = cur[1]
+ cur = self["list"].getCurrent()
+ event = cur[0]
+ serviceref = cur[1]
if event is None:
return
if event is None:
return
- newEntry = RecordTimerEntry(serviceref, *parseEvent(event))
+ newEntry = RecordTimerEntry(serviceref,
checkOldTimers = True,
*parseEvent(event))
self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry)
def timerEditFinished(self, answer):
self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry)
def timerEditFinished(self, answer):