X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/083461688d74365ad6e36a1877758a7a0d1f76ca..cbaa4012ef5481091ac9b206e29e4c396859abe2:/lib/python/Screens/TimerEntry.py

diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index 91e96732..c61e9ab3 100644
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -7,10 +7,10 @@ from Components.Label import Label
 from time import *
 
 class TimerEntry(Screen):
-    def __init__(self, session):
+    def __init__(self, session, timer):
         Screen.__init__(self, session)
         
-        self.createConfig()
+        self.createConfig(timer)
         
         self["actions"] = NumberActionMap(["SetupActions"],
         {
@@ -36,26 +36,38 @@ class TimerEntry(Screen):
 
         self["introduction"] = Label("Press OK to start the scan")
 
-    def createConfig(self):
+    def createConfig(self, timer):
             config.timerentry = ConfigSubsection()
 
-            config.timerentry.date = configElement_nonSave("config.timerentry.date", configDateTime, time(), ("%d.%B %Y", 86400))
-            config.timerentry.time = configElement_nonSave("config.timerentry.time", configDateTime, time(), ("%H:%M", 60))
-            config.timerentry.weekday = configElement_nonSave("config.timerentry.weekday", configDateTime, time(), ("%A", 86400))
+            config.timerentry.type = configElement_nonSave("config.timerentry.type", configSelection, 0, ("once", "repeated"))
+            config.timerentry.startdate = configElement_nonSave("config.timerentry.startdate", configDateTime, timer.begin, ("%d.%B %Y", 86400))
+            config.timerentry.starttime = configElement_nonSave("config.timerentry.starttime", configSequence, [int(strftime("%H", localtime(timer.begin))), int(strftime("%M", localtime(timer.begin)))], configsequencearg.get("CLOCK"))
+            #config.timerentry.starttime = configElement_nonSave("config.timerentry.starttime", configDateTime, timer.begin, ("%H:%M", 60))
+            config.timerentry.enddate = configElement_nonSave("config.timerentry.enddate", configDateTime, timer.end, ("%d.%B %Y", 86400))
+            config.timerentry.endtime = configElement_nonSave("config.timerentry.endtime", configSequence, [int(strftime("%H", localtime(timer.end))), int(strftime("%M", localtime(timer.end)))], configsequencearg.get("CLOCK"))
+#            config.timerentry.endtime = configElement_nonSave("config.timerentry.endtime", configDateTime, timer.end, ("%H:%M", 60))            
+            #config.timerentry.weekday = configElement_nonSave("config.timerentry.weekday", configDateTime, time(), ("%A", 86400))
 
     def createSetup(self):
         self.list = []
+        self.list.append(getConfigListEntry("TimerType", config.timerentry.type))
         
-        self.list.append(getConfigListEntry("Date", config.timerentry.date))
-        self.list.append(getConfigListEntry("Time", config.timerentry.time))
-        self.list.append(getConfigListEntry("Weekday", config.timerentry.weekday))
+        if (config.timerentry.type.value == 0):
+            self.list.append(getConfigListEntry("StartDate", config.timerentry.startdate))
+            self.list.append(getConfigListEntry("StartTime", config.timerentry.starttime))
+            self.list.append(getConfigListEntry("EndDate", config.timerentry.enddate))
+            self.list.append(getConfigListEntry("EndTime", config.timerentry.endtime))
+        else:
+            pass
+            #self.list.append(getConfigListEntry("StartDate", config.timerentry.startdate))
+#        self.list.append(getConfigListEntry("Weekday", config.timerentry.weekday))
         
         self["config"].list = self.list
         self["config"].l.setList(self.list)
         
     def newConfig(self):
         print self["config"].getCurrent()
-        if self["config"].getCurrent()[0] == "Type of scan":
+        if self["config"].getCurrent()[0] == "TimerType":
             self.createSetup()
         if self["config"].getCurrent()[0] == "Tuner":
             self.createSetup()