volume-control:

move volumeBar from infobar to a single screen Volume

timer:
change input type of configelement for start- and endtime

1 files changed, 15 insertions, 7 deletions

diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index 5893749b..c61e9ab3 100644
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -39,19 +39,27 @@ class TimerEntry(Screen):
     def createConfig(self, timer):
             config.timerentry = ConfigSubsection()
 
+            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", configDateTime, timer.begin, ("%H:%M", 60))
+            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", configDateTime, timer.end, ("%H:%M", 60))            
+            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("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))
+        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
@@ -59,7 +67,7 @@ class TimerEntry(Screen):
         
     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()