git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
comment out non correct working code,
[enigma2.git]
/
lib
/
python
/
Screens
/
ChannelSelection.py
diff --git
a/lib/python/Screens/ChannelSelection.py
b/lib/python/Screens/ChannelSelection.py
index 8b9f9b8caa6b4eea513fc131ddbe1770d9588d6a..61c670389fcba38c9637b0e9e82a08a647564dd4 100644
(file)
--- a/
lib/python/Screens/ChannelSelection.py
+++ b/
lib/python/Screens/ChannelSelection.py
@@
-2,8
+2,8
@@
from Screen import Screen
from Components.Button import Button
from Components.ServiceList import ServiceList
from Components.ActionMap import ActionMap
from Components.Button import Button
from Components.ServiceList import ServiceList
from Components.ActionMap import ActionMap
-
-from enigma import eServiceReference
+from EpgSelection import EPGSelection
+from enigma import eServiceReference
, eEPGCache, eEPGCachePtr
from Screens.FixedMenu import FixedMenu
from Screens.FixedMenu import FixedMenu
@@
-69,25
+69,32
@@
class ChannelSelection(Screen):
class ChannelActionMap(ActionMap):
def action(self, contexts, action):
if action[:7] == "bouquet":
class ChannelActionMap(ActionMap):
def action(self, contexts, action):
if action[:7] == "bouquet":
- print "setting root to " + action[8:]
l = self.csel["list"]
l.setMode(l.MODE_NORMAL)
l = self.csel["list"]
l.setMode(l.MODE_NORMAL)
- l.setRoot(eServiceReference("1:
0
:1:0:0:0:0:0:0:0:" + action[8:]))
+ l.setRoot(eServiceReference("1:
7
:1:0:0:0:0:0:0:0:" + action[8:]))
else:
ActionMap.action(self, contexts, action)
else:
ActionMap.action(self, contexts, action)
- self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions"],
+ self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions"
, "ContextMenuActions"
],
{
"cancel": self.close,
"ok": self.channelSelected,
"mark": self.doMark,
"contextMenu": self.doContext,
{
"cancel": self.close,
"ok": self.channelSelected,
"mark": self.doMark,
"contextMenu": self.doContext,
- "showFavourites": self.showFavourites
+ "showFavourites": self.showFavourites,
+ "showEPGList": self.showEPGList
})
self["actions"].csel = self
})
self["actions"].csel = self
+ def showEPGList(self):
+ ref=self["list"].getCurrent()
+ ptr=eEPGCache.getInstance()
+ if ptr.startTimeQuery(ref) != -1:
+ self.session.open(EPGSelection, ref)
+ else:
+ print 'no epg for service', ref.toString()
+
# marked edit mode
# marked edit mode
-
def startMarkedEdit(self):
self.bouquet_mark_edit = True
self.clearMarks()
def startMarkedEdit(self):
self.bouquet_mark_edit = True
self.clearMarks()
@@
-97,7
+104,6
@@
class ChannelSelection(Screen):
l = self["list"]
for x in marked:
l = self["list"]
for x in marked:
- print "mark: " + str(x)
l.addMarked(x)
def endMarkedEdit(self, abort):
l.addMarked(x)
def endMarkedEdit(self, abort):
@@
-122,17
+128,21
@@
class ChannelSelection(Screen):
# ...
def channelSelected(self):
# ...
def channelSelected(self):
- if not (self.movemode):
- self.session.nav.playService(self["list"].getCurrent())
- print "current: " + self["list"].getCurrent().toString()
- self.close()
- else:
+ ref = self["list"].getCurrent()
+ if self.movemode:
if self.entry_marked:
self["list"].setCurrentMarked(False)
self.entry_marked = False
else:
self["list"].setCurrentMarked(True)
self.entry_marked = True
if self.entry_marked:
self["list"].setCurrentMarked(False)
self.entry_marked = False
else:
self["list"].setCurrentMarked(True)
self.entry_marked = True
+ elif (ref.flags & 7) == 7:
+ l = self["list"]
+ l.setMode(l.MODE_NORMAL)
+ l.setRoot(ref)
+ else:
+ self.session.nav.playService(ref)
+ self.close()
#called from infoBar
def zap(self):
#called from infoBar
def zap(self):
@@
-152,7
+162,7
@@
class ChannelSelection(Screen):
self.movemode = False
else:
self.movemode = True
self.movemode = False
else:
self.movemode = True
-
+
def showFavourites(self):
l = self["list" ]
l.setRoot(eServiceReference('1:0:1:0:0:0:0:0:0:0:(provider == "fav")'))
def showFavourites(self):
l = self["list" ]
l.setRoot(eServiceReference('1:0:1:0:0:0:0:0:0:0:(provider == "fav")'))