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

icons: rename important.png => marker_warning.png because it doesn't signalize important stuff, but warnings

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0e64c1f14a
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-04-11 (Wed, 11 Apr 2018)

Origin message was:
------------------
- icons: rename important.png => marker_warning.png because it doesn't signalize important stuff, but warnings

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-04-11 23:58:16 +02:00
parent 9bef1c2274
commit 9358e1bf72
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/icons/status/markers/Makefile.am
View File

@@ -1,7 +1,6 @@
installdir = $(ICONSDIR) installdir = $(ICONSDIR)
install_DATA = \ install_DATA = \
important.png \
marker_dialog_off.png \ marker_dialog_off.png \
marker_dialog_ok.png \ marker_dialog_ok.png \
marker_epg.png \ marker_epg.png \
@@ -18,6 +17,7 @@ install_DATA = \
marker_timeshift_gray.png \ marker_timeshift_gray.png \
marker_tv.png \ marker_tv.png \
marker_update_available.png \ marker_update_available.png \
marker_warning.png \
marker_zap.png \ marker_zap.png \
mounted.png \ mounted.png \
not_mounted.png not_mounted.png

0
data/icons/status/markers/important.png → data/icons/status/markers/marker_warning.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 206 B

After

Width:  |  Height:  |  Size: 206 B

4
src/gui/eventlist.cpp
View File

@@ -818,8 +818,8 @@ void CEventList::paintItem(unsigned int pos, t_channel_id channel_idI)
if (conflict && item_event_ID != evtlist[currpos].eventID) if (conflict && item_event_ID != evtlist[currpos].eventID)
{ {
//paint_warning = true; //paint_warning = true;
frameBuffer->getIconSize(NEUTRINO_ICON_IMPORTANT, &i2w, &i2h); frameBuffer->getIconSize(NEUTRINO_ICON_MARKER_WARNING, &i2w, &i2h);
frameBuffer->paintIcon(NEUTRINO_ICON_IMPORTANT, x + iw + OFFSET_INNER_MID, ypos + OFFSET_INNER_MIN + smallfont_height, largefont_height); frameBuffer->paintIcon(NEUTRINO_ICON_MARKER_WARNING, x + iw + OFFSET_INNER_MID, ypos + OFFSET_INNER_MIN + smallfont_height, largefont_height);
iw += i2w + OFFSET_INNER_MID; iw += i2w + OFFSET_INNER_MID;
} }

2
src/gui/followscreenings.cpp
View File

@@ -143,7 +143,7 @@ void CFollowScreenings::updateRightIcon(int ix, time_t start, unsigned int durat
return; return;
} }
if (!SAME_TRANSPONDER(channel_id, i->channel_id)) { 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; return;
} }
} }

2
src/gui/widget/icons.h
View File

@@ -209,7 +209,6 @@
#define NEUTRINO_ICON_PICTURE "picture" #define NEUTRINO_ICON_PICTURE "picture"
/* markers */ /* markers */
#define NEUTRINO_ICON_IMPORTANT "important"
#define NEUTRINO_ICON_MARKER_EPG "marker_epg" #define NEUTRINO_ICON_MARKER_EPG "marker_epg"
#define NEUTRINO_ICON_MARKER_HIDDEN "marker_hidden" #define NEUTRINO_ICON_MARKER_HIDDEN "marker_hidden"
#define NEUTRINO_ICON_MARKER_LOCK "marker_lock" #define NEUTRINO_ICON_MARKER_LOCK "marker_lock"
@@ -223,6 +222,7 @@
#define NEUTRINO_ICON_MARKER_TIMESHIFT "marker_timeshift" #define NEUTRINO_ICON_MARKER_TIMESHIFT "marker_timeshift"
#define NEUTRINO_ICON_MARKER_TIMESHIFT_GRAY "marker_timeshift_gray" #define NEUTRINO_ICON_MARKER_TIMESHIFT_GRAY "marker_timeshift_gray"
#define NEUTRINO_ICON_MARKER_TV "marker_tv" #define NEUTRINO_ICON_MARKER_TV "marker_tv"
#define NEUTRINO_ICON_MARKER_WARNING "marker_warning"
#define NEUTRINO_ICON_MARKER_ZAP "marker_zap" #define NEUTRINO_ICON_MARKER_ZAP "marker_zap"
#define NEUTRINO_ICON_MOUNTED "mounted" #define NEUTRINO_ICON_MOUNTED "mounted"