projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- default fonts handled in windowstyle
[vuplus_dvbapp]
/
screens.py
diff --git
a/screens.py
b/screens.py
index
dd13c55
..
8264628
100644
(file)
--- a/
screens.py
+++ b/
screens.py
@@
-58,9
+58,10
@@
class mainMenu(Screen):
Screen.__init__(self, session)
b = Button("ok")
Screen.__init__(self, session)
b = Button("ok")
- self["actions"] = ActionMap(
"MainMenuActions"
,
+ self["actions"] = ActionMap(
["OkCancelActions"]
,
{
{
- "selected": self.okbuttonClick
+ "ok": self.okbuttonClick,
+ "cancel": self.close
})
b.onClick = [ self.okbuttonClick ]
})
b.onClick = [ self.okbuttonClick ]
@@
-90,24
+91,33
@@
class channelSelection(Screen):
Screen.__init__(self, session)
self["list"] = ServiceList()
Screen.__init__(self, session)
self["list"] = ServiceList()
- self["list"].setRoot(eServiceReference("
1:0:1:0:0:0:0:0:0:0:PREMIERE
"))
+ self["list"].setRoot(eServiceReference("
""1:0:1:0:0:0:0:0:0:0:(provider=="ARD") && (type == 1)""
"))
self["okbutton"] = Button("ok", [self.channelSelected])
class ChannelActionMap(ActionMap):
self["okbutton"] = Button("ok", [self.channelSelected])
class ChannelActionMap(ActionMap):
- def action(self, context, action):
+ def action(self, context
s
, action):
if action[:7] == "bouquet":
print "setting root to " + action[8:]
self.csel["list"].setRoot(eServiceReference("1:0:1:0:0:0:0:0:0:0:" + action[8:]))
else:
if action[:7] == "bouquet":
print "setting root to " + action[8:]
self.csel["list"].setRoot(eServiceReference("1:0:1:0:0:0:0:0:0:0:" + action[8:]))
else:
- ActionMap.action(self, context, action)
+ ActionMap.action(self, context
s
, action)
- self["actions"] = ChannelActionMap(
"ChannelSelectActions"
,
+ self["actions"] = ChannelActionMap(
["ChannelSelectActions", "OkCancelActions"]
,
{
{
- "selectChannel": self.channelSelected,
+ "cancel": self.close,
+ "ok": self.channelSelected,
+ "mark": self.doMark
})
self["actions"].csel = self
})
self["actions"].csel = self
+ def doMark(self):
+ ref = self["list"].getCurrent()
+ if self["list"].isMarked(ref):
+ self["list"].removeMarked(ref)
+ else:
+ self["list"].addMarked(ref)
+
def channelSelected(self):
self.session.nav.playService(self["list"].getCurrent())
self.close()
def channelSelected(self):
self.session.nav.playService(self["list"].getCurrent())
self.close()
@@
-117,7
+127,7
@@
class infoBar(Screen):
def __init__(self, session):
Screen.__init__(self, session)
def __init__(self, session):
Screen.__init__(self, session)
- self["actions"] = ActionMap(
"InfobarActions"
,
+ self["actions"] = ActionMap(
[ "InfobarActions" ]
,
{
"switchChannel": self.switchChannel,
"mainMenu": self.mainMenu
{
"switchChannel": self.switchChannel,
"mainMenu": self.mainMenu