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

diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index a7cbad9b..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,6 +132,7 @@ 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.timerTypeEntry = getConfigListEntry(_("Timer Type"), config.timerentry.type)
 		self.list.append(self.timerTypeEntry)
@@ -227,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()
 		
@@ -250,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):