Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Conflicts: configure.ac data/Makefile.am data/icons/Makefile.am Origin commit data ------------------ Branch: ni/coolstream Commit: 1b9b466bc1 Author: vanhofen <vanhofen@gmx.de> Date: 2016-12-07 (Wed, 07 Dec 2016) ------------------ This commit was generated by Migit
2025-08-26 15:02:50 +02:00 · 2016-12-07 10:55:25 +01:00
parent b1a12de260 ffcdb41b84
commit e3154ef43b
301 changed files with 370 additions and 273 deletions
--- a/data/pictures/Makefile.am
+++ b/data/pictures/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = \
+	backgrounds \
+	screensaver
--- a/data/pictures/backgrounds/1280x720/mp3.jpg
+++ b/data/pictures/backgrounds/1280x720/mp3.jpg
--- a/data/pictures/backgrounds/1280x720/radiomode.jpg
+++ b/data/pictures/backgrounds/1280x720/radiomode.jpg
--- a/data/pictures/backgrounds/1280x720/scan.jpg
+++ b/data/pictures/backgrounds/1280x720/scan.jpg
--- a/data/pictures/backgrounds/1280x720/shutdown.jpg
+++ b/data/pictures/backgrounds/1280x720/shutdown.jpg
--- a/data/pictures/backgrounds/1280x720/start.jpg
+++ b/data/pictures/backgrounds/1280x720/start.jpg
--- a/data/pictures/backgrounds/Makefile.am
+++ b/data/pictures/backgrounds/Makefile.am
@@ -0,0 +1,10 @@
+installdir = $(ICONSDIR)
+
+resolution = 1280x720
+
+install_DATA = \
+	$(resolution)/mp3.jpg \
+	$(resolution)/radiomode.jpg \
+	$(resolution)/scan.jpg \
+	$(resolution)/shutdown.jpg \
+	$(resolution)/start.jpg
--- a/data/pictures/screensaver/1280x720/mp3-0.jpg
+++ b/data/pictures/screensaver/1280x720/mp3-0.jpg
--- a/data/pictures/screensaver/1280x720/mp3-1.jpg
+++ b/data/pictures/screensaver/1280x720/mp3-1.jpg
--- a/data/pictures/screensaver/1280x720/mp3-2.jpg
+++ b/data/pictures/screensaver/1280x720/mp3-2.jpg
--- a/data/pictures/screensaver/1280x720/mp3-3.jpg
+++ b/data/pictures/screensaver/1280x720/mp3-3.jpg
--- a/data/pictures/screensaver/1280x720/mp3-4.jpg
+++ b/data/pictures/screensaver/1280x720/mp3-4.jpg
--- a/data/pictures/screensaver/1280x720/mp3-5.jpg
+++ b/data/pictures/screensaver/1280x720/mp3-5.jpg
--- a/data/pictures/screensaver/1280x720/mp3-6.jpg
+++ b/data/pictures/screensaver/1280x720/mp3-6.jpg
--- a/data/pictures/screensaver/1280x720/mp3-7.jpg
+++ b/data/pictures/screensaver/1280x720/mp3-7.jpg
--- a/data/pictures/screensaver/Makefile.am
+++ b/data/pictures/screensaver/Makefile.am
@@ -0,0 +1,13 @@
+installdir = $(ICONSDIR)
+
+resolution = 1280x720
+
+install_DATA = \
+	$(resolution)/mp3-0.jpg \
+	$(resolution)/mp3-1.jpg \
+	$(resolution)/mp3-2.jpg \
+	$(resolution)/mp3-3.jpg \
+	$(resolution)/mp3-4.jpg \
+	$(resolution)/mp3-5.jpg \
+	$(resolution)/mp3-6.jpg \
+	$(resolution)/mp3-7.jpg