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

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

3 files changed, 102 insertions, 7 deletions

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index b9efd8b4..41857375 100644
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -15,12 +15,14 @@ class LanguageSelection(Screen):
 		self["list"] = LanguageList(self.list)
 		self.updateList()
 		
-		self["actions"] = ActionMap(["WizardActions"], 
+		self["actions"] = ActionMap(["OkCancelActions", "DirectionActions"], 
 		{
 			"ok": self.save,
-			"back": self.close,
+			"cancel": self.close,
 			"up": self.up,
-			"down": self.down
+			"down": self.down,
+			"left": self.left,
+			"right": self.right
 		}, -1)
 		
 	def save(self):
@@ -52,3 +54,13 @@ class LanguageSelection(Screen):
 		self["list"].instance.moveSelection(self["list"].instance.moveDown)
 		self.run()
 		self.updateList()
+
+	def left(self):
+		self["list"].instance.moveSelection(self["list"].instance.pageUp)
+		self.run()
+		self.updateList()
+		
+	def right(self):
+		self["list"].instance.moveSelection(self["list"].instance.pageDown)
+		self.run()
+		self.updateList()
\ No newline at end of file
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])
diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index df912014..752ace42 100644
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -4,10 +4,13 @@ from ServiceReference import ServiceReference
 from Components.config import *
 from Components.ActionMap import NumberActionMap
 from Components.ConfigList import ConfigList
+from Components.MenuList import MenuList
+from Components.Button import Button
 from Components.NimManager import nimmanager
 from Components.Label import Label
 from Components.Pixmap import Pixmap
 from Screens.SubserviceSelection import SubserviceSelection
+from Screens.MessageBox import MessageBox
 from enigma import eEPGCache
 import time
 import datetime
@@ -15,7 +18,7 @@ import datetime
 class TimerEntry(Screen):
 	def __init__(self, session, timer):
 		Screen.__init__(self, session)
-		self.timer = timer;
+		self.timer = timer
 		
 		self["oktext"] = Label(_("OK"))
 		self["canceltext"] = Label(_("Cancel"))
@@ -279,3 +282,79 @@ class TimerEntry(Screen):
 
 	def keyCancel(self):
 		self.close((False,))
+
+class TimerLog(Screen):
+	def __init__(self, session, timer):
+		Screen.__init__(self, session)
+		self.timer = timer;
+		self.log_entries = self.timer.log_entries[:]
+		
+		self.fillLogList()
+		
+		self["loglist"] = MenuList(self.list)
+		self["logentry"] = Label()
+		
+		self["key_red"] = Button(_("Delete entry"))
+		self["key_green"] = Button()
+		self["key_yellow"] = Button("")
+		self["key_blue"] = Button(_("Clear log"))
+		
+		self.onShown.append(self.updateText)
+
+		self["actions"] = NumberActionMap(["OkCancelActions", "DirectionActions", "ColorActions"],
+		{
+			"ok": self.keyClose,
+			"cancel": self.keyClose,
+			"up": self.up,
+			"down": self.down,
+			"left": self.left,
+			"right": self.right,
+			"red": self.deleteEntry,
+			"blue": self.clearLog
+		}, -1)
+
+	def deleteEntry(self):
+		self.log_entries.remove(self["loglist"].getCurrent()[1])
+		self.fillLogList()
+		self["loglist"].l.setList(self.list)
+		self.updateText()
+
+	def fillLogList(self):
+		self.list = [ ]
+		for x in self.log_entries:
+			self.list.append((str(strftime("%Y-%m-%d %H-%M", localtime(x[0])) + " - " + x[2]), x))
+	
+	def clearLog(self):		
+		self.log_entries = []
+		self.fillLogList()
+		self["loglist"].l.setList(self.list)
+		self.updateText()
+		
+	def keyClose(self):
+		if self.timer.log_entries != self.log_entries:
+			self.timer.log_entries = self.log_entries
+			self.close((True, self.timer))
+		else:
+			self.close((False,))
+		
+	def up(self):
+		self["loglist"].instance.moveSelection(self["loglist"].instance.moveUp)
+		self.updateText()
+		
+	def down(self):
+		self["loglist"].instance.moveSelection(self["loglist"].instance.moveDown)
+		self.updateText()
+
+	def left(self):
+		self["loglist"].instance.moveSelection(self["loglist"].instance.pageUp)
+		self.updateText()
+		
+	def right(self):
+		self["loglist"].instance.moveSelection(self["loglist"].instance.pageDown)
+		self.updateText()
+
+	def updateText(self):
+		if len(self.list) > 0:
+			self["logentry"].setText(str(self["loglist"].getCurrent()[1][2]))
+		else:
+			self["logentry"].setText("")