galleries: implement first self-built sound gallery

Change-Id: Ibbf8f1f8b1590af461dfa5885adb1027580f8f15

extras/Gallery_sound.mk

+# -*- 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: \

extras/Gallery_test.mk

-# -*- 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:

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 \

extras/Package_gallsound.mk → 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:

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 \

include/svx/galtheme.hxx

@@ -91,6 +91,7 @@ private:
 
     GalleryObjectList           aObjectList;
     String                      m_aDestDir;
+    bool                        m_bDestDirRelative;
     SotStorageRef               aSvDrawStorageRef;
     Gallery*                    pParent;
     GalleryThemeEntry*          pThm;
@@ -140,8 +141,10 @@ public:
     SVX_DLLPUBLIC const OUString& GetName() const;
     const OUString&        GetRealName() const;
 
+    // used for building gallery themes during compilation:
     const String&               GetDestDir() const { return m_aDestDir; }
-    void                        SetDestDir(const String& rDestDir) { m_aDestDir = rDestDir; }
+    void                        SetDestDir(const String& rDestDir, bool bRelative = true)
+                                { m_aDestDir = rDestDir; m_bDestDirRelative = bRelative; }
 
     const INetURLObject&        GetThmURL() const;
     SVX_DLLPUBLIC const INetURLObject&      GetSdgURL() const;

scp2/source/ooo/file_extra_ooo.scp

@@ -235,7 +235,14 @@ File gid_File_Extra_Gallsound
     Dir = FILELIST_DIR;
     USER_FILE_BODY;
     Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
-    Name = "extras_gallsound.filelist";
+    Name = "Gallery/sound.filelist";
+End
+
+File gid_File_Extra_Gallmytheme
+    Dir = FILELIST_DIR;
+    USER_FILE_BODY;
+    Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+    Name = "extras_gallmytheme.filelist";
 End
 
 File gid_File_Extra_Gallsounds

solenv/gbuild/Gallery.mk

@@ -59,6 +59,7 @@ $(call gb_Helper_abbreviate_dirs,\
 	SAL_USE_VCLPLUGIN=svp \
 	$(call gb_Executable_get_command,gengal.bin) \
 		$(call gb_Gallery__make_env_args) \
+		--build-tree \
 		--destdir $(GALLERY_BASEDIR) \
 		--name "$(GALLERY_NAME)" \
 		--path $(call gb_Gallery_get_workdir,$(2))) \
@@ -98,11 +99,14 @@ $(WORKDIR)/Gallery/%.sdv :
 $(WORKDIR)/Gallery/%.thm :
 	touch $@
 
+$(WORKDIR)/Gallery/%.sdg :
+	touch $@
+
 gb_Gallery_get_packagename = Gallery/$(1)
 
 # Create a gallery.
 #
-# basedir will be stripped from paths of the files when they are
+# basedir less one directory will be stripped from paths of the files when they are
 # inserted into the gallery.
 #
 # gb_Gallery_Gallery gallery basedir name
@@ -115,10 +119,12 @@ endef
 define gb_Gallery__Gallery_impl
 $(call gb_Package_Package_internal,$(2),$(call gb_Gallery_get_workdir,$(1)))
 $(call gb_Package_set_outdir,$(2),$(INSTDIR))
+$(call gb_Package_add_file,$(2),$(gb_Gallery_INSTDIR)/$(1).sdg,sg1.sdg)
 $(call gb_Package_add_file,$(2),$(gb_Gallery_INSTDIR)/$(1).sdv,sg1.sdv)
 $(call gb_Package_add_file,$(2),$(gb_Gallery_INSTDIR)/$(1).thm,sg1.thm)
 
-$(call gb_Gallery_get_target,$(1)) : GALLERY_BASEDIR := $(SRCDIR)/$(3)
+# strip URL, without / to help the internal gallery system
+$(call gb_Gallery_get_target,$(1)) : GALLERY_BASEDIR := $(patsubst %/,%,$(call gb_Helper_make_url,$(dir $(SRCDIR)/$(3))))
 $(call gb_Gallery_get_target,$(1)) : GALLERY_FILES :=
 $(call gb_Gallery_get_target,$(1)) : GALLERY_NAME := $(4)