mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- icons: rename and sort new marker icons

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2018-01-05 00:52:58 +01:00
committed by Thilo Graf
parent edffe18be6
commit 28d4e97a34
8 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ install_DATA = \
marker_hidden.png \ marker_hidden.png \
marker_lock.png \ marker_lock.png \
marker_radio.png \ marker_radio.png \
marker_rec_event.png \
marker_scrambled.png \ marker_scrambled.png \
marker_streaming.png \ marker_streaming.png \
marker_tv.png \ marker_tv.png \

0
data/icons/status/various/rec_event_marker.png → data/icons/status/markers/marker_rec_event.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 833 B

After

Width:  |  Height:  |  Size: 833 B

1
data/icons/status/various/Makefile.am
View File

@@ -13,6 +13,5 @@ install_DATA = \
pip.png \ pip.png \
rclock.png \ rclock.png \
rec.png \ rec.png \
rec_event_marker.png \
rec_gray.png \ rec_gray.png \
zap.png zap.png

16
src/gui/bedit/bouqueteditor_bouquets.cpp
View File

@@ -57,13 +57,13 @@ CBEBouquetWidget::CBEBouquetWidget()
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_DUMMY_SMALL, &action_icon_width, &ih); frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_DUMMY_SMALL, &action_icon_width, &ih);
status_icon_width = 0; 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); 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); 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); 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); 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); 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) 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) 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()) 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()) 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);
} }
} }

12
src/gui/bedit/bouqueteditor_channels.cpp
View File

@@ -63,11 +63,11 @@ CBEChannelWidget::CBEChannelWidget(const std::string & Caption, unsigned int Bou
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_DUMMY_SMALL, &action_icon_width, &ih); frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_DUMMY_SMALL, &action_icon_width, &ih);
status_icon_width = 0; 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); 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); 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); 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); 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) 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()) 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) 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);
} }
} }

8
src/gui/bedit/bouqueteditor_chanselect.cpp
View File

@@ -54,9 +54,9 @@ CBEChannelSelectWidget::CBEChannelSelectWidget(const std::string & Caption, CZap
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_DUMMY_SMALL, &action_icon_width, &ih); frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_DUMMY_SMALL, &action_icon_width, &ih);
status_icon_width = 0; 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); 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); 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); 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) 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()) 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);
} }
} }

2
src/gui/eventlist.cpp
View File

@@ -797,7 +797,7 @@ void CEventList::paintItem(unsigned int pos, t_channel_id channel_idI)
CTimerd::CTimerEventTypes etype = isScheduled(channel_tmp, &evtlist[currpos],&timerID); CTimerd::CTimerEventTypes etype = isScheduled(channel_tmp, &evtlist[currpos],&timerID);
const char * icontype = etype == CTimerd::TIMER_ZAPTO ? NEUTRINO_ICON_ZAP : 0; const char * icontype = etype == CTimerd::TIMER_ZAPTO ? NEUTRINO_ICON_ZAP : 0;
if(etype == CTimerd::TIMER_RECORD){ if(etype == CTimerd::TIMER_RECORD){
icontype = NEUTRINO_ICON_REC;// NEUTRINO_ICON_RECORDING_EVENT_MARKER icontype = NEUTRINO_ICON_REC;// NEUTRINO_ICON_MARKER_RECORDING_EVENT
}else{ }else{
if (timerID > 0 && CRecordManager::getInstance()->CheckRecordingId_if_Timeshift(timerID)) if (timerID > 0 && CRecordManager::getInstance()->CheckRecordingId_if_Timeshift(timerID))
icontype = NEUTRINO_ICON_AUTO_SHIFT; icontype = NEUTRINO_ICON_AUTO_SHIFT;

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

@@ -89,9 +89,7 @@
#define NEUTRINO_ICON_IMPORTANT "important" #define NEUTRINO_ICON_IMPORTANT "important"
#define NEUTRINO_ICON_KEYBINDING "keybinding" #define NEUTRINO_ICON_KEYBINDING "keybinding"
#define NEUTRINO_ICON_LOCK "lock" #define NEUTRINO_ICON_LOCK "lock"
#define NEUTRINO_ICON_LOCK_MARKER "marker_lock"
#define NEUTRINO_ICON_LOCK_PASSIVE "lock_passive" #define NEUTRINO_ICON_LOCK_PASSIVE "lock_passive"
#define NEUTRINO_ICON_HIDDEN_MARKER "marker_hidden"
#define NEUTRINO_ICON_MOUNTED "mounted" #define NEUTRINO_ICON_MOUNTED "mounted"
#define NEUTRINO_ICON_MULTIMEDIA "multimedia" #define NEUTRINO_ICON_MULTIMEDIA "multimedia"
#define NEUTRINO_ICON_MOVIEPLAYER "icon_movieplayer" #define NEUTRINO_ICON_MOVIEPLAYER "icon_movieplayer"
@@ -104,7 +102,6 @@
#define NEUTRINO_ICON_REW "mp_b-skip" #define NEUTRINO_ICON_REW "mp_b-skip"
#define NEUTRINO_ICON_FF "mp_f-skip" #define NEUTRINO_ICON_FF "mp_f-skip"
#define NEUTRINO_ICON_QUESTION "question" #define NEUTRINO_ICON_QUESTION "question"
#define NEUTRINO_ICON_RADIO_MARKER "marker_radio"
#define NEUTRINO_ICON_RADIOTEXTGET "radiotextget" #define NEUTRINO_ICON_RADIOTEXTGET "radiotextget"
#define NEUTRINO_ICON_RADIOTEXTWAIT "radiotextwait" #define NEUTRINO_ICON_RADIOTEXTWAIT "radiotextwait"
#define NEUTRINO_ICON_RADIOTEXTOFF "radiotextoff" #define NEUTRINO_ICON_RADIOTEXTOFF "radiotextoff"
@@ -114,13 +111,11 @@
#define NEUTRINO_ICON_SETTINGS "settings" #define NEUTRINO_ICON_SETTINGS "settings"
#define NEUTRINO_ICON_SHELL "shell" #define NEUTRINO_ICON_SHELL "shell"
#define NEUTRINO_ICON_STREAMING "streaming" #define NEUTRINO_ICON_STREAMING "streaming"
#define NEUTRINO_ICON_STREAMING_MARKER "marker_streaming"
#define NEUTRINO_ICON_TIMER "timer" #define NEUTRINO_ICON_TIMER "timer"
#define NEUTRINO_ICON_TUNER_1 "tuner_1" #define NEUTRINO_ICON_TUNER_1 "tuner_1"
#define NEUTRINO_ICON_TUNER_2 "tuner_2" #define NEUTRINO_ICON_TUNER_2 "tuner_2"
#define NEUTRINO_ICON_TUNER_3 "tuner_3" #define NEUTRINO_ICON_TUNER_3 "tuner_3"
#define NEUTRINO_ICON_TUNER_4 "tuner_4" #define NEUTRINO_ICON_TUNER_4 "tuner_4"
#define NEUTRINO_ICON_TV_MARKER "marker_tv"
#define NEUTRINO_ICON_UPDATE "softupdate" #define NEUTRINO_ICON_UPDATE "softupdate"
#define NEUTRINO_ICON_UPNP "upnp" #define NEUTRINO_ICON_UPNP "upnp"
#define NEUTRINO_ICON_VIDEO "video" #define NEUTRINO_ICON_VIDEO "video"
@@ -132,7 +127,6 @@
#define NEUTRINO_ICON_AUTO_SHIFT_GRAY "ats_gray" #define NEUTRINO_ICON_AUTO_SHIFT_GRAY "ats_gray"
#define NEUTRINO_ICON_NUMERIC_PAD "numericpad" #define NEUTRINO_ICON_NUMERIC_PAD "numericpad"
#define NEUTRINO_ICON_SCRAMBLED "ca" #define NEUTRINO_ICON_SCRAMBLED "ca"
#define NEUTRINO_ICON_SCRAMBLED_MARKER "marker_scrambled"
#define NEUTRINO_ICON_SCRAMBLED2 "ca2" #define NEUTRINO_ICON_SCRAMBLED2 "ca2"
#define NEUTRINO_ICON_SCRAMBLED2_GREY "ca2_gray" #define NEUTRINO_ICON_SCRAMBLED2_GREY "ca2_gray"
#define NEUTRINO_ICON_BOOKMARK_MANAGER "bookmarkmanager" #define NEUTRINO_ICON_BOOKMARK_MANAGER "bookmarkmanager"
@@ -163,7 +157,6 @@
#define NEUTRINO_ICON_RESOLUTION_HD "res_hd" #define NEUTRINO_ICON_RESOLUTION_HD "res_hd"
#define NEUTRINO_ICON_RESOLUTION_SD "res_sd" #define NEUTRINO_ICON_RESOLUTION_SD "res_sd"
#define NEUTRINO_ICON_PERSONALIZE "personalize" #define NEUTRINO_ICON_PERSONALIZE "personalize"
#define NEUTRINO_ICON_RECORDING_EVENT_MARKER "rec_event_marker"
#define NEUTRINO_ICON_ZAP "zap" #define NEUTRINO_ICON_ZAP "zap"
#define NEUTRINO_ICON_PIP "pip" #define NEUTRINO_ICON_PIP "pip"
#define NEUTRINO_ICON_STAR_ON "star-on" #define NEUTRINO_ICON_STAR_ON "star-on"
@@ -256,6 +249,15 @@
#define NEUTRINO_ICON_MP3 "mp3" #define NEUTRINO_ICON_MP3 "mp3"
#define NEUTRINO_ICON_PICTURE "picture" #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 */ /* plugins */
#define NEUTRINO_ICON_HINT_PLUGIN "hint_plugin" #define NEUTRINO_ICON_HINT_PLUGIN "hint_plugin"