add fpupgrade plugin

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

diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py
index 9e1879ceba9b8c52cd98b43582d61089662a081b..f3754c202188a3bddd0ce2eda63db75806500c9d 100644 (file)
--- a/lib/python/Screens/MovieSelection.py
+++ b/lib/python/Screens/MovieSelection.py
@@ -52,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):
@@ -70,7 +64,6 @@ class MovieSelection(Screen):
                
                self.delayTimer = eTimer()
                self.delayTimer.timeout.get().append(self.updateHDDData)
-               self.delayTimer.start(0, 1)
                
                self["waitingtext"] = Label(_("Please wait... Loading list..."))
                
@@ -80,13 +73,17 @@ class MovieSelection(Screen):
                #self["okbutton"] = Button("ok", [self.channelSelected])
                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)))