From 28d4e97a34cfd9b4b2106e6f4799ba621eef0c96 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Fri, 5 Jan 2018 00:52:58 +0100 Subject: [PATCH] - icons: rename and sort new marker icons Signed-off-by: Thilo Graf --- data/icons/status/markers/Makefile.am | 1 + .../marker_rec_event.png} | Bin data/icons/status/various/Makefile.am | 1 - src/gui/bedit/bouqueteditor_bouquets.cpp | 16 ++++++++-------- src/gui/bedit/bouqueteditor_channels.cpp | 12 ++++++------ src/gui/bedit/bouqueteditor_chanselect.cpp | 8 ++++---- src/gui/eventlist.cpp | 2 +- src/gui/widget/icons.h | 16 +++++++++------- 8 files changed, 29 insertions(+), 27 deletions(-) rename data/icons/status/{various/rec_event_marker.png => markers/marker_rec_event.png} (100%) diff --git a/data/icons/status/markers/Makefile.am b/data/icons/status/markers/Makefile.am index 6585b3d8a..0197ece59 100644 --- a/data/icons/status/markers/Makefile.am +++ b/data/icons/status/markers/Makefile.am @@ -6,6 +6,7 @@ install_DATA = \ marker_hidden.png \ marker_lock.png \ marker_radio.png \ + marker_rec_event.png \ marker_scrambled.png \ marker_streaming.png \ marker_tv.png \ diff --git a/data/icons/status/various/rec_event_marker.png b/data/icons/status/markers/marker_rec_event.png similarity index 100% rename from data/icons/status/various/rec_event_marker.png rename to data/icons/status/markers/marker_rec_event.png diff --git a/data/icons/status/various/Makefile.am b/data/icons/status/various/Makefile.am index 506f15f30..0ff5f747f 100644 --- a/data/icons/status/various/Makefile.am +++ b/data/icons/status/various/Makefile.am @@ -13,6 +13,5 @@ install_DATA = \ pip.png \ rclock.png \ rec.png \ - rec_event_marker.png \ rec_gray.png \ zap.png diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp index 644f02ff6..86c92fd03 100644 --- a/src/gui/bedit/bouqueteditor_bouquets.cpp +++ b/src/gui/bedit/bouqueteditor_bouquets.cpp @@ -57,13 +57,13 @@ CBEBouquetWidget::CBEBouquetWidget() frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_DUMMY_SMALL, &action_icon_width, &ih); status_icon_width = 0; - frameBuffer->getIconSize(NEUTRINO_ICON_HIDDEN_MARKER, &iw, &ih); + frameBuffer->getIconSize(NEUTRINO_ICON_MARKER_HIDDEN, &iw, &ih); status_icon_width = std::max(status_icon_width, iw); - frameBuffer->getIconSize(NEUTRINO_ICON_LOCK_MARKER, &iw, &ih); + frameBuffer->getIconSize(NEUTRINO_ICON_MARKER_LOCK, &iw, &ih); status_icon_width = std::max(status_icon_width, iw); - frameBuffer->getIconSize(NEUTRINO_ICON_RADIO_MARKER, &iw, &ih); + frameBuffer->getIconSize(NEUTRINO_ICON_MARKER_RADIO, &iw, &ih); status_icon_width = std::max(status_icon_width, iw); - frameBuffer->getIconSize(NEUTRINO_ICON_TV_MARKER, &iw, &ih); + frameBuffer->getIconSize(NEUTRINO_ICON_MARKER_TV, &iw, &ih); status_icon_width = std::max(status_icon_width, iw); } @@ -109,16 +109,16 @@ void CBEBouquetWidget::paintItem(int pos) item_font->RenderString(x + text_offset, ypos + item_height, width - text_offset - SCROLLBAR_WIDTH - 5*OFFSET_INNER_MID - 4*status_icon_width, (*Bouquets)[current]->bFav ? g_Locale->getText(LOCALE_FAVORITES_BOUQUETNAME) : (*Bouquets)[current]->Name, color); if ((*Bouquets)[current]->bHidden) - frameBuffer->paintIcon(NEUTRINO_ICON_HIDDEN_MARKER, x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - status_icon_width, ypos, item_height); + frameBuffer->paintIcon(NEUTRINO_ICON_MARKER_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_MARKER, x + width - SCROLLBAR_WIDTH - 2*OFFSET_INNER_MID - 2*status_icon_width, ypos, item_height); + frameBuffer->paintIcon(NEUTRINO_ICON_MARKER_LOCK, x + width - SCROLLBAR_WIDTH - 2*OFFSET_INNER_MID - 2*status_icon_width, ypos, item_height); if (!(*Bouquets)[current]->radioChannels.empty()) - frameBuffer->paintIcon(NEUTRINO_ICON_RADIO_MARKER, x + width - SCROLLBAR_WIDTH - 3*OFFSET_INNER_MID - 3*status_icon_width, ypos, item_height); + frameBuffer->paintIcon(NEUTRINO_ICON_MARKER_RADIO, x + width - SCROLLBAR_WIDTH - 3*OFFSET_INNER_MID - 3*status_icon_width, ypos, item_height); if (!(*Bouquets)[current]->tvChannels.empty()) - frameBuffer->paintIcon(NEUTRINO_ICON_TV_MARKER, x + width - SCROLLBAR_WIDTH - 4*OFFSET_INNER_MID - 4*status_icon_width, ypos, item_height); + frameBuffer->paintIcon(NEUTRINO_ICON_MARKER_TV, x + width - SCROLLBAR_WIDTH - 4*OFFSET_INNER_MID - 4*status_icon_width, ypos, item_height); } } diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp index 2537ffddb..c7147735c 100644 --- a/src/gui/bedit/bouqueteditor_channels.cpp +++ b/src/gui/bedit/bouqueteditor_channels.cpp @@ -63,11 +63,11 @@ 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_MARKER, &iw, &ih); + frameBuffer->getIconSize(NEUTRINO_ICON_MARKER_SCRAMBLED, &iw, &ih); status_icon_width = std::max(status_icon_width, iw); - frameBuffer->getIconSize(NEUTRINO_ICON_STREAMING_MARKER, &iw, &ih); + frameBuffer->getIconSize(NEUTRINO_ICON_MARKER_STREAMING, &iw, &ih); status_icon_width = std::max(status_icon_width, iw); - frameBuffer->getIconSize(NEUTRINO_ICON_LOCK_MARKER, &iw, &ih); + frameBuffer->getIconSize(NEUTRINO_ICON_MARKER_LOCK, &iw, &ih); status_icon_width = std::max(status_icon_width, iw); } @@ -117,12 +117,12 @@ 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_MARKER, x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - status_icon_width, ypos, item_height); + frameBuffer->paintIcon(NEUTRINO_ICON_MARKER_SCRAMBLED, x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - status_icon_width, ypos, item_height); else if (!(*Channels)[current]->getUrl().empty()) - frameBuffer->paintIcon(NEUTRINO_ICON_STREAMING_MARKER, x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - status_icon_width, ypos, item_height); + frameBuffer->paintIcon(NEUTRINO_ICON_MARKER_STREAMING, 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); + frameBuffer->paintIcon(NEUTRINO_ICON_MARKER_LOCK, 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 71167c6a7..dcb87a9ca 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_MARKER, &iw, &ih); + frameBuffer->getIconSize(NEUTRINO_ICON_MARKER_SCRAMBLED, &iw, &ih); status_icon_width = std::max(status_icon_width, iw); - frameBuffer->getIconSize(NEUTRINO_ICON_STREAMING_MARKER, &iw, &ih); + frameBuffer->getIconSize(NEUTRINO_ICON_MARKER_STREAMING, &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_MARKER, x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - status_icon_width, ypos, item_height); + frameBuffer->paintIcon(NEUTRINO_ICON_MARKER_SCRAMBLED, x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - status_icon_width, ypos, item_height); else if (!Channels[current]->getUrl().empty()) - frameBuffer->paintIcon(NEUTRINO_ICON_STREAMING_MARKER, x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - status_icon_width, ypos, item_height); + frameBuffer->paintIcon(NEUTRINO_ICON_MARKER_STREAMING, x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - status_icon_width, ypos, item_height); } } diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index aef224b34..dcd21ade2 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -797,7 +797,7 @@ void CEventList::paintItem(unsigned int pos, t_channel_id channel_idI) CTimerd::CTimerEventTypes etype = isScheduled(channel_tmp, &evtlist[currpos],&timerID); const char * icontype = etype == CTimerd::TIMER_ZAPTO ? NEUTRINO_ICON_ZAP : 0; if(etype == CTimerd::TIMER_RECORD){ - icontype = NEUTRINO_ICON_REC;// NEUTRINO_ICON_RECORDING_EVENT_MARKER + icontype = NEUTRINO_ICON_REC;// NEUTRINO_ICON_MARKER_RECORDING_EVENT }else{ if (timerID > 0 && CRecordManager::getInstance()->CheckRecordingId_if_Timeshift(timerID)) icontype = NEUTRINO_ICON_AUTO_SHIFT; diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index 13887387e..1c12625d5 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -89,9 +89,7 @@ #define NEUTRINO_ICON_IMPORTANT "important" #define NEUTRINO_ICON_KEYBINDING "keybinding" #define NEUTRINO_ICON_LOCK "lock" -#define NEUTRINO_ICON_LOCK_MARKER "marker_lock" #define NEUTRINO_ICON_LOCK_PASSIVE "lock_passive" -#define NEUTRINO_ICON_HIDDEN_MARKER "marker_hidden" #define NEUTRINO_ICON_MOUNTED "mounted" #define NEUTRINO_ICON_MULTIMEDIA "multimedia" #define NEUTRINO_ICON_MOVIEPLAYER "icon_movieplayer" @@ -104,7 +102,6 @@ #define NEUTRINO_ICON_REW "mp_b-skip" #define NEUTRINO_ICON_FF "mp_f-skip" #define NEUTRINO_ICON_QUESTION "question" -#define NEUTRINO_ICON_RADIO_MARKER "marker_radio" #define NEUTRINO_ICON_RADIOTEXTGET "radiotextget" #define NEUTRINO_ICON_RADIOTEXTWAIT "radiotextwait" #define NEUTRINO_ICON_RADIOTEXTOFF "radiotextoff" @@ -114,13 +111,11 @@ #define NEUTRINO_ICON_SETTINGS "settings" #define NEUTRINO_ICON_SHELL "shell" #define NEUTRINO_ICON_STREAMING "streaming" -#define NEUTRINO_ICON_STREAMING_MARKER "marker_streaming" #define NEUTRINO_ICON_TIMER "timer" #define NEUTRINO_ICON_TUNER_1 "tuner_1" #define NEUTRINO_ICON_TUNER_2 "tuner_2" #define NEUTRINO_ICON_TUNER_3 "tuner_3" #define NEUTRINO_ICON_TUNER_4 "tuner_4" -#define NEUTRINO_ICON_TV_MARKER "marker_tv" #define NEUTRINO_ICON_UPDATE "softupdate" #define NEUTRINO_ICON_UPNP "upnp" #define NEUTRINO_ICON_VIDEO "video" @@ -132,7 +127,6 @@ #define NEUTRINO_ICON_AUTO_SHIFT_GRAY "ats_gray" #define NEUTRINO_ICON_NUMERIC_PAD "numericpad" #define NEUTRINO_ICON_SCRAMBLED "ca" -#define NEUTRINO_ICON_SCRAMBLED_MARKER "marker_scrambled" #define NEUTRINO_ICON_SCRAMBLED2 "ca2" #define NEUTRINO_ICON_SCRAMBLED2_GREY "ca2_gray" #define NEUTRINO_ICON_BOOKMARK_MANAGER "bookmarkmanager" @@ -163,7 +157,6 @@ #define NEUTRINO_ICON_RESOLUTION_HD "res_hd" #define NEUTRINO_ICON_RESOLUTION_SD "res_sd" #define NEUTRINO_ICON_PERSONALIZE "personalize" -#define NEUTRINO_ICON_RECORDING_EVENT_MARKER "rec_event_marker" #define NEUTRINO_ICON_ZAP "zap" #define NEUTRINO_ICON_PIP "pip" #define NEUTRINO_ICON_STAR_ON "star-on" @@ -256,6 +249,15 @@ #define NEUTRINO_ICON_MP3 "mp3" #define NEUTRINO_ICON_PICTURE "picture" +/* markers */ +#define NEUTRINO_ICON_MARKER_LOCK "marker_lock" +#define NEUTRINO_ICON_MARKER_HIDDEN "marker_hidden" +#define NEUTRINO_ICON_MARKER_RADIO "marker_radio" +#define NEUTRINO_ICON_MARKER_STREAMING "marker_streaming" +#define NEUTRINO_ICON_MARKER_TV "marker_tv" +#define NEUTRINO_ICON_MARKER_SCRAMBLED "marker_scrambled" +#define NEUTRINO_ICON_MARKER_RECORDING_EVENT "rec_event_marker" + /* plugins */ #define NEUTRINO_ICON_HINT_PLUGIN "hint_plugin"