X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/94bcb088bb8aa8ae9eeb471a88cbaefd3e2a6880..4f46a90d789f28eb0ca156caeb2bb55136d8ac85:/lib/python/Screens/TimerEntry.py

diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index 64372625..703e4aba 100644
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -6,6 +6,9 @@ from Components.ActionMap import NumberActionMap
 from Components.ConfigList import ConfigList
 from Components.NimManager import nimmanager
 from Components.Label import Label
+from Components.Pixmap import Pixmap
+from Screens.SubserviceSelection import SubserviceSelection
+from enigma import eEPGCache
 import time
 import datetime
 
@@ -14,8 +17,10 @@ class TimerEntry(Screen):
 		Screen.__init__(self, session)
 		self.timer = timer;
 		
-		self["ok"] = Label("OK")
-		self["cancel"] = Label("Cancel")
+		self["oktext"] = Label(_("OK"))
+		self["canceltext"] = Label(_("Cancel"))
+		self["ok"] = Pixmap()
+		self["cancel"] = Pixmap()
 
 		self.createConfig()
 
@@ -78,6 +83,7 @@ class TimerEntry(Screen):
 				repeated = 0
 			
 			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))
 
 			config.timerentry.repeated = configElement_nonSave("config.timerentry.repeated", configSelection, repeated, (_("daily"), _("weekly"), _("Mon-Fri"), _("user defined")))
@@ -126,13 +132,16 @@ class TimerEntry(Screen):
 
 	def createSetup(self):
 		self.list = []
+		self.list.append(getConfigListEntry(_("Name"), config.timerentry.name))
 		self.list.append(getConfigListEntry(_("Description"), config.timerentry.description))
-		self.list.append(getConfigListEntry(_("Timer Type"), config.timerentry.type))
+		self.timerTypeEntry = getConfigListEntry(_("Timer Type"), config.timerentry.type)
+		self.list.append(self.timerTypeEntry)
 
 		if (config.timerentry.type.value == 0): # once
 			pass
 		else: # repeated
-			self.list.append(getConfigListEntry(_("Frequency"), config.timerentry.repeated))
+			self.frequencyEntry = getConfigListEntry(_("Frequency"), config.timerentry.repeated)
+			self.list.append(self.frequencyEntry)
 			if (config.timerentry.repeated.value == 0): # daily
 				pass
 			if (config.timerentry.repeated.value == 2): # Mon-Fri
@@ -163,20 +172,21 @@ class TimerEntry(Screen):
 		else:
 			self.list.append(getConfigListEntry(_("EndTime"), config.timerentry.endtime))
 
-		self.list.append(getConfigListEntry(_("Channel"), config.timerentry.service))
+		self.channelEntry = getConfigListEntry(_("Channel"), config.timerentry.service)
+		self.list.append(self.channelEntry)
 
 		self["config"].list = self.list
 		self["config"].l.setList(self.list)
 
 	def newConfig(self):
 		print self["config"].getCurrent()
-		if self["config"].getCurrent()[0] == _("Timer Type"):
+		if self["config"].getCurrent() == self.timerTypeEntry:
 			self.createSetup()
-		if self["config"].getCurrent()[0] == _("Frequency"):
+		if self["config"].getCurrent() == self.frequencyEntry:
 			self.createSetup()
 
 	def keyLeft(self):
-		if self["config"].getCurrent()[0] == _("Channel"):
+		if self["config"].getCurrent() == self.channelEntry:
 			self.keySelect()
 		else:
 			self["config"].handleKey(config.key["prevElement"])
@@ -192,14 +202,14 @@ class TimerEntry(Screen):
 			self.keyRight()
 
 	def keyRight(self):
-		if self["config"].getCurrent()[0] == _("Channel"):
+		if self["config"].getCurrent() == self.channelEntry:
 			self.keySelect()
 		else:
 			self["config"].handleKey(config.key["nextElement"])
 			self.newConfig()
 		
 	def keySelect(self):
-		if self["config"].getCurrent()[0] == _("Channel"):
+		if self["config"].getCurrent() == self.channelEntry:
 			self.session.openWithCallback(self.finishedChannelSelection, ChannelSelection.SimpleChannelSelection, _("Select channel to record from"))
 
 	def finishedChannelSelection(self, args):
@@ -224,6 +234,7 @@ class TimerEntry(Screen):
 		return int(mktime(dt.timetuple()))
 
 	def keyGo(self):
+		self.timer.name = config.timerentry.name.value
 		self.timer.description = config.timerentry.description.value
 		self.timer.resetRepeated()
 		
@@ -247,8 +258,19 @@ class TimerEntry(Screen):
 					if (config.timerentry.day[x].value == 0): self.timer.setRepeated(x)
 
 			self.timer.begin = self.getTimestamp(time.time(), config.timerentry.starttime.value)
-			self.timer.end = self.getTimestamp(time.time(), config.timerentry.endtime.value)				
-
+			self.timer.end = self.getTimestamp(time.time(), config.timerentry.endtime.value)
+
+		if self.timer.eit is not None:
+			event = eEPGCache.getInstance().lookupEventId(self.timer.service_ref.ref, self.timer.eit)
+			if event is not None:
+				if event.getNumOfLinkageServices() > 0:
+					self.session.openWithCallback(self.subserviceSelected, SubserviceSelection, event, self.timer.service_ref.ref)
+					return
+			self.close((True, self.timer))
+
+	def subserviceSelected(self, service):
+		if not service is None:
+			self.timer.service_ref = ServiceReference(service)
 		self.close((True, self.timer))
 
 	def keyCancel(self):