- fixed left/right in language selection (updates language on the fly)

- added a log viewer for timers (info key in timerlist)

1 files changed, 7 insertions, 3 deletions

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index c0896f41..d46e3751 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -4,7 +4,7 @@ from Components.ActionMap import ActionMap
 from Components.TimeInput import TimeInput
 from Components.Label import Label
 from Components.Button import Button
-from TimerEntry import TimerEntry
+from TimerEntry import TimerEntry, TimerLog
 from RecordTimer import RecordTimerEntry, parseEvent
 from time import *
 from ServiceReference import ServiceReference
@@ -25,12 +25,13 @@ class TimerEditList(Screen):
 		self["key_yellow"] = Button("")
 		self["key_blue"] = Button("")
 
-		self["actions"] = ActionMap(["OkCancelActions", "ShortcutActions"], 
+		self["actions"] = ActionMap(["OkCancelActions", "ShortcutActions", "TimerEditActions"], 
 			{
 				"ok": self.openEdit,
 				"cancel": self.leave,
 				"red": self.removeTimer,
-				"green": self.addCurrentTimer
+				"green": self.addCurrentTimer,
+				"log": self.showLog
 			})
 		self.session.nav.RecordTimer.on_state_change.append(self.onStateChange)
 
@@ -43,6 +44,9 @@ class TimerEditList(Screen):
 		for timer in self.session.nav.RecordTimer.processed_timers:
 			self.list.append(TimerEntryComponent(timer, processed=True))
 
+	def showLog(self):
+		self.session.openWithCallback(self.finishedEdit, TimerLog, self["timerlist"].getCurrent()[0])
+
 	def openEdit(self):
 		self.session.openWithCallback(self.finishedEdit, TimerEntry, self["timerlist"].getCurrent()[0])
 		#self.session.open(TimerEdit, self["timerlist"].getCurrent()[0])