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

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2018-04-11 23:58:16 +02:00
committed by Thilo Graf
parent 31829ece63
commit 61b4bbeb51
5 changed files with 5 additions and 5 deletions

View File

@@ -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

View File

Before

Width:  |  Height:  |  Size: 921 B

After

Width:  |  Height:  |  Size: 921 B

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)
{
//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;
}

View File

@@ -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;
}
}

View File

@@ -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"