galleries: implement first self-built sound gallery

Change-Id: Ibbf8f1f8b1590af461dfa5885adb1027580f8f15

8 files changed, 55 insertions, 31 deletions

diff --git a/extras/Gallery_sound.mk b/extras/Gallery_sound.mk
new file mode 100644
index 000000000000..6f0aacb70a05
--- /dev/null
+++ b/extras/Gallery_sound.mk
@@ -0,0 +1,50 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/sounds,Sounds))
+
+$(eval $(call gb_Gallery_add_files,sound,\
+	extras/source/gallery/sounds/apert2.wav \
+	extras/source/gallery/sounds/apert.wav \
+	extras/source/gallery/sounds/applause.wav \
+	extras/source/gallery/sounds/beam2.wav \
+	extras/source/gallery/sounds/beam.wav \
+	extras/source/gallery/sounds/cow.wav \
+	extras/source/gallery/sounds/curve.wav \
+	extras/source/gallery/sounds/drama.wav \
+	extras/source/gallery/sounds/explos.wav \
+	extras/source/gallery/sounds/falling.wav \
+	extras/source/gallery/sounds/glasses.wav \
+	extras/source/gallery/sounds/gong.wav \
+	extras/source/gallery/sounds/horse.wav \
+	extras/source/gallery/sounds/kling.wav \
+	extras/source/gallery/sounds/kongas.wav \
+	extras/source/gallery/sounds/laser.wav \
+	extras/source/gallery/sounds/left.wav \
+	extras/source/gallery/sounds/nature1.wav \
+	extras/source/gallery/sounds/nature2.wav \
+	extras/source/gallery/sounds/ok.wav \
+	extras/source/gallery/sounds/pluck.wav \
+	extras/source/gallery/sounds/roll.wav \
+	extras/source/gallery/sounds/romans.wav \
+	extras/source/gallery/sounds/soft.wav \
+	extras/source/gallery/sounds/space2.wav \
+	extras/source/gallery/sounds/space3.wav \
+	extras/source/gallery/sounds/space.wav \
+	extras/source/gallery/sounds/sparcle.wav \
+	extras/source/gallery/sounds/strom.wav \
+	extras/source/gallery/sounds/theetone.wav \
+	extras/source/gallery/sounds/top.wav \
+	extras/source/gallery/sounds/train.wav \
+	extras/source/gallery/sounds/untie.wav \
+	extras/source/gallery/sounds/ups.wav \
+	extras/source/gallery/sounds/wallewal.wav \
+))
+
+# vim: set noet sw=4 ts=4: \
diff --git a/extras/Gallery_test.mk b/extras/Gallery_test.mk
deleted file mode 100644
index 67c8e91ff238..000000000000
--- a/extras/Gallery_test.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Gallery_Gallery,test,extras/source/gallery,Fun Gallery))
-
-$(eval $(call gb_Gallery_add_files,test,\
-	extras/source/gallery/apples.gif \
-	extras/source/gallery/bigapple.gif \
-	extras/source/gallery/flower.gif \
-	extras/source/gallery/sky.gif \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 0250afee3220..1b5de3152c45 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,extras,\
 	AllLangPackage_autotextshare \
 	CustomTarget_autocorr \
 	CustomTarget_glade \
-	Gallery_test \
+	Gallery_sound \
 	Package_autocorr \
 	Package_autotextuser \
 	Package_cfgsrvbitmapunx \
@@ -30,9 +30,9 @@ $(eval $(call gb_Module_add_targets,extras,\
 	Package_gallenvironment \
 	Package_gallfinance \
 	Package_gallhtmlexpo \
+	Package_gallmytheme \
 	Package_gallpeople \
 	Package_gallroot \
-	Package_gallsound \
 	Package_gallsounds \
 	Package_gallsymbols \
 	Package_gallsystem \
diff --git a/extras/Package_gallsound.mk b/extras/Package_gallmytheme.mk
index b535edacb098..0b56289248b9 100644
--- a/extras/Package_gallsound.mk
+++ b/extras/Package_gallmytheme.mk
@@ -7,15 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,extras_gallsound,$(SRCDIR)/extras/source/gallery/gallery_sound))
+$(eval $(call gb_Package_Package,extras_gallmytheme,$(SRCDIR)/extras/source/gallery/gallery_sound))
 
-$(eval $(call gb_Package_set_outdir,extras_gallsound,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_gallmytheme,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_files,extras_gallsound,presets/gallery,\
-	sg100.sdv \
-	sg100.thm \
+$(eval $(call gb_Package_add_files,extras_gallmytheme,presets/gallery,\
 	sg30.sdv \
 	sg30.thm \
 ))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk
index a51aaba61592..441dbfd585bb 100644
--- a/extras/Package_gallsystem.mk
+++ b/extras/Package_gallsystem.mk
@@ -21,9 +21,6 @@ $(eval $(call gb_Package_add_files,extras_gallsystem,share/gallery,\
 	sg4.sdg \
 	sg4.sdv \
 	sg4.thm \
-	sg9.sdg \
-	sg9.sdv \
-	sg9.thm \
 	sg10.sdg \
 	sg10.sdv \
 	sg10.thm \
diff --git a/extras/source/gallery/gallery_system/sg9.sdg b/extras/source/gallery/gallery_system/sg9.sdg
deleted file mode 100644
index d17717056263..000000000000
--- a/extras/source/gallery/gallery_system/sg9.sdg
+++ /dev/null
diff --git a/extras/source/gallery/gallery_system/sg9.sdv b/extras/source/gallery/gallery_system/sg9.sdv
deleted file mode 100644
index 444959152744..000000000000
--- a/extras/source/gallery/gallery_system/sg9.sdv
+++ /dev/null
diff --git a/extras/source/gallery/gallery_system/sg9.thm b/extras/source/gallery/gallery_system/sg9.thm
deleted file mode 100644
index 4b6ef2091b96..000000000000
--- a/extras/source/gallery/gallery_system/sg9.thm
+++ /dev/null