going back in the wizard should work better now

[enigma2.git] / lib / python / Screens / MovieSelection.py

diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py
index ffa73c14c36252483ba1665fbd2b908bd606f737..079f5ebd8a78cad81490ad34f899f89a68e5e9df 100644 (file)
--- a/lib/python/Screens/MovieSelection.py
+++ b/lib/python/Screens/MovieSelection.py
@@ -4,11 +4,17 @@ 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 Components.PluginComponent import plugins
+from Plugins.Plugin import PluginDescriptor
 
 from Screens.MessageBox import MessageBox
 from Screens.FixedMenu import FixedMenu
 
-from enigma import eServiceReference, eServiceCenter
+from Tools.Directories import *
+from Tools.BoundFunction import boundFunction
+
+from enigma import eServiceReference, eServiceCenter, eTimer
 
 class ChannelContextMenu(FixedMenu):
        def __init__(self, session, csel, service):
@@ -17,8 +23,14 @@ class ChannelContextMenu(FixedMenu):
                
                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(self.session, self.service)
 
        def delete(self):
                serviceHandler = eServiceCenter.getInstance()
@@ -32,7 +44,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,15 +59,9 @@ 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()
-                       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 +71,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)