X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0a0bf3acd320d857378eedb6c3bbfc2753cb20d2..9c2be7b98291ced0479a737f9141ed6d64eaed3a:/lib/python/Screens/MovieSelection.py

diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py
index 17da5ff3..82c9c7e5 100644
--- a/lib/python/Screens/MovieSelection.py
+++ b/lib/python/Screens/MovieSelection.py
@@ -35,6 +35,8 @@ class ChannelContextMenu(FixedMenu):
 	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)
 
@@ -77,6 +79,7 @@ class MovieSelection(Screen):
 		self["waitingtext"] = Label(_("Please wait... Loading list..."))
 		
 		self["list"] = MovieList(None)
+		self.list = self["list"]
 		self.selectedmovie = selectedmovie
 		
 		#self["okbutton"] = Button("ok", [self.channelSelected])
@@ -91,6 +94,9 @@ class MovieSelection(Screen):
 		self["actions"].csel = self
 		self.onShown.append(self.go)
 		
+		self.lengthTimer = eTimer()
+		self.lengthTimer.timeout.get().append(self.updateLengthData)
+		
 	def go(self):
 		# ouch. this should redraw our "Please wait..."-text.
 		# this is of course not the right way to do this.
@@ -103,15 +109,25 @@ class MovieSelection(Screen):
 		self["waitingtext"].instance.hide()
 						
 		self["freeDiskSpace"].update()
+		
+		self.lengthTimer.start(10, 1)
+		self.lengthPosition = 0
+		self.lengthLength = len(self["list"])
+		
+	def updateLengthData(self):
+		self.list.updateLengthOfIndex(self.lengthPosition)
+		self.lengthPosition += 1
+		if self.lengthPosition < self.lengthLength:
+			self.lengthTimer.start(10, 1)
 
 	def moveTo(self):
 		self["list"].moveTo(self.selectedmovie)
 
 	def getCurrent(self):
-		l = self["list"].getCurrent()
-		return l and l[0]
+		return self["list"].getCurrent()
 
 	def movieSelected(self):
+		self.lengthTimer.stop()
 		current = self.getCurrent()
 		if current is not None:
 			self.close(current)