def okbuttonClick(self):
self.selectedFunc(self["menu"].getCurrent()[1])
+ self.close(True)
def cancelClick(self):
self.close(False)
-class ChannelContextMenu(FixedMenu):
+class ChannelContextMenu(Screen):
def __init__(self, session, csel):
+ Screen.__init__(self, session)
self.csel = csel
+ self["actions"] = ActionMap(["OkCancelActions"],
+ {
+ "ok": self.okbuttonClick,
+ "cancel": self.cancelClick
+ })
menu = [ ]
inBouquetRootList = csel.getRoot().getPath().find('FROM BOUQUET "bouquets.') != -1 #FIXME HACK
menu.append((_("end favourites edit"), self.bouquetMarkEnd))
menu.append((_("abort favourites edit"), self.bouquetMarkAbort))
- menu.append((_("back"), self.close))
+ menu.append((_("back"), self.cancelClick))
+ self["menu"] = MenuList(menu)
- FixedMenu.__init__(self, session, _("Channel Selection"), menu)
- self.skinName = "Menu"
+ def okbuttonClick(self):
+ self["menu"].getCurrent()[1]()
+
+ def cancelClick(self):
+ self.close(False)
def addServiceToBouquetSelected(self):
bouquets = self.csel.getBouquetList()
else:
cnt = len(bouquets)
if cnt > 1: # show bouquet list
- self.session.open(BouquetSelector, bouquets, self.addCurrentServiceToBouquet)
+ self.session.openWithCallback(self.bouquetSelClosed, BouquetSelector, bouquets, self.addCurrentServiceToBouquet)
elif cnt == 1: # add to only one existing bouquet
self.addCurrentServiceToBouquet(bouquets[0][1])
else: #no bouquets in root.. so assume only one favourite list is used
self.addCurrentServiceToBouquet(self.csel.bouquet_root)
+ def bouquetSelClosed(self, recursive):
+ if recursive:
+ self.close(False)
+
def copyCurrentToBouquetList(self):
self.csel.copyCurrentToBouquetList()
self.close()
def addCurrentServiceToBouquet(self, dest):
self.csel.addCurrentServiceToBouquet(dest)
- self.close()
def removeCurrentService(self):
self.csel.removeCurrentService()
"cancel": self.cancel,
"ok": self.channelSelected,
})
- self.onShown.append(self.onShow)
+ self.onShown.append(self.__onShown)
self.lastChannelRootTimer = eTimer()
- self.lastChannelRootTimer.timeout.get().append(self.onCreate)
+ self.lastChannelRootTimer.timeout.get().append(self.__onCreate)
self.lastChannelRootTimer.start(100,True)
- def onCreate(self):
+ def __onCreate(self):
self.setTvMode()
self.servicePathTV = [ ]
self.restoreRoot()
self.setCurrentSelection(lastservice)
self.session.nav.playService(lastservice)
- def onShow(self):
+ def __onShown(self):
self.recallBouquetMode()
ref = self.session.nav.getCurrentlyPlayingServiceReference()
if ref is not None and ref.valid() and ref.getPath() == "":
self.servicelist.setCurrent(lastservice)
self.session.nav.playService(lastservice)
self.servicelist.setPlayableIgnoreService(lastservice)
- self.info.instance.show()
+ self.info.show()
def channelSelected(self): # just return selected service
ref = self.getCurrentSelection()
self.saveRoot()
def closeRadio(self):
- self.info.instance.hide()
+ self.info.hide()
#set previous tv service
lastservice=eServiceReference(config.tv.lastservice.value)
self.session.nav.playService(lastservice)
def __init__(self, session, title):
ChannelSelectionBase.__init__(self, session)
self.title = title
- self.onShown.append(self.onExecCallback)
+ self.onShown.append(self.__onExecCallback)
self["actions"] = ActionMap(["OkCancelActions", "TvRadioActions"],
{
"keyTV": self.setModeTv,
})
- def onExecCallback(self):
+ def __onExecCallback(self):
self.session.currentDialog.instance.setTitle(self.title)
self.setModeTv()