git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add needed functions
[enigma2.git]
/
lib
/
python
/
Screens
/
MovieSelection.py
diff --git
a/lib/python/Screens/MovieSelection.py
b/lib/python/Screens/MovieSelection.py
index ad93a5ebfab1d867e9b0705bbf561be2ed7ea312..86d2547369a16b75197044b0409ad3e797686848 100644
(file)
--- a/
lib/python/Screens/MovieSelection.py
+++ b/
lib/python/Screens/MovieSelection.py
@@
-49,9
+49,14
@@
class ChannelContextMenu(FixedMenu):
if result == False:
self.session.openWithCallback(self.close, MessageBox, "Delete failed!")
else:
if result == False:
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()
self.close()
-
class MovieSelection(Screen):
def __init__(self, session):
class MovieSelection(Screen):
def __init__(self, session):
@@
-67,7
+72,7
@@
class MovieSelection(Screen):
self["actions"] = ActionMap(["OkCancelActions", "ContextMenuActions"],
{
self["actions"] = ActionMap(["OkCancelActions", "ContextMenuActions"],
{
- "cancel": self.
close
,
+ "cancel": self.
abort
,
"ok": self.movieSelected,
"contextMenu": self.doContext,
})
"ok": self.movieSelected,
"contextMenu": self.doContext,
})
@@
-77,8
+82,10
@@
class MovieSelection(Screen):
return self["list"].getCurrent()[0]
def movieSelected(self):
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 doContext(self):
self.session.open(ChannelContextMenu, self, self.getCurrent())
+
+ def abort(self):
+ self.close(None)