diff options
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Components/ServiceList.py | 3 | ||||
| -rw-r--r-- | lib/python/Screens/ChannelSelection.py | 20 |
2 files changed, 19 insertions, 4 deletions
diff --git a/lib/python/Components/ServiceList.py b/lib/python/Components/ServiceList.py index 93c79296..0f71c44a 100644 --- a/lib/python/Components/ServiceList.py +++ b/lib/python/Components/ServiceList.py @@ -61,6 +61,9 @@ class ServiceList(HTMLComponent, GUIComponent): return marked + def setCurrentMarked(self, state): + self.l.setCurrentMarked(state) + def setMode(self, mode): if mode == self.MODE_NORMAL: self.instance.setItemHeight(20) diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index 5e35a7e1..8b9f9b8c 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -49,6 +49,7 @@ class ChannelSelection(Screen): def __init__(self, session): Screen.__init__(self, session) + self.entry_marked = False self.movemode = False self.bouquet_mark_edit = False @@ -121,9 +122,17 @@ class ChannelSelection(Screen): # ... def channelSelected(self): - self.session.nav.playService(self["list"].getCurrent()) - print "current: " + self["list"].getCurrent().toString() - self.close() + if not (self.movemode): + self.session.nav.playService(self["list"].getCurrent()) + print "current: " + self["list"].getCurrent().toString() + self.close() + else: + if self.entry_marked: + self["list"].setCurrentMarked(False) + self.entry_marked = False + else: + self["list"].setCurrentMarked(True) + self.entry_marked = True #called from infoBar def zap(self): @@ -139,7 +148,10 @@ class ChannelSelection(Screen): self.session.open(ChannelContextMenu, self) def setMoveMode(self, mode): - self.movemode = mode + if mode: + self.movemode = False + else: + self.movemode = True def showFavourites(self): l = self["list" ] |