From 3df91f0e8c72a25540bfff7b228291a57a03a249 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 3 Jan 2018 22:35:02 +0100 Subject: [PATCH] CBEBouquetWidget: use marker icons instead header icons 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: https://github.com/neutrino-images/ni-neutrino/commit/d76c544b6fa6a17efcfdf13858515b021d52e8e2 Author: Thilo Graf Date: 2018-01-03 (Wed, 03 Jan 2018) ------------------ This commit was generated by Migit --- data/icons/status/markers/marker_lock.png | Bin 0 -> 610 bytes src/gui/bedit/bouqueteditor_bouquets.cpp | 12 ++++++------ 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 data/icons/status/markers/marker_lock.png diff --git a/data/icons/status/markers/marker_lock.png b/data/icons/status/markers/marker_lock.png new file mode 100644 index 0000000000000000000000000000000000000000..47b21399501fd2ce63df97a3c9d6a875bdd49760 GIT binary patch literal 610 zcmV-o0-gPdP)VGd000McNliru z;sFBTZpi=u0pCePK~y-)t(37#96=bxe>1zAWH*O!gpimcEWsiN+QuTay;VpG zOR=}Jv$0XE?EDK1A#flBY{beUav<0QH6-pGg67WXdANJ-%+92^^OA50(RdFAX1?N^ z_q};<#2LI0@D>;ZEH{S$jx4+pb@&228`Z#9wF$)ZrnY z#>YV^WD49F9_IVn8kJIs>ij&oF1DkC$uf-Am@I48jA<{xXpLJa;E#@yUTJo=v%~Yr zNuKWQ@nmWWqxH|r9S5W&-ruLOwS^ysWJ!Xq*SSA3LTz=G+U6z#5Fa|4yf5d6{ad#QDJi ztt3GMD$7vDpn+5=G_>o0cn23iaOJaH7~=RoaTKAF&+wT1T<9^B%mJ(2M02PDML-9*c%VgLXD07*qoM6N<$f_=dbdH?_b literal 0 HcmV?d00001 diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp index 0eac1f10f..2b575977a 100644 --- a/src/gui/bedit/bouqueteditor_bouquets.cpp +++ b/src/gui/bedit/bouqueteditor_bouquets.cpp @@ -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); } }