X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/29dda647f09e42ac3a621bbb537558c2d1bbc7b4..0ebffda08c8f297fedf8465f1b2aa747fc1d4757:/lib/python/Screens/TimerEntry.py

diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index 752ace42..7e2e55c8 100644
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -2,7 +2,7 @@ from Screen import Screen
 import ChannelSelection
 from ServiceReference import ServiceReference
 from Components.config import *
-from Components.ActionMap import NumberActionMap
+from Components.ActionMap import ActionMap, NumberActionMap
 from Components.ConfigList import ConfigList
 from Components.MenuList import MenuList
 from Components.Button import Button
@@ -49,11 +49,16 @@ class TimerEntry(Screen):
 
 		self.list = []
 		self["config"] = ConfigList(self.list)
-		self.createSetup()
+		self.createSetup("config")
 
 	def createConfig(self):
 			config.timerentry = ConfigSubsection()
 			
+			if (self.timer.justplay):
+				justplay = 0
+			else:
+				justplay = 1
+				
 			# calculate default values
 			day = []
 			weekday = 0
@@ -87,6 +92,7 @@ class TimerEntry(Screen):
 				weekday = (int(strftime("%w", time.localtime(self.timer.begin))) - 1) % 7
 				day[weekday] = 0
 			
+			config.timerentry.justplay = configElement_nonSave("config.timerentry.justplay", configSelection, justplay, (("zap", _("zap")), ("record", _("record"))))
 			config.timerentry.type = configElement_nonSave("config.timerentry.type", configSelection, type, (_("once"), _("repeated")))
 			config.timerentry.name = configElement_nonSave("config.timerentry.name", configText, self.timer.name, (configText.extendableSize, self.keyRightCallback))
 			config.timerentry.description = configElement_nonSave("config.timerentry.description", configText, self.timer.description, (configText.extendableSize, self.keyRightCallback))
@@ -135,11 +141,13 @@ class TimerEntry(Screen):
 				except:
 					pass
 
-	def createSetup(self):
+	def createSetup(self, widget):
 		self.list = []
 		self.list.append(getConfigListEntry(_("Name"), config.timerentry.name))
 		self.list.append(getConfigListEntry(_("Description"), config.timerentry.description))
-		self.timerTypeEntry = getConfigListEntry(_("Timer Type"), config.timerentry.type)
+		self.timerJustplayEntry = getConfigListEntry(_("Timer Type"), config.timerentry.justplay)
+		self.list.append(self.timerJustplayEntry)
+		self.timerTypeEntry = getConfigListEntry(_("Repeat Type"), config.timerentry.type)
 		self.list.append(self.timerTypeEntry)
 
 		if (config.timerentry.type.value == 0): # once
@@ -172,23 +180,27 @@ class TimerEntry(Screen):
 		else:
 			self.list.append(getConfigListEntry(_("StartTime"), config.timerentry.starttime))
 		if (config.timerentry.type.value == 0): # once
-			self.list.append(getConfigListEntry(_("End"), config.timerentry.enddate))
-			self.list.append(getConfigListEntry(" ", config.timerentry.endtime))
+			if currentConfigSelectionElement(config.timerentry.justplay) != "zap":
+				self.list.append(getConfigListEntry(_("End"), config.timerentry.enddate))
+				self.list.append(getConfigListEntry(" ", config.timerentry.endtime))
 		else:
-			self.list.append(getConfigListEntry(_("EndTime"), config.timerentry.endtime))
+			if currentConfigSelectionElement(config.timerentry.justplay) != "zap":
+				self.list.append(getConfigListEntry(_("EndTime"), config.timerentry.endtime))
 
 		self.channelEntry = getConfigListEntry(_("Channel"), config.timerentry.service)
 		self.list.append(self.channelEntry)
 
-		self["config"].list = self.list
-		self["config"].l.setList(self.list)
+		self[widget].list = self.list
+		self[widget].l.setList(self.list)
 
 	def newConfig(self):
-		print self["config"].getCurrent()
+		print "newConfig", self["config"].getCurrent()
 		if self["config"].getCurrent() == self.timerTypeEntry:
-			self.createSetup()
+			self.createSetup("config")
+		if self["config"].getCurrent() == self.timerJustplayEntry:
+			self.createSetup("config")
 		if self["config"].getCurrent() == self.frequencyEntry:
-			self.createSetup()
+			self.createSetup("config")
 
 	def keyLeft(self):
 		if self["config"].getCurrent() == self.channelEntry:
@@ -237,12 +249,12 @@ class TimerEntry(Screen):
 	def getTimestamp(self, date, mytime):
 		d = time.localtime(date)
 		dt = datetime.datetime(d.tm_year, d.tm_mon, d.tm_mday, mytime[0], mytime[1])
-		print dt
 		return int(mktime(dt.timetuple()))
 
 	def keyGo(self):
 		self.timer.name = config.timerentry.name.value
 		self.timer.description = config.timerentry.description.value
+		self.timer.justplay = (currentConfigSelectionElement(config.timerentry.justplay) == "zap")
 		self.timer.resetRepeated()
 		
 		if (config.timerentry.type.value == 0): # once
@@ -282,7 +294,7 @@ class TimerEntry(Screen):
 
 	def keyCancel(self):
 		self.close((False,))
-
+		
 class TimerLog(Screen):
 	def __init__(self, session, timer):
 		Screen.__init__(self, session)