mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 09:21:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

CBEBouquetWidget: use marker icons instead header icons

Browse Source 
Header icons are too large in context with this handling inside select items.
Large icons causes possible overlapping images with current icon set. This
should avoid this.

TODO:
- refactoring icon and text arrangement with scaled images,
- tabular user guidance without window switching


Origin commit data
------------------
Branch: ni/coolstream
Commit: d76c544b6f
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2018-01-03 22:35:02 +01:00
committed by vanhofen
parent e9b94ee79b
commit 3df91f0e8c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/icons/status/markers/marker_lock.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 610 B

12
src/gui/bedit/bouqueteditor_bouquets.cpp
View File

@@ -59,11 +59,11 @@ CBEBouquetWidget::CBEBouquetWidget()
status_icon_width = 0;
frameBuffer->getIconSize(NEUTRINO_ICON_HIDDEN, &iw, &ih);
status_icon_width = std::max(status_icon_width, iw);
frameBuffer->getIconSize(NEUTRINO_ICON_LOCK, &iw, &ih);
frameBuffer->getIconSize(NEUTRINO_ICON_LOCK_MARKER, &iw, &ih);
status_icon_width = std::max(status_icon_width, iw);
frameBuffer->getIconSize(NEUTRINO_ICON_AUDIO, &iw, &ih);
frameBuffer->getIconSize(NEUTRINO_ICON_RADIO_MARKER, &iw, &ih);
status_icon_width = std::max(status_icon_width, iw);
frameBuffer->getIconSize(NEUTRINO_ICON_VIDEO, &iw, &ih);
frameBuffer->getIconSize(NEUTRINO_ICON_TV_MARKER, &iw, &ih);
status_icon_width = std::max(status_icon_width, iw);
}
@@ -112,13 +112,13 @@ void CBEBouquetWidget::paintItem(int pos)
frameBuffer->paintIcon(NEUTRINO_ICON_HIDDEN, x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - status_icon_width, ypos, item_height);
if ((*Bouquets)[current]->bLocked != g_settings.parentallock_defaultlocked)
frameBuffer->paintIcon(NEUTRINO_ICON_LOCK, x + width - SCROLLBAR_WIDTH - 2*OFFSET_INNER_MID - 2*status_icon_width, ypos, item_height);
frameBuffer->paintIcon(NEUTRINO_ICON_LOCK_MARKER, x + width - SCROLLBAR_WIDTH - 2*OFFSET_INNER_MID - 2*status_icon_width, ypos, item_height);
if (!(*Bouquets)[current]->radioChannels.empty())
frameBuffer->paintIcon(NEUTRINO_ICON_AUDIO, x + width - SCROLLBAR_WIDTH - 3*OFFSET_INNER_MID - 3*status_icon_width, ypos, item_height);
frameBuffer->paintIcon(NEUTRINO_ICON_RADIO_MARKER, x + width - SCROLLBAR_WIDTH - 3*OFFSET_INNER_MID - 3*status_icon_width, ypos, item_height);
if (!(*Bouquets)[current]->tvChannels.empty())
frameBuffer->paintIcon(NEUTRINO_ICON_VIDEO, x + width - SCROLLBAR_WIDTH - 4*OFFSET_INNER_MID - 4*status_icon_width, ypos, item_height);
frameBuffer->paintIcon(NEUTRINO_ICON_TV_MARKER, x + width - SCROLLBAR_WIDTH - 4*OFFSET_INNER_MID - 4*status_icon_width, ypos, item_height);
}
}