X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b2d6392a3b41f870b5615c8e19b26496e56f6310..21f79f2e37db9b37da2522ba7d0e8d6676ddad5b:/lib/python/Screens/MovieSelection.py

diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py
index 2ba2d059..f3754c20 100644
--- a/lib/python/Screens/MovieSelection.py
+++ b/lib/python/Screens/MovieSelection.py
@@ -4,11 +4,14 @@ from Components.ServiceList import ServiceList
 from Components.ActionMap import ActionMap
 from Components.MovieList import MovieList
 from Components.DiskInfo import DiskInfo
+from Components.Label import Label
 
 from Screens.MessageBox import MessageBox
 from Screens.FixedMenu import FixedMenu
 
-from enigma import eServiceReference, eServiceCenter
+from Tools.Directories import *
+
+from enigma import eServiceReference, eServiceCenter, eTimer
 
 class ChannelContextMenu(FixedMenu):
 	def __init__(self, session, csel, service):
@@ -49,13 +52,7 @@ class ChannelContextMenu(FixedMenu):
 		if result == False:
 			self.session.openWithCallback(self.close, MessageBox, _("Delete failed!"), MessageBox.TYPE_ERROR)
 		else:
-			list = self.csel["list"]
-			currentIndex = list.getCurrentIndex()
-			list.moveDown()
-			if list.getCurrentIndex() == currentIndex:
-				currentIndex -= 1
-			list.reload()
-			list.moveToIndex(currentIndex)
+			list = self.csel["list"].removeService(self.service)
 			self.close()
  
 class MovieSelection(Screen):
@@ -65,21 +62,36 @@ class MovieSelection(Screen):
 		self.movemode = False
 		self.bouquet_mark_edit = False
 		
-		self["list"] = MovieList(eServiceReference("2:0:1:0:0:0:0:0:0:0:/hdd/movies/"))
-		if (selectedmovie is not None):
-			self.onShown.append(self.moveTo)
-			self.selectedmovie = selectedmovie
+		self.delayTimer = eTimer()
+		self.delayTimer.timeout.get().append(self.updateHDDData)
+		
+		self["waitingtext"] = Label(_("Please wait... Loading list..."))
+		
+		self["list"] = MovieList(None)
+		self.selectedmovie = selectedmovie
 		
 		#self["okbutton"] = Button("ok", [self.channelSelected])
-		self["freeDiskSpace"] = DiskInfo("/hdd/movies", DiskInfo.FREE)
+		self["freeDiskSpace"] = DiskInfo(resolveFilename(SCOPE_HDD), DiskInfo.FREE, update=False)
 		
-		self["actions"] = ActionMap(["OkCancelActions", "ContextMenuActions"],
+		self["actions"] = ActionMap(["OkCancelActions", "MovieSelectionActions"],
 			{
 				"cancel": self.abort,
 				"ok": self.movieSelected,
 				"contextMenu": self.doContext,
 			})
 		self["actions"].csel = self
+		self.onShown.append(self.go)
+		
+	def go(self):
+		self.delayTimer.start(0, 1)
+
+	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.moveTo()
+		self["waitingtext"].instance.hide()
+						
+		self["freeDiskSpace"].update()
 
 	def moveTo(self):
 		self["list"].moveTo(self.selectedmovie)