git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unpause by pressing pause when in pause state
[enigma2.git]
/
lib
/
python
/
Screens
/
MovieSelection.py
diff --git
a/lib/python/Screens/MovieSelection.py
b/lib/python/Screens/MovieSelection.py
index ad93a5ebfab1d867e9b0705bbf561be2ed7ea312..e9dc5b388fc3accf3e842ebad29fed1a153b262a 100644
(file)
--- a/
lib/python/Screens/MovieSelection.py
+++ b/
lib/python/Screens/MovieSelection.py
@@
-15,9
+15,9
@@
class ChannelContextMenu(FixedMenu):
self.csel = csel
self.service = service
self.csel = csel
self.service = service
- menu = [(
"back", self.close), ("delete..."
, self.delete)]
+ menu = [(
_("back"), self.close), (_("delete...")
, self.delete)]
- FixedMenu.__init__(self, session,
"Movie Menu"
, menu)
+ FixedMenu.__init__(self, session,
_("Movie Menu")
, menu)
self.skinName = "Menu"
def delete(self):
self.skinName = "Menu"
def delete(self):
@@
-30,9
+30,9
@@
class ChannelContextMenu(FixedMenu):
result = True
if result == True:
result = True
if result == True:
- self.session.openWithCallback(self.deleteConfirmed, MessageBox,
"Do you really want to delete this recording?"
)
+ self.session.openWithCallback(self.deleteConfirmed, MessageBox,
_("Do you really want to delete this recording?")
)
else:
else:
- self.session.openWithCallback(self.close, MessageBox,
"You cannot delete this!"
)
+ self.session.openWithCallback(self.close, MessageBox,
_("You cannot delete this!")
)
def deleteConfirmed(self, confirmed):
if not confirmed:
def deleteConfirmed(self, confirmed):
if not confirmed:
@@
-47,11
+47,16
@@
class ChannelContextMenu(FixedMenu):
result = True
if result == False:
result = True
if result == False:
- self.session.openWithCallback(self.close, MessageBox,
"Delete failed!"
)
+ self.session.openWithCallback(self.close, MessageBox,
_("Delete failed!")
)
else:
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)