git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove same entries in simpleScan
[enigma2.git]
/
lib
/
python
/
Screens
/
ChannelSelection.py
diff --git
a/lib/python/Screens/ChannelSelection.py
b/lib/python/Screens/ChannelSelection.py
index 43b4cd92043a390ef0454f263fe1e14302cf0456..6abb52d9351a1241876d7a9346fffab2b4540917 100644
(file)
--- a/
lib/python/Screens/ChannelSelection.py
+++ b/
lib/python/Screens/ChannelSelection.py
@@
-2,7
+2,7
@@
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 EpgSelection import EPGSelection
from enigma import eServiceReference
from Screens.FixedMenu import FixedMenu
from enigma import eServiceReference
from Screens.FixedMenu import FixedMenu
@@
-69,7
+69,6
@@
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.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:]))
@@
-82,12
+81,15
@@
class ChannelSelection(Screen):
"ok": self.channelSelected,
"mark": self.doMark,
"contextMenu": self.doContext,
"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):
+ self.session.open(EPGSelection, self["list"].getCurrent())
+
# 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
+99,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):
@@
-136,7
+137,6
@@
class ChannelSelection(Screen):
l.setRoot(ref)
else:
self.session.nav.playService(ref)
l.setRoot(ref)
else:
self.session.nav.playService(ref)
- print "current: " + ref.toString()
self.close()
#called from infoBar
self.close()
#called from infoBar
@@
-157,7
+157,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")'))