diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2006-05-06 16:21:57 +0000 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2006-05-06 16:21:57 +0000 |
| commit | 9bdb2bf12943594e9bcd309ed9c60e44af23dbf0 (patch) | |
| tree | 5109f1566fb62181a43aff93ec029ed64983f7bb | |
| parent | 31852389b616fe439a66e987cd64b6ef4060f982 (diff) | |
| download | enigma2-9bdb2bf12943594e9bcd309ed9c60e44af23dbf0.tar.gz enigma2-9bdb2bf12943594e9bcd309ed9c60e44af23dbf0.zip | |
add some missing changes
| -rw-r--r-- | RecordTimer.py | 9 | ||||
| -rw-r--r-- | data/skin_default.xml | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/RecordTimer.py b/RecordTimer.py index 87aa197c..186b386c 100644 --- a/RecordTimer.py +++ b/RecordTimer.py @@ -42,9 +42,16 @@ class AFTEREVENT: # please do not translate log messages class RecordTimerEntry(timer.TimerEntry): - def __init__(self, serviceref, begin, end, name, description, eit, disabled = False, justplay = False, afterEvent = AFTEREVENT.NONE): + def __init__(self, serviceref, begin, end, name, description, eit, disabled = False, justplay = False, afterEvent = AFTEREVENT.NONE, checkOldTimers = False): timer.TimerEntry.__init__(self, int(begin), int(end)) + if checkOldTimers == True: + if self.begin < time.time() - 1209600: + self.begin = int(time.time()) + + if self.end < self.begin: + self.end = self.begin + assert isinstance(serviceref, ServiceReference) self.service_ref = serviceref diff --git a/data/skin_default.xml b/data/skin_default.xml index 3ed48eab..6ebc9527 100644 --- a/data/skin_default.xml +++ b/data/skin_default.xml @@ -259,8 +259,8 @@ <widget name="duration" position="140,345" size="100,30" font="Regular;22" /> <widget name="channel" position="240,345" size="270,30" font="Regular;22" /> </screen> - <screen name="PictureInPicture" position="500,100" size="180,140" zPosition="-1" flags="wfNoBorder" > - <widget name="video" position="0,0" size="160,120" /> + <screen name="PictureInPicture" position="400,60" size="240,192" zPosition="-1" flags="wfNoBorder" > + <widget name="video" position="0,0" size="240,192" /> </screen> <screen name="PiPSetup" backgroundColor="transparent" position="70,400" size="600,150" title="PiPSetup" flags="wfNoBorder"> <widget name="text" position="0,0" size="600,150" font="Regular;23" /> |