From 56bd12bac16970001b6b5e690b4d9e2f2aa28bd3 Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Sat, 16 Oct 2021 23:45:21 +0200
Subject: [PATCH] - icons: rename color buttons; avoid german names

 Conflicts:
	data/icons/buttons/Makefile.am

Signed-off-by: Thilo Graf <dbt@novatux.de>

Note for last cherry-picks with icon rename:
It would make more sense to rename consequently all the other icons with prefixes like btn_*.*, header_*.* etc. ... means
prefixes matching to groups: buttons, header etc.
For some groups, this has already been done
but at the moment that is not enough.
---
 data/icons/buttons/Makefile.am                  |   9 +++++----
 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
 data/icons/buttons/epg_small.png                | Bin 0 -> 4331 bytes
 src/gui/widget/icons.h                          |   8 ++++----
 7 files changed, 9 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%)
 create mode 100644 data/icons/buttons/epg_small.png

diff --git a/data/icons/buttons/Makefile.am b/data/icons/buttons/Makefile.am
index 9605c910a..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,14 +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 \
-	gelb.png \
-	gruen.png \
+	epg_small.png \
 	help.png \
 	help_small.png \
 	home.png \
@@ -46,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/data/icons/buttons/epg_small.png b/data/icons/buttons/epg_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..10cb2a0ad0946310d9329bb85d1631048a05fd34
GIT binary patch
literal 4331
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
Ze*yiG#iY0AE{y;H002ovPDHLkV1j8oV$=Wt

literal 0
HcmV?d00001

diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h
index 3129b0306..64d9b35f6 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"