aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Screens
diff options
context:
space:
mode:
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>2005-11-17 02:07:44 +0000
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>2005-11-17 02:07:44 +0000
commit7abf1d06a7a051f55708af14aef49ad7fea093ac (patch)
tree8f4fb23531a2e67e58d4b437431bfe7766acee41 /lib/python/Screens
parentcfa2e05881f9a27dafab260af6369f9d5dff5590 (diff)
downloadenigma2-7abf1d06a7a051f55708af14aef49ad7fea093ac.tar.gz
enigma2-7abf1d06a7a051f55708af14aef49ad7fea093ac.zip
some TimerEntry-fixes
saving and loading the timer-repeated flag to the timers.xml-file
Diffstat (limited to 'lib/python/Screens')
-rw-r--r--lib/python/Screens/TimerEntry.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index 34d30560..7b9ec85e 100644
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -42,6 +42,7 @@ class TimerEntry(Screen):
# calculate default values
day = []
+ weekday = 0
for x in range(0,7):
day.append(1)
if (self.timer.repeated != 0): # repeated
@@ -56,6 +57,7 @@ class TimerEntry(Screen):
count = 0
for x in range(0, 6):
if (flags == 1): # weekly
+ print "Set to weekday " + str(x)
weekday = x
if (flags & 1 == 1): # set user-defined flags
day[x] = 0
@@ -80,7 +82,7 @@ class TimerEntry(Screen):
config.timerentry.enddate = configElement_nonSave("config.timerentry.enddate", configDateTime, self.timer.end, ("%d.%B %Y", 86400))
config.timerentry.endtime = configElement_nonSave("config.timerentry.endtime", configSequence, [int(strftime("%H", localtime(self.timer.end))), int(strftime("%M", localtime(self.timer.end)))], configsequencearg.get("CLOCK"))
- config.timerentry.weekday = configElement_nonSave("config.timerentry.weekday", configSelection, 0, ("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"))
+ config.timerentry.weekday = configElement_nonSave("config.timerentry.weekday", configSelection, weekday, ("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"))
config.timerentry.day = []
for x in range(0,7):
@@ -178,6 +180,8 @@ class TimerEntry(Screen):
return int(mktime(dt.timetuple()))
def keyGo(self):
+ self.timer.resetRepeated()
+
if (config.timerentry.type.value == 0): # once
self.timer.begin = self.getTimestamp(config.timerentry.startdate.value, config.timerentry.starttime.value)
self.timer.end = self.getTimestamp(config.timerentry.enddate.value, config.timerentry.endtime.value)