From b738bc7fbed73bf5407fcc487622b0c1cdfa0703 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Fri, 10 Oct 2014 15:00:31 +0400 Subject: [PATCH] gui/bedit/bouqueteditor_channels.cpp: pass CZapitBouquet to CBEChannelSelectWidget, mark inacttive both non-found and removed channels Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/722d226dbeca1d438b103ebbbb8d98557c38410e Author: [CST] Focus Date: 2014-10-10 (Fri, 10 Oct 2014) ------------------ This commit was generated by Migit --- src/gui/bedit/bouqueteditor_channels.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp index 55e7255f1..2e991c6aa 100644 --- a/src/gui/bedit/bouqueteditor_channels.cpp +++ b/src/gui/bedit/bouqueteditor_channels.cpp @@ -114,7 +114,7 @@ void CBEChannelWidget::paintItem(int pos) frameBuffer->paintBoxRel(x,ypos, width- 15, iheight, COL_MENUCONTENT_PLUS_0); frameBuffer->paintBoxRel(x,ypos, width- 15, iheight, bgcolor, RADIUS_LARGE); } else { - if(current < Channels->size() && ((*Channels)[current]->flags & CZapitChannel::NOT_FOUND )) + if(current < Channels->size() && ((*Channels)[current]->flags & CZapitChannel::NOT_PRESENT )) color = COL_MENUCONTENTINACTIVE_TEXT;// extra color for channels not found in service else color = COL_MENUCONTENT_TEXT; @@ -467,7 +467,7 @@ void CBEChannelWidget::deleteChannel() void CBEChannelWidget::addChannel() { - CBEChannelSelectWidget* channelSelectWidget = new CBEChannelSelectWidget(caption, bouquet, mode); + CBEChannelSelectWidget* channelSelectWidget = new CBEChannelSelectWidget(caption, g_bouquetManager->Bouquets[bouquet], mode); channelSelectWidget->exec(this, ""); if (channelSelectWidget->hasChanged())