X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/36f427fcb34bb0dafa3d395dbc6bfc060494c874..a9f9792e9d271864182d32bfff58795690084cab:/lib/python/Screens/MovieSelection.py

diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py
index ad93a5eb..e9dc5b38 100644
--- a/lib/python/Screens/MovieSelection.py
+++ b/lib/python/Screens/MovieSelection.py
@@ -15,9 +15,9 @@ class ChannelContextMenu(FixedMenu):
 		self.csel = csel
 		self.service = service
 		
-		menu = [("back", self.close), ("delete...", self.delete)]
+		menu = [(_("back"), self.close), (_("delete..."), self.delete)]
 		
-		FixedMenu.__init__(self, session, "Movie Menu", menu)
+		FixedMenu.__init__(self, session, _("Movie Menu"), menu)
 		self.skinName = "Menu"
 
 	def delete(self):
@@ -30,9 +30,9 @@ 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 this recording?"))
 		else:
-			self.session.openWithCallback(self.close, MessageBox, "You cannot delete this!")
+			self.session.openWithCallback(self.close, MessageBox, _("You cannot delete this!"))
 
 	def deleteConfirmed(self, confirmed):
 		if not confirmed:
@@ -47,11 +47,16 @@ class ChannelContextMenu(FixedMenu):
 				result = True
 		
 		if result == False:
-			self.session.openWithCallback(self.close, MessageBox, "Delete failed!")
+			self.session.openWithCallback(self.close, MessageBox, _("Delete failed!"))
 		else:
-			self.csel["list"].reload()
+			list = self.csel["list"]
+			currentIndex = list.getCurrentIndex()
+			list.moveDown()
+			if list.getCurrentIndex() == currentIndex:
+				currentIndex -= 1
+			list.reload()
+			list.moveToIndex(currentIndex)
 			self.close()
-		
  
 class MovieSelection(Screen):
 	def __init__(self, session):
@@ -67,7 +72,7 @@ class MovieSelection(Screen):
 		
 		self["actions"] = ActionMap(["OkCancelActions", "ContextMenuActions"],
 			{
-				"cancel": self.close,
+				"cancel": self.abort,
 				"ok": self.movieSelected,
 				"contextMenu": self.doContext,
 			})
@@ -77,8 +82,10 @@ class MovieSelection(Screen):
 		return self["list"].getCurrent()[0]
 
 	def movieSelected(self):
-		self.session.nav.playService(self.getCurrent())
-		self.close()
+		self.close(self.getCurrent())
 
 	def doContext(self):
 		self.session.open(ChannelContextMenu, self, self.getCurrent())
+
+	def abort(self):
+		self.close(None)