From 1d7d7802588eb51bbfa553ab5c7d82b30a1c9166 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Sun, 23 Sep 2018 22:46:43 +0200 Subject: [PATCH] - icons: add webtv and xmltv hint icons Conflicts: data/icons/hints/Makefile.am Signed-off-by: Thilo Graf --- data/icons/hints/Makefile.am | 2 ++ data/icons/hints/hint_webtv.png | Bin 0 -> 460 bytes data/icons/hints/hint_xmltv.png | Bin 0 -> 633 bytes src/gui/mediaplayer_setup.cpp | 4 ++-- src/gui/widget/icons.h | 2 ++ 5 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 data/icons/hints/hint_webtv.png create mode 100644 data/icons/hints/hint_xmltv.png diff --git a/data/icons/hints/Makefile.am b/data/icons/hints/Makefile.am index 895a4f4cb..40b4f58ec 100644 --- a/data/icons/hints/Makefile.am +++ b/data/icons/hints/Makefile.am @@ -56,4 +56,6 @@ install_DATA = \ hint_tvradio_switch.png \ hint_vfd.png \ hint_video.png \ + hint_webtv.png \ + hint_xmltv.png \ hint_ytplay.png diff --git a/data/icons/hints/hint_webtv.png b/data/icons/hints/hint_webtv.png new file mode 100644 index 0000000000000000000000000000000000000000..f5f7c14b3245814354271d6ea983695d60e3b5a0 GIT binary patch literal 460 zcmV;-0W zIZH!96osQ;0@{gPM1(+0DQF`ic1Al1f{K+WHYxN!2#Q!M_9`xoQ5%;|J0rL>qN1%E zgpf!!l+PkJlSv3@UglN4)15Pq`IvX_9meHy}O46%t+D2Y*?fJWDcA zOBdbZ72ir$vOY=H#4ps=rZ>1H*^p#O{6zVS+0x?|n3ZHi{F%Bo^17=6uvZBXm84z# zi})7tAAbhKiuZy3aY_=8_-tkW3n0m!w!I@qHR=bdA@Ik|u{Q7k0000xe{4DOdNNuzc2$U#OArz`S zq=XO>LX=n{G?rqDn4nA%7(*yRk}B#c!0%P{$Ote|6e^@Yf3KtH^!fJ*wruFbw21!N z38Kx8!9~r7B8VuYwQXV@#4)I;szoj6m8LYMuYpg4>RQw)cNvabZRU}{b<;-7GvXO+ z=jk8y&lCgzkLY(M-8{}i(8)ITbBgP{tuv@_(xZ5moxmT1+~S*OblL6f;9Up;A$BwA znO(~tyeRkpQ4_5~>3^>(;teSMf z$tLpG!7@jk@;N6xZjzz&1Y6m~2sc@CTQ!d&DX}>xd6_j$d%5SGB5_p7)kQ*jDNh}Y z^4+$dyKvt&$(=BDFzOUeo8*w|wB6YV)|ll2T}~l!)Pk#vq)8mflcq1|HHDq5o9wVj zZrJ)tS_1#d+^cbQN|N5|zR8Z+JZHX%hu~H)*BNn^B}3BV%|mn)$_eg@LT)<$c0?{ TKm9^C00000NkvXXu0mjf$Y36A literal 0 HcmV?d00001 diff --git a/src/gui/mediaplayer_setup.cpp b/src/gui/mediaplayer_setup.cpp index 3fadf7753..3b312ae95 100644 --- a/src/gui/mediaplayer_setup.cpp +++ b/src/gui/mediaplayer_setup.cpp @@ -102,12 +102,12 @@ int CMediaPlayerSetup::showMediaPlayerSetup() CWebTVSetup wsetup; mf = new CMenuForwarder(LOCALE_WEBTV_HEAD, true, NULL, &wsetup, "show_menu", CRCInput::RC_yellow); - mf->setHint(NEUTRINO_ICON_HINT_TVMODE /* FIXME */, LOCALE_MENU_HINT_WEBTV_SETUP); + mf->setHint(NEUTRINO_ICON_HINT_WEBTV, LOCALE_MENU_HINT_WEBTV_SETUP); mediaSetup->addItem(mf); CXMLTVSetup xmltvsetup; mf = new CMenuForwarder(LOCALE_XMLTV_HEAD, true, NULL, &xmltvsetup, "show_menu", CRCInput::RC_blue); - mf->setHint(NEUTRINO_ICON_HINT_TVMODE /* FIXME */, LOCALE_MENU_HINT_XMLTV_SETUP); + mf->setHint(NEUTRINO_ICON_HINT_XMLTV, LOCALE_MENU_HINT_XMLTV_SETUP); mediaSetup->addItem(mf); mediaSetup->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MAINMENU_MOVIEPLAYER)); diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index 4c2a82845..508be82ea 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -152,6 +152,8 @@ #define NEUTRINO_ICON_HINT_INET_RADIO "hint_inetradio" #define NEUTRINO_ICON_HINT_MOVIE "hint_movie" #define NEUTRINO_ICON_HINT_PICVIEW "hint_picview" +#define NEUTRINO_ICON_HINT_WEBTV "hint_webtv" +#define NEUTRINO_ICON_HINT_XMLTV "hint_xmltv" #define NEUTRINO_ICON_HINT_YTPLAY "hint_ytplay" #define NEUTRINO_ICON_HINT_MB "hint_mb"