From f0d6245a69f4362fbfab98ed1243dbc9be68cfea Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 16 Oct 2021 23:45:21 +0200 Subject: [PATCH] icons: rename color buttons; avoid german names Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/77968aaf4a18e9b0daab5d621f8cb9e49b90d311 Author: vanhofen Date: 2021-10-16 (Sat, 16 Oct 2021) Origin message was: ------------------ - icons: rename color buttons; avoid german names ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/icons/buttons/Makefile.am | 8 ++++---- data/icons/buttons/{blau.png => btn_blue.png} | Bin data/icons/buttons/{gruen.png => btn_green.png} | Bin data/icons/buttons/{rot.png => btn_red.png} | Bin data/icons/buttons/{gelb.png => btn_yellow.png} | Bin src/gui/widget/icons.h | 8 ++++---- 6 files changed, 8 insertions(+), 8 deletions(-) rename data/icons/buttons/{blau.png => btn_blue.png} (100%) rename data/icons/buttons/{gruen.png => btn_green.png} (100%) rename data/icons/buttons/{rot.png => btn_red.png} (100%) rename data/icons/buttons/{gelb.png => btn_yellow.png} (100%) diff --git a/data/icons/buttons/Makefile.am b/data/icons/buttons/Makefile.am index f8d7b1126..5288bbb20 100644 --- a/data/icons/buttons/Makefile.am +++ b/data/icons/buttons/Makefile.am @@ -11,9 +11,10 @@ install_DATA = \ 7.png \ 8.png \ 9.png \ - blau.png \ btn_backward.png \ + btn_blue.png \ btn_forward.png \ + btn_green.png \ btn_option_off_active.png \ btn_option_off_inactive.png \ btn_option_on_active.png \ @@ -22,15 +23,15 @@ install_DATA = \ btn_play.png \ btn_record_active.png \ btn_record_inactive.png \ + btn_red.png \ btn_stop.png \ btn_timer.png \ + btn_yellow.png \ down.png \ dummy.png \ dummy_small.png \ epg.png \ epg_small.png \ - gelb.png \ - gruen.png \ help.png \ help_small.png \ home.png \ @@ -47,5 +48,4 @@ install_DATA = \ ok.png \ power.png \ right.png \ - rot.png \ up.png diff --git a/data/icons/buttons/blau.png b/data/icons/buttons/btn_blue.png similarity index 100% rename from data/icons/buttons/blau.png rename to data/icons/buttons/btn_blue.png diff --git a/data/icons/buttons/gruen.png b/data/icons/buttons/btn_green.png similarity index 100% rename from data/icons/buttons/gruen.png rename to data/icons/buttons/btn_green.png diff --git a/data/icons/buttons/rot.png b/data/icons/buttons/btn_red.png similarity index 100% rename from data/icons/buttons/rot.png rename to data/icons/buttons/btn_red.png diff --git a/data/icons/buttons/gelb.png b/data/icons/buttons/btn_yellow.png similarity index 100% rename from data/icons/buttons/gelb.png rename to data/icons/buttons/btn_yellow.png diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index 4b72c770a..bcc357127 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -26,10 +26,10 @@ #define NEUTRINO_ICON_BUTTON_DUMMY "dummy" #define NEUTRINO_ICON_BUTTON_DUMMY_SMALL "dummy_small" -#define NEUTRINO_ICON_BUTTON_BLUE "blau" -#define NEUTRINO_ICON_BUTTON_GREEN "gruen" -#define NEUTRINO_ICON_BUTTON_RED "rot" -#define NEUTRINO_ICON_BUTTON_YELLOW "gelb" +#define NEUTRINO_ICON_BUTTON_BLUE "btn_blue" +#define NEUTRINO_ICON_BUTTON_GREEN "btn_green" +#define NEUTRINO_ICON_BUTTON_RED "btn_red" +#define NEUTRINO_ICON_BUTTON_YELLOW "btn_yellow" #define NEUTRINO_ICON_BUTTON_MENU "menu" #define NEUTRINO_ICON_BUTTON_MENU_SMALL "menu_small"