From 828d62e4d4ffd547cecc577590e27738d79752cd Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Sat, 16 Oct 2021 23:45:21 +0200 Subject: [PATCH] - icons: rename icon_movieplayer.png and icon_ytplay.png Conflicts: data/icons/headers/Makefile.am Signed-off-by: Thilo Graf --- data/icons/headers/Makefile.am | 6 +++--- .../{icon_movieplayer.png => movieplayer.png} | Bin data/icons/headers/{icon_ytplay.png => ytplay.png} | Bin src/gui/widget/icons.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename data/icons/headers/{icon_movieplayer.png => movieplayer.png} (100%) rename data/icons/headers/{icon_ytplay.png => ytplay.png} (100%) diff --git a/data/icons/headers/Makefile.am b/data/icons/headers/Makefile.am index 4e144b666..45b9b1095 100644 --- a/data/icons/headers/Makefile.am +++ b/data/icons/headers/Makefile.am @@ -12,16 +12,15 @@ install_DATA = \ games.png \ icon_blue.png \ icon_green.png \ - icon_movieplayer.png \ icon_red.png \ icon_yellow.png \ - icon_ytplay.png \ information.png \ keybinding.png \ language.png \ lcd.png \ lock.png \ mainmenue.png \ + movieplayer.png \ mp3.png \ multimedia.png \ network.png \ @@ -36,4 +35,5 @@ install_DATA = \ streaming.png \ timer.png \ upnp.png \ - video.png + video.png \ + ytplay.png diff --git a/data/icons/headers/icon_movieplayer.png b/data/icons/headers/movieplayer.png similarity index 100% rename from data/icons/headers/icon_movieplayer.png rename to data/icons/headers/movieplayer.png diff --git a/data/icons/headers/icon_ytplay.png b/data/icons/headers/ytplay.png similarity index 100% rename from data/icons/headers/icon_ytplay.png rename to data/icons/headers/ytplay.png diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index 9bf251dc6..3129b0306 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -101,7 +101,7 @@ #define NEUTRINO_ICON_LCD "lcd" #define NEUTRINO_ICON_LOCK "lock" #define NEUTRINO_ICON_MAINMENU "mainmenue" -#define NEUTRINO_ICON_MOVIEPLAYER "icon_movieplayer" +#define NEUTRINO_ICON_MOVIEPLAYER "movieplayer" #define NEUTRINO_ICON_MULTIMEDIA "multimedia" #define NEUTRINO_ICON_NETWORK "network" #define NEUTRINO_ICON_PERSONALIZE "personalize" @@ -116,7 +116,7 @@ #define NEUTRINO_ICON_UPDATE "softupdate" #define NEUTRINO_ICON_UPNP "upnp" #define NEUTRINO_ICON_VIDEO "video" -#define NEUTRINO_ICON_YTPLAY "icon_ytplay" +#define NEUTRINO_ICON_YTPLAY "ytplay" /* volumebar */ #define NEUTRINO_ICON_VOLUME "volume"