X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bf7bc184d74a404dc73ea230d525b78d07aa09de..784137020888a4be481b786d2feddf6537663ec8:/lib/python/Screens/TimerEdit.py?ds=sidebyside

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index 233bfe2d..c0896f41 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -4,116 +4,106 @@ from Components.ActionMap import ActionMap
 from Components.TimeInput import TimeInput
 from Components.Label import Label
 from Components.Button import Button
-from Components.TextInput import TextInput
 from TimerEntry import TimerEntry
-from RecordTimer import RecordTimerEntry
+from RecordTimer import RecordTimerEntry, parseEvent
 from time import *
 from ServiceReference import ServiceReference
+from Components.config import *
 
-class TimerEdit(Screen):
-	def __init__(self, session, entry):
-		Screen.__init__(self, session)
-
-		self["actions"] = ActionMap(["OkCancelActions"], 
-			{
-				"ok": self.apply,
-				"cancel": self.close
-			})
-		
-		self["shortcuts"] = ActionMap(["ShortcutActions"],
-			{
-				"red": self.beginFocus,
-				"yellow": self.endFocus,
-				"green": self.descFocus
-			})
-		
-		self.entry = entry
-		# begin, end, description, service
-		self["begin"] = TimeInput()
-		self["end"] = TimeInput()
-		
-		self["lbegin"] = Label("Begin")
-		self["lend"] = Label("End")
-		
-		self["description"] = TextInput()
-		self["apply"] = Button("Apply")
-		self["service"] = Button()
-		
-		self["description"].setText(entry.description);
-	
-	def beginFocus(self):
-		self.setFocus(self["begin"])
-	
-	def endFocus(self):
-		self.setFocus(self["end"])
-	
-	def descFocus(self):
-		self.setFocus(self["description"])
-	
-	def apply(self):
-		print "applied!"
-	
 class TimerEditList(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
 		
 		list = [ ]
-		for timer in session.nav.RecordTimer.timer_list:
-			list.append(TimerEntryComponent(timer, 0))
-		
-		for timer in session.nav.RecordTimer.processed_timers:
-			list.append(TimerEntryComponent(timer, 1))
-		
+		self.list = list
+		self.fillTimerList()
+
 		self["timerlist"] = TimerList(list)
 		
-		self["key_red"] = Button("Delete")
-		self["key_green"] = Button("Add")
+		self["key_red"] = Button(_("Delete"))
+		self["key_green"] = Button(_("Add"))
 		self["key_yellow"] = Button("")
 		self["key_blue"] = Button("")
 
 		self["actions"] = ActionMap(["OkCancelActions", "ShortcutActions"], 
 			{
 				"ok": self.openEdit,
-				"cancel": self.close,
+				"cancel": self.leave,
 				"red": self.removeTimer,
-				"green": self.addTimer
+				"green": self.addCurrentTimer
 			})
+		self.session.nav.RecordTimer.on_state_change.append(self.onStateChange)
+
+	def fillTimerList(self):
+		del self.list[:]
+		
+		for timer in self.session.nav.RecordTimer.timer_list:
+			self.list.append(TimerEntryComponent(timer, processed=False))
+		
+		for timer in self.session.nav.RecordTimer.processed_timers:
+			self.list.append(TimerEntryComponent(timer, processed=True))
 
 	def openEdit(self):
-		self.session.open(TimerEntry, self["timerlist"].getCurrent()[0])
+		self.session.openWithCallback(self.finishedEdit, TimerEntry, self["timerlist"].getCurrent()[0])
 		#self.session.open(TimerEdit, self["timerlist"].getCurrent()[0])
 		
 	def removeTimer(self):
-		self.session.nav.RecordTimer.removeEntry(self["timerlist"].getCurrent()[0])
+		list = self["timerlist"]
+		currentIndex = list.getCurrentIndex()
+		list.moveDown()
+		if list.getCurrentIndex() == currentIndex:
+			currentIndex -= 1
+			list.moveToIndex(currentIndex)
+		self.session.nav.RecordTimer.removeEntry(list.getCurrent()[0])
+		self.refill()
 	
-	def addTimer(self):
-		begin = time()
-		end = time() + 60
-		
-		epg = None
-		try:
-			service = self.session.nav.getCurrentService()
+	def refill(self):
+		self.fillTimerList()
+		self["timerlist"].invalidate()
+	
+	def addCurrentTimer(self):
+		event = None
+		service = self.session.nav.getCurrentService()
+		if service is not None:
 			info = service.info()
-			ev = info.getEvent(0)
-			epg = ev
-		except:
-			pass
-		
-		if (epg == None):
-			description = "unknown event"
-		else:
-			description = ev.getEventName()
-			# FIXME we need a timestamp here:
-			begin = ev.getBeginTime()
-			
-			print begin
-			print ev.getDuration()
-			end = begin + ev.getDuration()
-
+			if info is not None:
+				event = info.getEvent(0)
 
 		# FIXME only works if already playing a service
 		serviceref = ServiceReference(self.session.nav.getCurrentlyPlayingServiceReference())
 		
-		newEntry = RecordTimerEntry(begin, end, serviceref, epg, description)
-		self.session.open(TimerEntry, newEntry)
+		if event is None:	
+			data = (int(time()), int(time() + 60), "unknown event", "", None)
+		else:
+			data = parseEvent(event)
+
+		self.addTimer(RecordTimerEntry(serviceref, *data))
 		
+	def addTimer(self, timer):
+		self.session.openWithCallback(self.finishedAdd, TimerEntry, timer)
+		
+	def finishedEdit(self, answer):
+		print "finished edit"
+		if answer[0]:
+			print "Edited timer"
+			self.session.nav.RecordTimer.timeChanged(answer[1])
+			self.fillTimerList()
+		else:
+			print "Timeredit aborted"
+
+	def finishedAdd(self, answer):
+		print "finished add"
+		if answer[0]:
+			entry = answer[1]
+			self.session.nav.RecordTimer.record(entry)
+			self.fillTimerList()
+		else:
+			print "Timeredit aborted"		
+
+	def leave(self):
+		self.session.nav.RecordTimer.saveTimer()
+		self.session.nav.RecordTimer.on_state_change.remove(self.onStateChange)
+		self.close()
+
+	def onStateChange(self, entry):
+		self.refill()