X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4cc1f7a05166715c19c965e3bbbe74a43835a754..d25cc68147eac7b8e7628a9abdffe55a758612a3:/lib/python/Screens/MovieSelection.py

diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py
index e9dc5b38..6bb18721 100644
--- a/lib/python/Screens/MovieSelection.py
+++ b/lib/python/Screens/MovieSelection.py
@@ -8,6 +8,8 @@ from Components.DiskInfo import DiskInfo
 from Screens.MessageBox import MessageBox
 from Screens.FixedMenu import FixedMenu
 
+from Tools.Directories import *
+
 from enigma import eServiceReference, eServiceCenter
 
 class ChannelContextMenu(FixedMenu):
@@ -32,7 +34,7 @@ class ChannelContextMenu(FixedMenu):
 		if result == True:
 			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!"), MessageBox.TYPE_ERROR)
 
 	def deleteConfirmed(self, confirmed):
 		if not confirmed:
@@ -47,7 +49,7 @@ class ChannelContextMenu(FixedMenu):
 				result = True
 		
 		if result == False:
-			self.session.openWithCallback(self.close, MessageBox, _("Delete failed!"))
+			self.session.openWithCallback(self.close, MessageBox, _("Delete failed!"), MessageBox.TYPE_ERROR)
 		else:
 			list = self.csel["list"]
 			currentIndex = list.getCurrentIndex()
@@ -59,16 +61,19 @@ class ChannelContextMenu(FixedMenu):
 			self.close()
  
 class MovieSelection(Screen):
-	def __init__(self, session):
+	def __init__(self, session, selectedmovie = None):
 		Screen.__init__(self, session)
 		
 		self.movemode = False
 		self.bouquet_mark_edit = False
 		
-		self["list"] = MovieList(eServiceReference("2:0:1:0:0:0:0:0:0:0:/hdd/movies/"))
+		self["list"] = MovieList(eServiceReference("2:0:1:0:0:0:0:0:0:0:" + resolveFilename(SCOPE_HDD)))
+		if (selectedmovie is not None):
+			self.onShown.append(self.moveTo)
+			self.selectedmovie = selectedmovie
 		
 		#self["okbutton"] = Button("ok", [self.channelSelected])
-		self["freeDiskSpace"] = DiskInfo("/hdd/movies", DiskInfo.FREE)
+		self["freeDiskSpace"] = DiskInfo(resolveFilename(SCOPE_HDD), DiskInfo.FREE)
 		
 		self["actions"] = ActionMap(["OkCancelActions", "ContextMenuActions"],
 			{
@@ -78,6 +83,9 @@ class MovieSelection(Screen):
 			})
 		self["actions"].csel = self
 
+	def moveTo(self):
+		self["list"].moveTo(self.selectedmovie)
+
 	def getCurrent(self):
 		return self["list"].getCurrent()[0]