git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- start on 'favourites' visual design. service listbox now configurable (in complex...
[enigma2.git]
/
lib
/
python
/
Screens
/
ChannelSelection.py
diff --git
a/lib/python/Screens/ChannelSelection.py
b/lib/python/Screens/ChannelSelection.py
index 465d3de370784ebde4663fe610cee1293725a794..3155c44d9ab2b1f4d7780807e60486049f93781d 100644
(file)
--- a/
lib/python/Screens/ChannelSelection.py
+++ b/
lib/python/Screens/ChannelSelection.py
@@
-69,7
+69,9
@@
class ChannelSelection(Screen):
def action(self, contexts, action):
if action[:7] == "bouquet":
print "setting root to " + action[8:]
def action(self, contexts, 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:]))
+ l = self.csel["list"]
+ l.setMode(l.MODE_NORMAL)
+ l.setRoot(eServiceReference("1:0:1:0:0:0:0:0:0:0:" + action[8:]))
else:
ActionMap.action(self, contexts, action)
else:
ActionMap.action(self, contexts, action)
@@
-78,7
+80,8
@@
class ChannelSelection(Screen):
"cancel": self.close,
"ok": self.channelSelected,
"mark": self.doMark,
"cancel": self.close,
"ok": self.channelSelected,
"mark": self.doMark,
- "contextMenu": self.doContext
+ "contextMenu": self.doContext,
+ "showFavourites": self.showFavourites
})
self["actions"].csel = self
})
self["actions"].csel = self
@@
-119,6
+122,7
@@
class ChannelSelection(Screen):
# ...
def channelSelected(self):
self.session.nav.playService(self["list"].getCurrent())
# ...
def channelSelected(self):
self.session.nav.playService(self["list"].getCurrent())
+ print "current: " + self["list"].getCurrent().toString()
self.close()
#called from infoBar
self.close()
#called from infoBar
@@
-137,3
+141,7
@@
class ChannelSelection(Screen):
def setMoveMode(self, mode):
self.movemode = mode
def setMoveMode(self, mode):
self.movemode = mode
+ def showFavourites(self):
+ l = self["list" ]
+ l.setRoot(eServiceReference('1:0:1:0:0:0:0:0:0:0:(provider == "fav")'))
+ l.setMode(l.MODE_FAVOURITES)