mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 01:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bouqueteditor: use new scrabled- and streaming-marker icons

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2018-01-05 00:52:58 +01:00
committed by Thilo Graf
parent 1d63616fc6
commit edffe18be6
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/bedit/bouqueteditor_channels.cpp
View File

@@ -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);

8
src/gui/bedit/bouqueteditor_chanselect.cpp
View File

@@ -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);
}
}