X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1c041a12021d9b29334c5a409fcc9e07dfcca1bc..5dc2120aaf6890256cdc25edfc5f0d83192b0291:/lib/python/Screens/MovieSelection.py

diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py
index 0751ce48..a2763c3a 100644
--- a/lib/python/Screens/MovieSelection.py
+++ b/lib/python/Screens/MovieSelection.py
@@ -20,21 +20,23 @@ class ChannelContextMenu(FixedMenu):
 	def __init__(self, session, csel, service):
 		self.csel = csel
 		self.service = service
-		
+
 		menu = [(_("back"), self.close), (_("delete..."), self.delete)]
-		
+
 		for p in plugins.getPlugins(PluginDescriptor.WHERE_MOVIELIST):
 			menu.append((p.description, boundFunction(self.execPlugin, p)))
-		
+
 		FixedMenu.__init__(self, session, _("Movie Menu"), menu)
 		self.skinName = "Menu"
-	
+
 	def execPlugin(self, plugin):
 		plugin(session=self.session, service=self.service)
 
 	def delete(self):
 		serviceHandler = eServiceCenter.getInstance()
 		offline = serviceHandler.offlineOperations(self.service)
+		info = serviceHandler.info(self.service)
+		name = info and info.getName(self.service) or _("this recording")
 		result = False
 		if offline is not None:
 			# simulate first
@@ -42,7 +44,7 @@ class ChannelContextMenu(FixedMenu):
 				result = True
 		
 		if result == True:
-			self.session.openWithCallback(self.deleteConfirmed, MessageBox, _("Do you really want to delete this recording?"))
+			self.session.openWithCallback(self.deleteConfirmed, MessageBox, _("Do you really want to delete %s?") % (name))
 		else:
 			self.session.openWithCallback(self.close, MessageBox, _("You cannot delete this!"), MessageBox.TYPE_ERROR)
 
@@ -68,6 +70,11 @@ class MovieSelection(Screen):
 	def __init__(self, session, selectedmovie = None):
 		Screen.__init__(self, session)
 		
+		self.tags = [ ]
+		self.selected_tags = None
+		
+		self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + resolveFilename(SCOPE_HDD))
+		
 		self.movemode = False
 		self.bouquet_mark_edit = False
 		
@@ -80,38 +87,57 @@ class MovieSelection(Screen):
 		self.list = self["list"]
 		self.selectedmovie = selectedmovie
 		
+		self["key_red"] = Button(_("All..."))
+		self["key_green"] = Button("")
+		self["key_yellow"] = Button("")
+		self["key_blue"] = Button("")
+		
 		#self["okbutton"] = Button("ok", [self.channelSelected])
 		self["freeDiskSpace"] = DiskInfo(resolveFilename(SCOPE_HDD), DiskInfo.FREE, update=False)
 		
-		self["actions"] = ActionMap(["OkCancelActions", "MovieSelectionActions"],
+		self["actions"] = ActionMap(["OkCancelActions", "MovieSelectionActions", "ColorActions"],
 			{
 				"cancel": self.abort,
 				"ok": self.movieSelected,
+				"showEventInfo": self.showEventInformation,
 				"contextMenu": self.doContext,
+				
+				"red": self.showAll,
+				"yellow": self.showTagsFirst,
+				"green": self.showTagsSecond,
+				"blue": self.showTagsMenu,
 			})
 		self["actions"].csel = self
 		self.onShown.append(self.go)
 		
 		self.lengthTimer = eTimer()
 		self.lengthTimer.timeout.get().append(self.updateLengthData)
-		
+		self.inited = False
+
+	def showEventInformation(self):
+		from Screens.EventView import EventViewSimple
+		from ServiceReference import ServiceReference
+		evt = self["list"].getCurrentEvent()
+		if evt:
+			self.session.open(EventViewSimple, evt, ServiceReference(self.getCurrent()))
+
 	def go(self):
+		if not self.inited:
 		# ouch. this should redraw our "Please wait..."-text.
 		# this is of course not the right way to do this.
-		self.delayTimer.start(10, 1)
+			self.delayTimer.start(10, 1)
+			self.inited=True
 
 	def updateHDDData(self):
-		self["list"].reload(eServiceReference("2:0:1:0:0:0:0:0:0:0:" + resolveFilename(SCOPE_HDD)))
-		if (self.selectedmovie is not None):
+ 		self.reloadList()
+ 		if self.selectedmovie is not None:
 			self.moveTo()
 		self["waitingtext"].instance.hide()
-						
+
 		self["freeDiskSpace"].update()
-		
-		self.lengthTimer.start(10, 1)
-		self.lengthPosition = 0
-		self.lengthLength = len(self["list"])
-		
+
+		self.updateTags()
+
 	def updateLengthData(self):
 		self.list.updateLengthOfIndex(self.lengthPosition)
 		self.lengthPosition += 1
@@ -125,6 +151,7 @@ class MovieSelection(Screen):
 		return self["list"].getCurrent()
 
 	def movieSelected(self):
+		self.lengthTimer.stop()
 		current = self.getCurrent()
 		if current is not None:
 			self.close(current)
@@ -136,3 +163,61 @@ class MovieSelection(Screen):
 
 	def abort(self):
 		self.close(None)
+
+	def updateTags(self):
+		# get a list of tags available in this list
+		self.tags = list(self["list"].tags)
+		
+		# by default, we do not display any filtering options
+		self.tag_first = ""
+		self.tag_second = ""
+		
+		# when tags are present, however, the first two are 
+		# directly mapped to the second, third ("green", "yellow") buttons
+		if len(self.tags) > 0:
+			self.tag_first = self.tags[0]
+		
+		if len(self.tags) > 1:
+			self.tag_second = self.tags[1]
+		
+		self["key_green"].text = self.tag_first
+		self["key_yellow"].text = self.tag_second
+		
+		# the rest is presented in a list, available on the
+		# fourth ("blue") button
+		if len(self.tags) > 2:
+			self["key_blue"].text = _("Other...")
+		else:
+			self["key_blue"].text = ""
+
+	def reloadList(self):
+		self["list"].reload(self.current_ref, self.selected_tags)
+		self.lengthTimer.start(10, 1)
+		self.lengthPosition = 0
+		self.lengthLength = len(self["list"])
+
+	def showAll(self):
+		self.selected_tags = None
+		self.reloadList()
+
+	def showTagsN(self, n):
+		if len(self.tags) < n:
+			self.showTagWarning()
+		else:
+			self.selected_tags = set([self.tags[n - 1]])
+			self.reloadList()
+
+	def showTagsFirst(self):
+		self.showTagsN(1)
+
+	def showTagsSecond(self):
+		self.showTagsN(2)
+
+	def showTagsMenu(self):
+		if len(self.tags) < 3:
+			self.showTagWarning()
+		else:
+			pass
+
+	def showTagWarning(self):
+		print "select some tags first!"