From edffe18be66c2f08cfe87b8ebe7f22481efb5782 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Fri, 5 Jan 2018 00:52:58 +0100 Subject: [PATCH] - bouqueteditor: use new scrabled- and streaming-marker icons Signed-off-by: Thilo Graf --- src/gui/bedit/bouqueteditor_channels.cpp | 8 ++++---- src/gui/bedit/bouqueteditor_chanselect.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp index a29335af5..2537ffddb 100644 --- a/src/gui/bedit/bouqueteditor_channels.cpp +++ b/src/gui/bedit/bouqueteditor_channels.cpp @@ -63,9 +63,9 @@ CBEChannelWidget::CBEChannelWidget(const std::string & Caption, unsigned int Bou frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_DUMMY_SMALL, &action_icon_width, &ih); status_icon_width = 0; - frameBuffer->getIconSize(NEUTRINO_ICON_SCRAMBLED, &iw, &ih); + frameBuffer->getIconSize(NEUTRINO_ICON_SCRAMBLED_MARKER, &iw, &ih); status_icon_width = std::max(status_icon_width, iw); - frameBuffer->getIconSize(NEUTRINO_ICON_STREAMING, &iw, &ih); + frameBuffer->getIconSize(NEUTRINO_ICON_STREAMING_MARKER, &iw, &ih); status_icon_width = std::max(status_icon_width, iw); frameBuffer->getIconSize(NEUTRINO_ICON_LOCK_MARKER, &iw, &ih); status_icon_width = std::max(status_icon_width, iw); @@ -117,9 +117,9 @@ void CBEChannelWidget::paintItem(int pos) item_font->RenderString(x + text_offset, ypos + item_height, width - text_offset - SCROLLBAR_WIDTH - 3*OFFSET_INNER_MID - 2*status_icon_width, (*Channels)[current]->getName(), color); if ((*Channels)[current]->scrambled) - frameBuffer->paintIcon(NEUTRINO_ICON_SCRAMBLED, x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - status_icon_width, ypos, item_height); + frameBuffer->paintIcon(NEUTRINO_ICON_SCRAMBLED_MARKER, x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - status_icon_width, ypos, item_height); else if (!(*Channels)[current]->getUrl().empty()) - frameBuffer->paintIcon(NEUTRINO_ICON_STREAMING, x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - status_icon_width, ypos, item_height); + frameBuffer->paintIcon(NEUTRINO_ICON_STREAMING_MARKER, x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - status_icon_width, ypos, item_height); if ((*Channels)[current]->bLocked) frameBuffer->paintIcon(NEUTRINO_ICON_LOCK_MARKER, x + width - SCROLLBAR_WIDTH - 2*OFFSET_INNER_MID - 2*status_icon_width, ypos, item_height); diff --git a/src/gui/bedit/bouqueteditor_chanselect.cpp b/src/gui/bedit/bouqueteditor_chanselect.cpp index 54af0f326..71167c6a7 100644 --- a/src/gui/bedit/bouqueteditor_chanselect.cpp +++ b/src/gui/bedit/bouqueteditor_chanselect.cpp @@ -54,9 +54,9 @@ CBEChannelSelectWidget::CBEChannelSelectWidget(const std::string & Caption, CZap frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_DUMMY_SMALL, &action_icon_width, &ih); status_icon_width = 0; - frameBuffer->getIconSize(NEUTRINO_ICON_SCRAMBLED, &iw, &ih); + frameBuffer->getIconSize(NEUTRINO_ICON_SCRAMBLED_MARKER, &iw, &ih); status_icon_width = std::max(status_icon_width, iw); - frameBuffer->getIconSize(NEUTRINO_ICON_STREAMING, &iw, &ih); + frameBuffer->getIconSize(NEUTRINO_ICON_STREAMING_MARKER, &iw, &ih); status_icon_width = std::max(status_icon_width, iw); } @@ -105,9 +105,9 @@ void CBEChannelSelectWidget::paintItem(int pos) item_font->RenderString(x + text_offset, ypos + item_height, width - text_offset - SCROLLBAR_WIDTH - 2*OFFSET_INNER_MID - status_icon_width, Channels[current]->getName(), color); if (Channels[current]->scrambled) - frameBuffer->paintIcon(NEUTRINO_ICON_SCRAMBLED, x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - status_icon_width, ypos, item_height); + frameBuffer->paintIcon(NEUTRINO_ICON_SCRAMBLED_MARKER, x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - status_icon_width, ypos, item_height); else if (!Channels[current]->getUrl().empty()) - frameBuffer->paintIcon(NEUTRINO_ICON_STREAMING, x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - status_icon_width, ypos, item_height); + frameBuffer->paintIcon(NEUTRINO_ICON_STREAMING_MARKER, x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - status_icon_width, ypos, item_height); } }