git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix GUI for handling loopthrough btw nims - pls add functionality
[enigma2.git]
/
lib
/
python
/
Screens
/
ChannelSelection.py
diff --git
a/lib/python/Screens/ChannelSelection.py
b/lib/python/Screens/ChannelSelection.py
index 1c1e450302b3a693d3716ba91295d8878eac352d..85801861fe369c7e8e4205d36e35334294245ffe 100644
(file)
--- a/
lib/python/Screens/ChannelSelection.py
+++ b/
lib/python/Screens/ChannelSelection.py
@@
-158,7
+158,7
@@
class ChannelSelection(Screen):
self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions", "ContextMenuActions"],
{
self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions", "ContextMenuActions"],
{
- "cancel": self.c
lose
,
+ "cancel": self.c
ancel
,
"ok": self.channelSelected,
"mark": self.doMark,
"contextMenu": self.doContext,
"ok": self.channelSelected,
"mark": self.doMark,
"contextMenu": self.doContext,
@@
-374,11
+374,19
@@
class ChannelSelection(Screen):
refstr = ""
config.tv.lastservice.value = refstr
config.tv.lastservice.save()
refstr = ""
config.tv.lastservice.value = refstr
config.tv.lastservice.save()
+
+ def cancel(self):
+ self.close()
class SimpleChannelSelection(ChannelSelection):
class SimpleChannelSelection(ChannelSelection):
- def __init__(self, session,
args
):
+ def __init__(self, session,
title
):
ChannelSelection.__init__(self, session)
ChannelSelection.__init__(self, session)
- self.args = args
+ self.title = title
+ self.onShown.append(self.onExecCallback)
+
+ def onExecCallback(self):
+ print "onExecCallback"
+ self.session.currentDialog.instance.setTitle(self.title)
def channelSelected(self): # just return selected service
ref = self.servicelist.getCurrent()
def channelSelected(self): # just return selected service
ref = self.servicelist.getCurrent()
@@
-386,4
+394,7
@@
class SimpleChannelSelection(ChannelSelection):
def doContext(self): # don't show context menu
pass
def doContext(self): # don't show context menu
pass
+
+ def cancel(self):
+ self.close(None)
\ No newline at end of file
\ No newline at end of file