1)Add zap timers icons...
--- a/EpgList.py +++ b/EpgList.py @@ -61,6 +61,11 @@ LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, 'skin_default/icons/epgclock.png')), LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, 'skin_default/icons/epgclock_prepost.png')), LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, 'skin_default/icons/epgclock_post.png')) ] + self.zap_clocks = [ LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, 'skin_default/icons/zapclock_add.png')), + LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, 'skin_default/icons/zapclock_pre.png')), + LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, 'skin_default/icons/zapclock.png')), + LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, 'skin_default/icons/zapclock_prepost.png')), + LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, 'skin_default/icons/zapclock_post.png')) ] def getEventFromId(self, service, eventid): event = None @@ -148,7 +153,10 @@ return None rec = self.timer.isInTimer(eventId, beginTime, duration, service) if rec is not None: - return self.clocks[rec[1]] + if rec[2]: + return self.zap_clocks[rec[1]] + else: + return self.clocks[rec[1]] else: return None --- a/RecordTimer.py +++ b/RecordTimer.py @@ -736,6 +736,7 @@ def isInTimer(self, eventid, begin, duration, service): time_match = 0 type = 0 + justplay = 0 bt = None end = begin + duration refstr = str(service) @@ -769,7 +770,8 @@ break if check: timer_end = x.end - if x.justplay and (timer_end - x.begin) <= 1: + justplay = x.justplay + if justplay and (timer_end - x.begin) <= 1: timer_end += 60 if x.repeated != 0: if bt is None: @@ -817,7 +819,7 @@ if type == 2: # stop searching if a full recording is found break if time_match: - return (time_match, type) + return (time_match, type, justplay) else: return None