X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4e6c733d3863b8fee2b1e065c6dcf2837232751b..ca4309210fb3d5d3f7e2bd4a7a59c3fb86919977:/lib/python/Screens/TimerEntry.py

diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index 374ea11a..fef525f0 100644
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -2,12 +2,15 @@ from Screen import Screen
 import ChannelSelection
 from ServiceReference import ServiceReference
 from Components.config import *
-from Components.ActionMap import NumberActionMap
+from Components.ActionMap import ActionMap, 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"))
@@ -46,7 +49,7 @@ class TimerEntry(Screen):
 
 		self.list = []
 		self["config"] = ConfigList(self.list)
-		self.createSetup()
+		self.createSetup("config")
 
 	def createConfig(self):
 			config.timerentry = ConfigSubsection()
@@ -81,6 +84,8 @@ class TimerEntry(Screen):
 			else: # once
 				type = 0
 				repeated = 0
+				weekday = (int(strftime("%w", time.localtime(self.timer.begin))) - 1) % 7
+				day[weekday] = 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))
@@ -130,7 +135,7 @@ class TimerEntry(Screen):
 				except:
 					pass
 
-	def createSetup(self):
+	def createSetup(self, widget):
 		self.list = []
 		self.list.append(getConfigListEntry(_("Name"), config.timerentry.name))
 		self.list.append(getConfigListEntry(_("Description"), config.timerentry.description))
@@ -163,27 +168,27 @@ class TimerEntry(Screen):
 
 		if (config.timerentry.type.value == 0): # once
 			self.list.append(getConfigListEntry(_("Start"), config.timerentry.startdate))
-			self.list.append(getConfigListEntry("", config.timerentry.starttime))
+			self.list.append(getConfigListEntry(" ", config.timerentry.starttime))
 		else:
 			self.list.append(getConfigListEntry(_("StartTime"), config.timerentry.starttime))
 		if (config.timerentry.type.value == 0): # once
 			self.list.append(getConfigListEntry(_("End"), config.timerentry.enddate))
-			self.list.append(getConfigListEntry("", config.timerentry.endtime))
+			self.list.append(getConfigListEntry(" ", config.timerentry.endtime))
 		else:
 			self.list.append(getConfigListEntry(_("EndTime"), config.timerentry.endtime))
 
 		self.channelEntry = getConfigListEntry(_("Channel"), config.timerentry.service)
 		self.list.append(self.channelEntry)
 
-		self["config"].list = self.list
-		self["config"].l.setList(self.list)
+		self[widget].list = self.list
+		self[widget].l.setList(self.list)
 
 	def newConfig(self):
 		print self["config"].getCurrent()
 		if self["config"].getCurrent() == self.timerTypeEntry:
-			self.createSetup()
+			self.createSetup("config")
 		if self["config"].getCurrent() == self.frequencyEntry:
-			self.createSetup()
+			self.createSetup("config")
 
 	def keyLeft(self):
 		if self["config"].getCurrent() == self.channelEntry:
@@ -211,6 +216,8 @@ class TimerEntry(Screen):
 	def keySelect(self):
 		if self["config"].getCurrent() == self.channelEntry:
 			self.session.openWithCallback(self.finishedChannelSelection, ChannelSelection.SimpleChannelSelection, _("Select channel to record from"))
+		else:
+			self.keyGo()
 
 	def finishedChannelSelection(self, args):
 		oldref = self.timer.service_ref
@@ -266,7 +273,7 @@ class TimerEntry(Screen):
 				if event.getNumOfLinkageServices() > 0:
 					self.session.openWithCallback(self.subserviceSelected, SubserviceSelection, event, self.timer.service_ref.ref)
 					return
-			self.close((True, self.timer))
+		self.close((True, self.timer))
 
 	def subserviceSelected(self, service):
 		if not service is None:
@@ -275,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("")