From 61b4bbeb5170f385b27c320f1942ac939eef2e17 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Wed, 11 Apr 2018 23:58:16 +0200 Subject: [PATCH] - icons: rename important.png => marker_warning.png because it doesn't signalize important stuff, but warnings Signed-off-by: Thilo Graf --- data/icons/status/markers/Makefile.am | 2 +- .../markers/{important.png => marker_warning.png} | Bin src/gui/eventlist.cpp | 4 ++-- src/gui/followscreenings.cpp | 2 +- src/gui/widget/icons.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename data/icons/status/markers/{important.png => marker_warning.png} (100%) diff --git a/data/icons/status/markers/Makefile.am b/data/icons/status/markers/Makefile.am index b4c5ac801..3e6403349 100644 --- a/data/icons/status/markers/Makefile.am +++ b/data/icons/status/markers/Makefile.am @@ -1,7 +1,6 @@ installdir = $(ICONSDIR) install_DATA = \ - important.png \ marker_dialog_off.png \ marker_dialog_ok.png \ marker_epg.png \ @@ -18,6 +17,7 @@ install_DATA = \ marker_timeshift_gray.png \ marker_tv.png \ marker_update_available.png \ + marker_warning.png \ marker_zap.png \ mounted.png \ not_mounted.png diff --git a/data/icons/status/markers/important.png b/data/icons/status/markers/marker_warning.png similarity index 100% rename from data/icons/status/markers/important.png rename to data/icons/status/markers/marker_warning.png diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index f4614f0e6..2fbc87225 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -818,8 +818,8 @@ void CEventList::paintItem(unsigned int pos, t_channel_id channel_idI) if (conflict && item_event_ID != evtlist[currpos].eventID) { //paint_warning = true; - frameBuffer->getIconSize(NEUTRINO_ICON_IMPORTANT, &i2w, &i2h); - frameBuffer->paintIcon(NEUTRINO_ICON_IMPORTANT, x + iw + OFFSET_INNER_MID, ypos + OFFSET_INNER_MIN + smallfont_height, largefont_height); + frameBuffer->getIconSize(NEUTRINO_ICON_MARKER_WARNING, &i2w, &i2h); + frameBuffer->paintIcon(NEUTRINO_ICON_MARKER_WARNING, x + iw + OFFSET_INNER_MID, ypos + OFFSET_INNER_MIN + smallfont_height, largefont_height); iw += i2w + OFFSET_INNER_MID; } diff --git a/src/gui/followscreenings.cpp b/src/gui/followscreenings.cpp index f89240593..6c821071c 100644 --- a/src/gui/followscreenings.cpp +++ b/src/gui/followscreenings.cpp @@ -137,7 +137,7 @@ void CFollowScreenings::updateRightIcon(int ix, time_t start, unsigned int durat return; } if (!SAME_TRANSPONDER(channel_id, i->channel_id)) { - forwarders[ix]->iconName_Info_right = NEUTRINO_ICON_IMPORTANT; + forwarders[ix]->iconName_Info_right = NEUTRINO_ICON_MARKER_WARNING; return; } } diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index dfbe37e11..c0bb02f70 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -205,7 +205,6 @@ #define NEUTRINO_ICON_PICTURE "picture" /* markers */ -#define NEUTRINO_ICON_IMPORTANT "important" #define NEUTRINO_ICON_MARKER_EPG "marker_epg" #define NEUTRINO_ICON_MARKER_HIDDEN "marker_hidden" #define NEUTRINO_ICON_MARKER_LOCK "marker_lock" @@ -219,6 +218,7 @@ #define NEUTRINO_ICON_MARKER_TIMESHIFT "marker_timeshift" #define NEUTRINO_ICON_MARKER_TIMESHIFT_GRAY "marker_timeshift_gray" #define NEUTRINO_ICON_MARKER_TV "marker_tv" +#define NEUTRINO_ICON_MARKER_WARNING "marker_warning" #define NEUTRINO_ICON_MARKER_ZAP "marker_zap" #define NEUTRINO_ICON_MOUNTED "mounted"