X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/46b8f96749c596e31d70610c80e64fd1561c007a..fe0d65abf126e400bd20a51aa96dd532b03efd3d:/lib/python/Screens/EpgSelection.py

diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py
index 3dbba0fd..a2c31d26 100644
--- a/lib/python/Screens/EpgSelection.py
+++ b/lib/python/Screens/EpgSelection.py
@@ -1,22 +1,19 @@
 from Screen import Screen
+from Components.config import config, ConfigClock
 from Components.Button import Button
 from Components.Pixmap import Pixmap
 from Components.Label import Label
-from Components.EpgList import *
+from Components.EpgList import EPGList, EPG_TYPE_SINGLE, EPG_TYPE_SIMILAR, EPG_TYPE_MULTI
 from Components.ActionMap import ActionMap
-from Components.ScrollLabel import ScrollLabel
 from Screens.EventView import EventViewSimple
 from TimeDateInput import TimeDateInput
-from enigma import eServiceReference, eServiceEventPtr
-from Screens.FixedMenu import FixedMenu
+from enigma import eServiceReference
 from RecordTimer import RecordTimerEntry, parseEvent
-from TimerEdit import TimerEditList
 from TimerEntry import TimerEntry
 from ServiceReference import ServiceReference
-from Components.config import config, currentConfigSelectionElement
-from time import localtime
+from time import localtime, time
 
-import xml.dom.minidom
+mepg_config_initialized = False
 
 class EPGSelection(Screen):
 	def __init__(self, session, service, zapFunc=None, eventid=None, bouquetChangeCB=None):
@@ -39,6 +36,8 @@ class EPGSelection(Screen):
 			self["key_blue"] = Button()
 			self.currentService=ServiceReference(service)
 			self.zapFunc = None
+			self.sort_type = 0
+			self.setSortDescription()
 		else:
 			self.skinName = "EPGSelectionMulti"
 			self.type = EPG_TYPE_MULTI
@@ -60,11 +59,7 @@ class EPGSelection(Screen):
 		self["key_green"] = Button(_("Add timer"))
 		self["list"] = EPGList(type = self.type, selChangedCB = self.onSelectionChanged, timer = self.session.nav.RecordTimer)
 
-		class ChannelActionMap(ActionMap):
-			def action(self, contexts, action):
-				return ActionMap.action(self, contexts, action)
-
-		self["actions"] = ChannelActionMap(["EPGSelectActions", "OkCancelActions"],
+		self["actions"] = ActionMap(["EPGSelectActions", "OkCancelActions"],
 			{
 				"cancel": self.closeScreen,
 				"ok": self.eventSelected,
@@ -91,7 +86,11 @@ class EPGSelection(Screen):
 
 	def enterDateTime(self):
 		if self.type == EPG_TYPE_MULTI:
-			self.session.openWithCallback(self.onDateTimeInputClosed, TimeDateInput)
+			global mepg_config_initialized
+			if not mepg_config_initialized:
+				config.misc.prev_mepg_time=ConfigClock(default = time())
+				mepg_config_initialized = True
+			self.session.openWithCallback(self.onDateTimeInputClosed, TimeDateInput, config.misc.prev_mepg_time )
 
 	def onDateTimeInputClosed(self, ret):
 		if len(ret) > 1:
@@ -103,13 +102,9 @@ class EPGSelection(Screen):
 		self.close(self.closeRecursive)
 
 	def infoKeyPressed(self):
-		if self.type == EPG_TYPE_MULTI or self.type == EPG_TYPE_SIMILAR:
-			cur = self["list"].getCurrent()
-			event = cur[0]
-			service = cur[1]
-		else:
-			event = self["list"].getCurrent()
-			service = self.currentService
+		cur = self["list"].getCurrent()
+		event = cur[0]
+		service = cur[1]
 		if event is not None:
 			if self.type != EPG_TYPE_SIMILAR:
 				self.session.open(EventViewSimple, event, service, self.eventViewCallback, self.openSimilarList)
@@ -126,15 +121,12 @@ class EPGSelection(Screen):
 	#just used in multipeg
 	def onCreate(self):
 		l = self["list"]
+		l.recalcEntrySize()
 		if self.type == EPG_TYPE_MULTI:
-			l.recalcEntrySize()
 			l.fillMultiEPG(self.services, self.ask_time)
 		elif self.type == EPG_TYPE_SINGLE:
-			if SINGLE_CPP == 0:
-				l.recalcEntrySize()
 			l.fillSingleEPG(self.currentService)
 		else:
-			l.recalcEntrySize()
 			l.fillSimilarList(self.currentService, self.eventid)
 
 	def eventViewCallback(self, setEvent, setService, val):
@@ -145,14 +137,11 @@ class EPGSelection(Screen):
 		elif val == +1:
 			self.moveDown()
 		cur = l.getCurrent()
-		if self.type == EPG_TYPE_SINGLE:
-			setEvent(cur)
+		if self.type == EPG_TYPE_MULTI and cur[0] is None and cur[1].ref != old[1].ref:
+			self.eventViewCallback(setEvent, setService, val)
 		else:
-			if self.type == EPG_TYPE_MULTI and cur[0] is None and cur[1].ref != old[1].ref:
-				self.eventViewCallback(setEvent, setService, val)
-			else:
-				setService(cur[1])
-				setEvent(cur[0])
+			setService(cur[1])
+			setEvent(cur[0])
 
 	def zapTo(self): # just used in multiepg
 		if self.zapFunc and self["key_red"].getText() == "Zap":
@@ -169,22 +158,33 @@ class EPGSelection(Screen):
 	def yellowButtonPressed(self):
 		if self.type == EPG_TYPE_MULTI:
 			self["list"].updateMultiEPG(-1)
+		elif self.type == EPG_TYPE_SINGLE:
+			if self.sort_type == 0:
+				self.sort_type = 1
+			else:
+				self.sort_type = 0
+			self["list"].sortSingleEPG(self.sort_type)
+			self.setSortDescription()
+
+	def setSortDescription(self):
+		if self.sort_type == 1:
+			# TRANSLATORS: This must fit into the header button in the EPG-List
+			self["key_yellow"].setText(_("Sort Time"))
+		else:
+			# TRANSLATORS: This must fit into the header button in the EPG-List
+			self["key_yellow"].setText(_("Sort A-Z"))
 
 	def blueButtonPressed(self):
 		if self.type == EPG_TYPE_MULTI:
 			self["list"].updateMultiEPG(1)
 
 	def timerAdd(self):
-		if self.type == EPG_TYPE_SINGLE:
-			event = self["list"].getCurrent()
-			serviceref = self.currentService
-		else:
-			cur = self["list"].getCurrent()
-			event = cur[0]
-			serviceref = cur[1]
+		cur = self["list"].getCurrent()
+		event = cur[0]
+		serviceref = cur[1]
 		if event is None:
 			return
-		newEntry = RecordTimerEntry(serviceref, *parseEvent(event))
+		newEntry = RecordTimerEntry(serviceref, checkOldTimers = True, *parseEvent(event))
 		self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry)
 
 	def timerEditFinished(self, answer):