add some missing changes

diff --git a/RecordTimer.py b/RecordTimer.py
index 87aa197cfff32de1d5828b01652a2bdf301ed0d3..186b386c7a4dc8bac93172b6b1b3e10dcd21c43b 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -42,9 +42,16 @@ class AFTEREVENT:
 
 # please do not translate log messages
 class RecordTimerEntry(timer.TimerEntry):
 
 # 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))
                
                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
                assert isinstance(serviceref, ServiceReference)
                
                self.service_ref = serviceref

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 3ed48eab7e763d94038ffdbe438ce72d7cf7fd39..6ebc95278b2fe146c126b3971f598dfac3bea881 100644 (file)
--- 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>
                <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" />
        </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" />