X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6eeefece35e4269e02fdb7abab4f79d8e7b8f98b..3087ea89b68dd764aaf363ab5ad2cbf5d27d1429:/lib/python/Screens/TimerEntry.py

diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index fa75b5c0..1c83bdb6 100644
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -21,6 +21,10 @@ class TimerEntry(Screen, ConfigListScreen):
 		Screen.__init__(self, session)
 		self.timer = timer
 		
+		self.entryStartDate = None
+		self.entryEndDate = None
+		self.entryService = None
+		
 		self["oktext"] = Label(_("OK"))
 		self["canceltext"] = Label(_("Cancel"))
 		self["ok"] = Pixmap()
@@ -33,7 +37,7 @@ class TimerEntry(Screen, ConfigListScreen):
 			"ok": self.keySelect,
 			"save": self.keyGo,
 			"cancel": self.keyCancel,
-		}, -1)
+		}, -2)
 
 		self.list = []
 		ConfigListScreen.__init__(self, self.list, session = session)
@@ -88,10 +92,10 @@ class TimerEntry(Screen, ConfigListScreen):
 			self.timerentry_repeated = ConfigSelection(default = repeated, choices = [("daily", _("daily")), ("weekly", _("weekly")), ("weekdays", _("Mon-Fri")), ("user", _("user defined"))])
 
 			self.timerentry_startdate = ConfigDateTime(default = self.timer.begin, formatstring = _("%d.%B %Y"), increment = 86400)
-			self.timerentry_starttime = ConfigClock(default = [int(time.strftime("%H", time.localtime(self.timer.begin))), int(time.strftime("%M", time.localtime(self.timer.begin)))])
+			self.timerentry_starttime = ConfigClock(default = self.timer.begin)
 
 			self.timerentry_enddate = ConfigDateTime(default = self.timer.end, formatstring =  _("%d.%B %Y"), increment = 86400)
-			self.timerentry_endtime = ConfigClock(default = [int(time.strftime("%H", time.localtime(self.timer.end))), int(time.strftime("%M", time.localtime(self.timer.end)))])
+			self.timerentry_endtime = ConfigClock(default = self.timer.end)
 
 			self.timerentry_weekday = ConfigSelection(default = weekday_table[weekday], choices = [("mon",_("Monday")), ("tue", _("Tuesday")), ("wed",_("Wednesday")), ("thu", _("Thursday")), ("fri", _("Friday")), ("sat", _("Saturday")), ("sun", _("Sunday"))])
 
@@ -114,11 +118,11 @@ class TimerEntry(Screen, ConfigListScreen):
 		if configElement is self.timerentry_startdate:
 			if self.timerentry_enddate.value < self.timerentry_startdate.value:
 				self.timerentry_enddate.value = self.timerentry_startdate.value
-				self["config"].invalidate(self.timerentry_enddate)
+				self["config"].invalidate(self.entryEndDate)
 		if configElement is self.timerentry_enddate:
 			if (self.timerentry_enddate.value < self.timerentry_startdate.value):
 				self.timerentry_startdate.value = self.timerentry_enddate.value
-				self["config"].invalidate(self.timerentry_startdate)
+				self["config"].invalidate(self.entryStartDate)
 
 	def createSetup(self, widget):
 		self.list = []
@@ -153,15 +157,17 @@ class TimerEntry(Screen, ConfigListScreen):
 			#self.list.append(getConfigListEntry("StartDate", self.timerentry_startdate))
 #		self.list.append(getConfigListEntry("Weekday", self.timerentry_weekday))
 
+		self.entryStartDate = getConfigListEntry(_("Start"), self.timerentry_startdate)
 		if self.timerentry_type.value == "once":
-			self.list.append(getConfigListEntry(_("Start"), self.timerentry_startdate))
+			self.list.append(self.entryStartDate)
 			self.list.append(getConfigListEntry(" ", self.timerentry_starttime))
 		else:
 			self.list.append(getConfigListEntry(_("StartTime"), self.timerentry_starttime))
 
+		self.entryEndDate = getConfigListEntry(_("End"), self.timerentry_enddate)
 		if self.timerentry_type.value == "once":
 			if self.timerentry_justplay.value != "zap":
-				self.list.append(getConfigListEntry(_("End"), self.timerentry_enddate))
+				self.list.append(self.entryEndDate)
 				self.list.append(getConfigListEntry(" ", self.timerentry_endtime))
 		else:
 			if self.timerentry_justplay.value != "zap":
@@ -192,12 +198,6 @@ class TimerEntry(Screen, ConfigListScreen):
 			ConfigListScreen.keyLeft(self)
 			self.newConfig()
 
-	def keyRightCallback(self, configPath):
-		currentConfigPath = self["config"].getCurrent()[1].parent.getConfigPath()
-		# check if we are still on the same config entry
-		if (currentConfigPath == configPath):
-			self.keyRight()
-
 	def keyRight(self):
 		if self["config"].getCurrent() is self.channelEntry:
 			self.keySelect()
@@ -214,8 +214,8 @@ class TimerEntry(Screen, ConfigListScreen):
 	def finishedChannelSelection(self, *args):
 		if len(args):
 			self.timer.service_ref = ServiceReference(args[0])
-			self.timerentry_service.vals = (str(self.timer.service_ref.getServiceName()),)
-			self["config"].invalidate(self.timerentry_service)
+			self.timerentry_service.setCurrentText(self.timer.service_ref.getServiceName())
+			self["config"].invalidate(self.channelEntry)
 
 	def getTimestamp(self, date, mytime):
 		d = time.localtime(date)
@@ -337,7 +337,7 @@ class TimerLog(Screen):
 	def fillLogList(self):
 		self.list = [ ]
 		for x in self.log_entries:
-			self.list.append((str(time.strftime("%Y-%m-%d %H-%M", localtime(x[0])) + " - " + x[2]), x))
+			self.list.append((str(time.strftime("%Y-%m-%d %H-%M", time.localtime(x[0])) + " - " + x[2]), x))
 	
 	def clearLog(self):		
 		self.log_entries = []