diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-01-28 15:47:19 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-01-28 15:47:19 +0000 |
| commit | d4fc7c9fea8e8a52d607596ab4d1027a82199de3 (patch) | |
| tree | 515450ff9fb80626427ce55b4d3468866551d150 | |
| parent | 0015dff93141e9e4cb231280ea7b08f9bdfdd4d8 (diff) | |
| download | enigma2-d4fc7c9fea8e8a52d607596ab4d1027a82199de3.tar.gz enigma2-d4fc7c9fea8e8a52d607596ab4d1027a82199de3.zip | |
fix channel selection context menu close handling
| -rw-r--r-- | data/skin.xml | 3 | ||||
| -rw-r--r-- | lib/python/Screens/ChannelSelection.py | 26 |
2 files changed, 23 insertions, 6 deletions
diff --git a/data/skin.xml b/data/skin.xml index a5cb8174..ecdfd9ef 100644 --- a/data/skin.xml +++ b/data/skin.xml @@ -45,6 +45,9 @@ <screen name="BouquetSelector" position="210,150" size="300,195" title="Choose bouquet"> <widget name="menu" position="10,10" size="280,175" scrollbarMode="showOnDemand" /> </screen> + <screen name="ChannelContextMenu" position="210,150" size="300,195" title="Channellist menu"> + <widget name="menu" position="10,10" size="280,175" scrollbarMode="showOnDemand" /> + </screen> <screen name="Scart" position="0,0" size="720,576"> </screen> <screen name="ServiceInfo" position="160,120" size="400,330" title="Serviceinfo"> diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index d66353c9..9535ef3c 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -36,14 +36,21 @@ class BouquetSelector(Screen): 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 @@ -84,10 +91,14 @@ class ChannelContextMenu(FixedMenu): 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() @@ -96,12 +107,16 @@ class ChannelContextMenu(FixedMenu): 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() @@ -112,7 +127,6 @@ class ChannelContextMenu(FixedMenu): def addCurrentServiceToBouquet(self, dest): self.csel.addCurrentServiceToBouquet(dest) - self.close() def removeCurrentService(self): self.csel.removeCurrentService() |