From ae6ad8b7580e8eb8258998faee0abf8a39228f11 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 4 Jan 2018 01:14:43 +0100 Subject: [PATCH] icons: better names for currently unused NEUTRINO_ICON_MARKER_RECORD Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/b7c43d9a62bb72466d3cf114fdbf3fa40e13c156 Author: vanhofen Date: 2018-01-04 (Thu, 04 Jan 2018) Origin message was: ------------------ - icons: better names for currently unused NEUTRINO_ICON_MARKER_RECORD --- data/icons/status/markers/Makefile.am | 2 +- .../{marker_rec_event.png => marker_record.png} | Bin src/gui/eventlist.cpp | 2 +- src/gui/widget/icons.h | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename data/icons/status/markers/{marker_rec_event.png => marker_record.png} (100%) diff --git a/data/icons/status/markers/Makefile.am b/data/icons/status/markers/Makefile.am index 0197ece59..c848bf270 100644 --- a/data/icons/status/markers/Makefile.am +++ b/data/icons/status/markers/Makefile.am @@ -6,7 +6,7 @@ install_DATA = \ marker_hidden.png \ marker_lock.png \ marker_radio.png \ - marker_rec_event.png \ + marker_record.png \ marker_scrambled.png \ marker_streaming.png \ marker_tv.png \ diff --git a/data/icons/status/markers/marker_rec_event.png b/data/icons/status/markers/marker_record.png similarity index 100% rename from data/icons/status/markers/marker_rec_event.png rename to data/icons/status/markers/marker_record.png diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index e8e522e3f..4fdb33aa1 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_MARKER_RECORDING_EVENT + icontype = NEUTRINO_ICON_REC;// NEUTRINO_ICON_MARKER_RECORD }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 e355a3924..d19610655 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -263,7 +263,7 @@ #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" +#define NEUTRINO_ICON_MARKER_RECORD "marker_record" /* plugins */ #define NEUTRINO_ICON_HINT_PLUGIN "hint_plugin"