[Libreoffice-commits] core.git: 23 commits - configure.ac extras/Gallery_arrows.mk extras/Gallery_computers.mk extras/Gallery_diagrams.mk extras/Gallery_education.mk extras/Gallery_environment.mk extras/Gallery_finance.mk extras/Gallery_people.mk extras/Gallery_sound.mk extras/Gallery_symbols.mk extras/Gallery_transportation.mk extras/Gallery_txtshapes.mk extras/Module_extras.mk extras/Package_gallarrows.mk extras/Package_gallcomputers.mk extras/Package_galldiagrams.mk extras/Package_galleducation.mk extras/Package_gallenvironment.mk extras/Package_gallfinance.mk extras/Package_gallmytheme.mk extras/Package_gallpeople.mk extras/Package_gallsound.mk extras/Package_gallsounds.mk extras/Package_gallsymbols.mk extras/Package_gallsystem.mk extras/Package_galltransport.mk extras/Package_galltxtshapes.mk extras/README extras/source include/svx l10ntools/source RepositoryExternal.mk scp2/inc scp2/source solenv/bin solenv/gbuild svx/Library_svxcore.mk svx/source sysui/CustomTarget_share.mk sysui/d esktop
Michael Meeks
michael.meeks at suse.com
Wed May 15 01:39:00 PDT 2013
RepositoryExternal.mk | 14 +
configure.ac | 3
dev/null |binary
extras/Gallery_arrows.mk | 83 ++++++
extras/Gallery_computers.mk | 33 ++
extras/Gallery_diagrams.mk | 123 +++++++++
extras/Gallery_education.mk | 28 ++
extras/Gallery_environment.mk | 40 +++
extras/Gallery_finance.mk | 57 ++++
extras/Gallery_people.mk | 67 +++++
extras/Gallery_sound.mk | 51 ++++
extras/Gallery_symbols.mk | 105 ++++++++
extras/Gallery_transportation.mk | 29 ++
extras/Gallery_txtshapes.mk | 53 ++++
extras/Module_extras.mk | 29 +-
extras/Package_gallarrows.mk | 85 ------
extras/Package_gallcomputers.mk | 35 --
extras/Package_galldiagrams.mk | 125 ----------
extras/Package_galleducation.mk | 30 --
extras/Package_gallenvironment.mk | 42 ---
extras/Package_gallfinance.mk | 59 ----
extras/Package_gallmytheme.mk | 17 +
extras/Package_gallpeople.mk | 69 -----
extras/Package_gallsound.mk | 21 -
extras/Package_gallsounds.mk | 52 ----
extras/Package_gallsymbols.mk | 107 --------
extras/Package_gallsystem.mk | 33 --
extras/Package_galltransport.mk | 31 --
extras/Package_galltxtshapes.mk | 55 ----
extras/README | 7
extras/source/gallery/arrows/arrows.str | 2
extras/source/gallery/computers/computers.str | 2
extras/source/gallery/diagrams/diagrams.str | 2
extras/source/gallery/education/education.str | 2
extras/source/gallery/environment/environment.str | 2
extras/source/gallery/finance/finance.str | 2
extras/source/gallery/galleries.ulf | 2
extras/source/gallery/gallery_mytheme/sg30.sdv |binary
extras/source/gallery/gallery_mytheme/sg30.thm |binary
extras/source/gallery/people/people.str | 2
extras/source/gallery/share/gallery_names.ulf | 43 +++
extras/source/gallery/sounds/sounds.str | 2
extras/source/gallery/symbols/symbols.str | 2
extras/source/gallery/transportation/transportation.str | 2
extras/source/gallery/txtshapes/txtshapes.str | 2
include/svx/gallery1.hxx | 50 +---
include/svx/galtheme.hxx | 10
l10ntools/source/localize.cxx | 1
scp2/inc/macros.inc | 20 +
scp2/source/ooo/file_extra_ooo.scp | 93 +------
solenv/bin/desktop-translate.pl | 171 +++++++++++++
solenv/bin/linkoo | 48 +++
solenv/gbuild/Gallery.mk | 198 ++++++++++++++++
solenv/gbuild/TargetLocations.mk | 6
solenv/gbuild/extensions/pre_BuildTools.mk | 8
solenv/gbuild/gbuild.help.txt | 1
solenv/gbuild/gbuild.mk | 1
svx/Library_svxcore.mk | 1
svx/source/gallery2/galini.cxx | 94 +++++++
svx/source/gallery2/gallery1.cxx | 71 +----
svx/source/gallery2/galobj.cxx | 1
svx/source/gallery2/galtheme.cxx | 18 -
svx/source/gengal/gengal.cxx | 89 ++++---
sysui/CustomTarget_share.mk | 18 -
sysui/desktop/share/translate.pl | 149 ------------
65 files changed, 1471 insertions(+), 1127 deletions(-)
New commits:
commit 3f8927b5f1e0351554d19a48221015491c22da5e
Author: Michael Meeks <michael.meeks at suse.com>
Date: Tue May 14 17:01:32 2013 +0100
gallery: help on how to build new ones ...
Change-Id: Ia9f0e7196ce858e664e9a735ab55c34c5937bd1a
diff --git a/extras/README b/extras/README
index 39188e8..a9783f0 100644
--- a/extras/README
+++ b/extras/README
@@ -1 +1,8 @@
Contains templates, clipart galleries, palettes, symbol font etc.
+
+How-to add a new gallery:
+ + create a directory extras/source/gallery/foo/
+ + create a .str file extras/source/gallery/foo/foo.str
+ + add a [foo] section to extras/source/gallery/share/gallery_names.ulf
+ + add a Gallery_foo.mk at the top-level (and mention in Module_extra.mk)
+ + add a new GALLERY_FILELIST statement in scp2/
commit eef286c001878d7eeb66f54cd916ff779f8fa69f
Author: Michael Meeks <michael.meeks at suse.com>
Date: Tue May 14 14:49:47 2013 +0100
gallery: fix a number of naming thinkos.
Change-Id: If5fe5af925bb2f8b7a5a11eb9d310668a3fd7085
diff --git a/extras/Gallery_arrows.mk b/extras/Gallery_arrows.mk
index 6bd51e8..99de5db 100644
--- a/extras/Gallery_arrows.mk
+++ b/extras/Gallery_arrows.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/arrows))
+$(eval $(call gb_Gallery_Gallery,arrows,extras/source/gallery/arrows))
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/arrows,\
+$(eval $(call gb_Gallery_add_files,arrows,share/gallery/arrows,\
extras/source/gallery/arrows/A01-Arrow-Gray-Left.png \
extras/source/gallery/arrows/A02-Arrow-DarkBlue-Right.png \
extras/source/gallery/arrows/A03-Arrow-Gray-Left.png \
diff --git a/extras/Gallery_diagrams.mk b/extras/Gallery_diagrams.mk
index b4ca53a..bef5e96 100644
--- a/extras/Gallery_diagrams.mk
+++ b/extras/Gallery_diagrams.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/diagrams))
+$(eval $(call gb_Gallery_Gallery,diagrams,extras/source/gallery/diagrams))
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/diagrams,\
+$(eval $(call gb_Gallery_add_files,diagrams,share/gallery/diagrams,\
extras/source/gallery/diagrams/Component-Circle01-Transparent-DarkBlue.png \
extras/source/gallery/diagrams/Component-Circle02-Transparent-Bule.png \
extras/source/gallery/diagrams/Component-Circle03-Transparent-Green.png \
diff --git a/extras/Gallery_education.mk b/extras/Gallery_education.mk
index 1e90ae6..a069589 100644
--- a/extras/Gallery_education.mk
+++ b/extras/Gallery_education.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/education))
+$(eval $(call gb_Gallery_Gallery,education,extras/source/gallery/education))
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/education,\
+$(eval $(call gb_Gallery_add_files,education,share/gallery/education,\
extras/source/gallery/education/Blackboard.png \
extras/source/gallery/education/Books.png \
extras/source/gallery/education/Chalk.png \
diff --git a/extras/Gallery_environment.mk b/extras/Gallery_environment.mk
index 154e4a8..16b4be2 100644
--- a/extras/Gallery_environment.mk
+++ b/extras/Gallery_environment.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/environment))
+$(eval $(call gb_Gallery_Gallery,environment,extras/source/gallery/environment))
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/environment,\
+$(eval $(call gb_Gallery_add_files,environment,share/gallery/environment,\
extras/source/gallery/environment/DrippingFaucet.png \
extras/source/gallery/environment/Earth.png \
extras/source/gallery/environment/EndangeredAnimals1.png \
diff --git a/extras/Gallery_finance.mk b/extras/Gallery_finance.mk
index cf7c991..c53d0d7 100644
--- a/extras/Gallery_finance.mk
+++ b/extras/Gallery_finance.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/finance))
+$(eval $(call gb_Gallery_Gallery,finance,extras/source/gallery/finance))
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/finance,\
+$(eval $(call gb_Gallery_add_files,finance,share/gallery/finance,\
extras/source/gallery/finance/Agreement.png \
extras/source/gallery/finance/ATM01.png \
extras/source/gallery/finance/ATM02.png \
diff --git a/extras/Gallery_people.mk b/extras/Gallery_people.mk
index b42c412..41adf78 100644
--- a/extras/Gallery_people.mk
+++ b/extras/Gallery_people.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/people))
+$(eval $(call gb_Gallery_Gallery,people,extras/source/gallery/people))
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/people,\
+$(eval $(call gb_Gallery_add_files,people,share/gallery/people,\
extras/source/gallery/people/Artist-Female1.png \
extras/source/gallery/people/Artist-Female2.png \
extras/source/gallery/people/Artist-Male1.png \
diff --git a/extras/Gallery_sound.mk b/extras/Gallery_sound.mk
index b48a2f0..1243b0c 100644
--- a/extras/Gallery_sound.mk
+++ b/extras/Gallery_sound.mk
@@ -8,9 +8,9 @@
#
# this should probably be done with more general rules: but how ?
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/sounds))
+$(eval $(call gb_Gallery_Gallery,sounds,extras/source/gallery/sounds))
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/sounds,\
+$(eval $(call gb_Gallery_add_files,sounds,share/gallery/sounds,\
extras/source/gallery/sounds/apert2.wav \
extras/source/gallery/sounds/apert.wav \
extras/source/gallery/sounds/applause.wav \
diff --git a/extras/Gallery_symbols.mk b/extras/Gallery_symbols.mk
index 2ca0bdb..43413f9 100644
--- a/extras/Gallery_symbols.mk
+++ b/extras/Gallery_symbols.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/symbols))
+$(eval $(call gb_Gallery_Gallery,symbols,extras/source/gallery/symbols))
-$(eval $(call gb_Gallery_add_files,sound,share/gallery/symbols,\
+$(eval $(call gb_Gallery_add_files,symbols,share/gallery/symbols,\
extras/source/gallery/symbols/Book.png \
extras/source/gallery/symbols/Box01.png \
extras/source/gallery/symbols/Box02.png \
diff --git a/extras/source/gallery/share/gallery_names.ulf b/extras/source/gallery/share/gallery_names.ulf
index 6d8cd456..12d7769 100644
--- a/extras/source/gallery/share/gallery_names.ulf
+++ b/extras/source/gallery/share/gallery_names.ulf
@@ -28,7 +28,7 @@ en-US = "Finance"
[people]
en-US = "People"
-[sound]
+[sounds]
en-US = "Sounds"
[symbols]
diff --git a/extras/source/gallery/sounds/sound.str b/extras/source/gallery/sounds/sounds.str
similarity index 100%
rename from extras/source/gallery/sounds/sound.str
rename to extras/source/gallery/sounds/sounds.str
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index f8aa148..f6d731e 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -168,7 +168,7 @@ GALLERY_FILELIST(education)
GALLERY_FILELIST(environment)
GALLERY_FILELIST(finance)
GALLERY_FILELIST(people)
-GALLERY_FILELIST(sound)
+GALLERY_FILELIST(sounds)
GALLERY_FILELIST(symbols)
GALLERY_FILELIST(transportation)
GALLERY_FILELIST(txtshapes)
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 19b79b3..e885382 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -112,6 +112,8 @@ $(call gb_Gallery__Gallery_impl,$(1),$(call gb_Gallery_get_packagename,$(1)),$(2
# setup the files package - we install all of these too
$(call gb_Package_Package_internal,$(call gb_Gallery_get_files_packagename,$(1)),$(SRCDIR)/$(2))
$(call gb_Package_set_outdir,$(call gb_Gallery_get_files_packagename,$(1)),$(INSTDIR))
+$(call gb_Gallery__get_final_target,$(1)) : $(call gb_Package_get_target,$(call gb_Gallery_get_files_packagename,$(1)))
+$(call gb_Gallery_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_Gallery_get_files_packagename,$(1)))
endef
@@ -158,7 +160,7 @@ $$(call gb_Gallery_get_workdir,$(1))/$(1).ulf : \
rm -rf $$$${MERGEINPUT}
else
$$(call gb_Gallery_get_workdir,$(1))/$(1).ulf : $$(call gb_Gallery_basedir,$(3))/share/gallery_names.ulf
- cp $< $@
+ cp $$< $$@
endif
$(call gb_Gallery_get_workdir,$(1))/$(1).str : $(gb_Gallery_TRANSLATE) \
commit 96c7e37f02190e7af15bb6eb3f85380c331a7ce9
Author: Michael Meeks <michael.meeks at suse.com>
Date: Tue May 14 13:03:31 2013 +0100
migrate galleries to new, cleaner build infrastructure.
Change-Id: I95402d81aef426de14ca928ea811aac6f1cd289d
diff --git a/extras/Gallery_arrows.mk b/extras/Gallery_arrows.mk
new file mode 100644
index 0000000..6bd51e8
--- /dev/null
+++ b/extras/Gallery_arrows.mk
@@ -0,0 +1,83 @@
+# -*- 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/arrows))
+
+$(eval $(call gb_Gallery_add_files,sound,share/gallery/arrows,\
+ extras/source/gallery/arrows/A01-Arrow-Gray-Left.png \
+ extras/source/gallery/arrows/A02-Arrow-DarkBlue-Right.png \
+ extras/source/gallery/arrows/A03-Arrow-Gray-Left.png \
+ extras/source/gallery/arrows/A04-Arrow-DarkRed-Right.png \
+ extras/source/gallery/arrows/A05-Arrow-Blue-Left.png \
+ extras/source/gallery/arrows/A06-Arrow-Red-Right.png \
+ extras/source/gallery/arrows/A07-Arrow-LightBlue-Left.png \
+ extras/source/gallery/arrows/A08-Arrow-DarkRed-Right.png \
+ extras/source/gallery/arrows/A09-Arrow-Gray-Left.png \
+ extras/source/gallery/arrows/A10-Arrow-Purple-Right.png \
+ extras/source/gallery/arrows/A11-Arrow-Gray-Left.png \
+ extras/source/gallery/arrows/A12-Arrow-LightBlue-Right.png \
+ extras/source/gallery/arrows/A13-Arrow-Gray-Right.png \
+ extras/source/gallery/arrows/A14-CircleArrow-Green.png \
+ extras/source/gallery/arrows/A15-CircleArrow.png \
+ extras/source/gallery/arrows/A16-CircleArrow.png \
+ extras/source/gallery/arrows/A17-CircleArrow.png \
+ extras/source/gallery/arrows/A18-CircleArrow.png \
+ extras/source/gallery/arrows/A19-CircleArrow.png \
+ extras/source/gallery/arrows/A20-CircleArrow-LightBlue.png \
+ extras/source/gallery/arrows/A21-CircleArrow-Green.png \
+ extras/source/gallery/arrows/A22-CircleArrow.png \
+ extras/source/gallery/arrows/A23-CurvedArrow-Gray-Left.png \
+ extras/source/gallery/arrows/A24-CurvedArrow-LightBlue-Right.png \
+ extras/source/gallery/arrows/A25-CurvedArrow-DarkBlue.png \
+ extras/source/gallery/arrows/A26-CurvedArrow-Orange.png \
+ extras/source/gallery/arrows/A27-CurvedArrow-DarkRed.png \
+ extras/source/gallery/arrows/A28-CurvedArrow-DarkBlue.png \
+ extras/source/gallery/arrows/A29-CurvedArrow-Green.png \
+ extras/source/gallery/arrows/A30-CurvedArrow-Gray.png \
+ extras/source/gallery/arrows/A31-CurvedArrow-LightBlue.png \
+ extras/source/gallery/arrows/A32-CurvedArrow-Orange.png \
+ extras/source/gallery/arrows/A33-CurvedArrow-LightBlue-TwoDirections.png \
+ extras/source/gallery/arrows/A34-CurvedArrow-Green-TwoDirections.png \
+ extras/source/gallery/arrows/A35-CurvedArrow-Brown-Left.png \
+ extras/source/gallery/arrows/A36-CurvedArrow-LightBlue-Up.png \
+ extras/source/gallery/arrows/A37-CurvedArrow-Gray-TwoDirections.png \
+ extras/source/gallery/arrows/A38-CurvedArrow-Gray-TwoDirections.png \
+ extras/source/gallery/arrows/A39-CurvedArrow-Gray-Left.png \
+ extras/source/gallery/arrows/A40-CurvedArrow-Gray-Up.png \
+ extras/source/gallery/arrows/A41-CurvedArrow-Gray-Left.png \
+ extras/source/gallery/arrows/A42-TrendArrow-Red-GoUp.png \
+ extras/source/gallery/arrows/A43-TrendArrow-Green-GoDown.png \
+ extras/source/gallery/arrows/A44-TrendArrow-Orange-GoUp.png \
+ extras/source/gallery/arrows/A45-TrendArrow-Red-GoUp.png \
+ extras/source/gallery/arrows/A46-TrendArrow-Orange-GoUp.png \
+ extras/source/gallery/arrows/A47-TrendArrow-LightBlue.png \
+ extras/source/gallery/arrows/A48-TrendArrow-Orange-TwoDirections.png \
+ extras/source/gallery/arrows/A49-TrendArrow-Yellow-ThreeDirections.png \
+ extras/source/gallery/arrows/A50-TrendArrow-LightBlue-FourDirections.png \
+ extras/source/gallery/arrows/A51-TrendArrow-Blue-FourDirections.png \
+ extras/source/gallery/arrows/A52-TrendArrow-Blue-FourDirections.png \
+ extras/source/gallery/arrows/A53-TrendArrow-LightBlue-TwoDirections.png \
+ extras/source/gallery/arrows/A54-TrendArrow-Red-TwoDirections.png \
+ extras/source/gallery/arrows/A55-TrendArrow-TwoDirections.png \
+ extras/source/gallery/arrows/A56-TrendArrow-Blue-TwoDirections.png \
+ extras/source/gallery/arrows/A57-Arrow-Yellow-Left.png \
+ extras/source/gallery/arrows/A58-Arrow-Red-Right.png \
+ extras/source/gallery/arrows/A59-CurvedArrow-Gray-Left.png \
+ extras/source/gallery/arrows/A60-CurvedArrow-Purple-Right.png \
+ extras/source/gallery/arrows/A61-Arrow-StripedOrange-Left.png \
+ extras/source/gallery/arrows/A62-Arrow-StripedBlue-Right.png \
+ extras/source/gallery/arrows/A63-Arrow-LightBlue-Left.png \
+ extras/source/gallery/arrows/A64-Arrow-Green-Right.png \
+ extras/source/gallery/arrows/A65-Arrow-DarkBlue-Up.png \
+ extras/source/gallery/arrows/A66-Arrow-Green-Down.png \
+ extras/source/gallery/arrows/A67-Arrow-Yellow-Left.png \
+ extras/source/gallery/arrows/A68-Arrow-Gray-Right.png \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Gallery_computers.mk b/extras/Gallery_computers.mk
new file mode 100644
index 0000000..e59300f
--- /dev/null
+++ b/extras/Gallery_computers.mk
@@ -0,0 +1,33 @@
+# -*- 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,computers,extras/source/gallery/computers))
+
+$(eval $(call gb_Gallery_add_files,computers,share/gallery/computers,\
+ extras/source/gallery/computers/Computer-Cloud.png \
+ extras/source/gallery/computers/Computer-Desktop.png \
+ extras/source/gallery/computers/Computer-Laptop-Black.png \
+ extras/source/gallery/computers/Computer-Laptop-Silver.png \
+ extras/source/gallery/computers/Database-Add.png \
+ extras/source/gallery/computers/Database-Delete.png \
+ extras/source/gallery/computers/Database-Download.png \
+ extras/source/gallery/computers/Database.png \
+ extras/source/gallery/computers/Folder01-Blue.png \
+ extras/source/gallery/computers/Folder02-Green.png \
+ extras/source/gallery/computers/Folder03-Manilla.png \
+ extras/source/gallery/computers/Folder04-Yellow.png \
+ extras/source/gallery/computers/Folder05-OpenBlue.png \
+ extras/source/gallery/computers/Folder06-OpenGreen.png \
+ extras/source/gallery/computers/Folder07-OpenManilla.png \
+ extras/source/gallery/computers/Folder08-OpenYellow.png \
+ extras/source/gallery/computers/Server.png \
+ extras/source/gallery/computers/WirelessAccessPoint.png \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Gallery_diagrams.mk b/extras/Gallery_diagrams.mk
new file mode 100644
index 0000000..b4ca53a
--- /dev/null
+++ b/extras/Gallery_diagrams.mk
@@ -0,0 +1,123 @@
+# -*- 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/diagrams))
+
+$(eval $(call gb_Gallery_add_files,sound,share/gallery/diagrams,\
+ extras/source/gallery/diagrams/Component-Circle01-Transparent-DarkBlue.png \
+ extras/source/gallery/diagrams/Component-Circle02-Transparent-Bule.png \
+ extras/source/gallery/diagrams/Component-Circle03-Transparent-Green.png \
+ extras/source/gallery/diagrams/Component-Circle04-Transparent-Orange.png \
+ extras/source/gallery/diagrams/Component-Circle05-Transparent-Red.png \
+ extras/source/gallery/diagrams/Component-Cube01-DarkBlue.png \
+ extras/source/gallery/diagrams/Component-Cube02-LightBlue.png \
+ extras/source/gallery/diagrams/Component-Cube03-Green.png \
+ extras/source/gallery/diagrams/Component-Cube04-Orange.png \
+ extras/source/gallery/diagrams/Component-Cube05-DarkRed.png \
+ extras/source/gallery/diagrams/Component-Cuboid01-DarkBlue.png \
+ extras/source/gallery/diagrams/Component-Cuboid02-Blue.png \
+ extras/source/gallery/diagrams/Component-Cuboid03-Green.png \
+ extras/source/gallery/diagrams/Component-Cuboid04-Orange.png \
+ extras/source/gallery/diagrams/Component-Cuboid05-Red.png \
+ extras/source/gallery/diagrams/Component-Gear01-DarkBlue.png \
+ extras/source/gallery/diagrams/Component-Gear02-LightBlue.png \
+ extras/source/gallery/diagrams/Component-Gear03-Green.png \
+ extras/source/gallery/diagrams/Component-Gear04-DarkRed.png \
+ extras/source/gallery/diagrams/Component-Gear05-Orange.png \
+ extras/source/gallery/diagrams/Component-Person01-DarkBlue.png \
+ extras/source/gallery/diagrams/Component-Person02-Blue.png \
+ extras/source/gallery/diagrams/Component-Person03-Green.png \
+ extras/source/gallery/diagrams/Component-Person04-DarkRed.png \
+ extras/source/gallery/diagrams/Component-Person05-Orange.png \
+ extras/source/gallery/diagrams/Component-PuzzlePiece01-DarkBlue.png \
+ extras/source/gallery/diagrams/Component-PuzzlePiece02-Blue.png \
+ extras/source/gallery/diagrams/Component-PuzzlePiece03-Green.png \
+ extras/source/gallery/diagrams/Component-PuzzlePiece04-Red.png \
+ extras/source/gallery/diagrams/Component-PuzzlePiece05-Orange.png \
+ extras/source/gallery/diagrams/Component-Sphere01-DarkBlue.png \
+ extras/source/gallery/diagrams/Component-Sphere02-LightBlue.png \
+ extras/source/gallery/diagrams/Component-Sphere03-Green.png \
+ extras/source/gallery/diagrams/Component-Sphere04-DarkRed.png \
+ extras/source/gallery/diagrams/Component-Sphere05-Orange.png \
+ extras/source/gallery/diagrams/Cycle01-Transparent.png \
+ extras/source/gallery/diagrams/Cycle02-Transparent-Blue.png \
+ extras/source/gallery/diagrams/Cycle03-Blue.png \
+ extras/source/gallery/diagrams/Cycle04-Blue.png \
+ extras/source/gallery/diagrams/Cycle05.png \
+ extras/source/gallery/diagrams/Cycle06.png \
+ extras/source/gallery/diagrams/Cycle07.png \
+ extras/source/gallery/diagrams/Cycle08-Blue.png \
+ extras/source/gallery/diagrams/Cycle09-Orange.png \
+ extras/source/gallery/diagrams/Donut01-LightBlue.png \
+ extras/source/gallery/diagrams/Donut02-Blue.png \
+ extras/source/gallery/diagrams/Donut03-Blue.png \
+ extras/source/gallery/diagrams/Donut04-DarkBlue.png \
+ extras/source/gallery/diagrams/Donut05-DarkBlue.png \
+ extras/source/gallery/diagrams/Donut06-Blue.png \
+ extras/source/gallery/diagrams/Donut07-Blue.png \
+ extras/source/gallery/diagrams/Graph.png \
+ extras/source/gallery/diagrams/People01-Blue.png \
+ extras/source/gallery/diagrams/People02.png \
+ extras/source/gallery/diagrams/Pillars01-Orange.png \
+ extras/source/gallery/diagrams/Pillars02-LightBlue.png \
+ extras/source/gallery/diagrams/Process01-Blue.png \
+ extras/source/gallery/diagrams/Process02-Blue.png \
+ extras/source/gallery/diagrams/Process03-Blue.emf \
+ extras/source/gallery/diagrams/Process04-GoUp-Blue.png \
+ extras/source/gallery/diagrams/Process05-GoUp-Red.png \
+ extras/source/gallery/diagrams/Process06-GoUp-Yellow.png \
+ extras/source/gallery/diagrams/Process07-Blue.png \
+ extras/source/gallery/diagrams/Pyramid01.png \
+ extras/source/gallery/diagrams/Pyramid02-Blue.png \
+ extras/source/gallery/diagrams/Pyramid03.emf \
+ extras/source/gallery/diagrams/Radial01-Green.emf \
+ extras/source/gallery/diagrams/Radial02-Green.emf \
+ extras/source/gallery/diagrams/Radial03-Sphere.png \
+ extras/source/gallery/diagrams/Radial04-Sphere-Red.png \
+ extras/source/gallery/diagrams/Radial05-Sphere-Blue.png \
+ extras/source/gallery/diagrams/Radial06-Arrows-DarkBlue.png \
+ extras/source/gallery/diagrams/Radial07-Arrows-DarkBlue.png \
+ extras/source/gallery/diagrams/Section-Circle.emf \
+ extras/source/gallery/diagrams/Section-Cubes01.png \
+ extras/source/gallery/diagrams/Section-Cubes02-Blue.png \
+ extras/source/gallery/diagrams/Section-Cubes03-Orange.png \
+ extras/source/gallery/diagrams/Section-Cubes04.png \
+ extras/source/gallery/diagrams/Section-Cubes05.png \
+ extras/source/gallery/diagrams/Section-Cuboids01-Blue.png \
+ extras/source/gallery/diagrams/Section-Cuboids02-Blue.png \
+ extras/source/gallery/diagrams/Section-Cuboids03.png \
+ extras/source/gallery/diagrams/Section-Gears01.png \
+ extras/source/gallery/diagrams/Section-Gears02-Blue.emf \
+ extras/source/gallery/diagrams/Section-Gears03.png \
+ extras/source/gallery/diagrams/Section-Hexagons01.png \
+ extras/source/gallery/diagrams/Section-Hexagons02-Blue.png \
+ extras/source/gallery/diagrams/Section-Hexagons03-Blue.png \
+ extras/source/gallery/diagrams/Section-Hexagons04-Orange.emf \
+ extras/source/gallery/diagrams/Section-Leaves01-LightBlue.png \
+ extras/source/gallery/diagrams/Section-Leaves02-Green.png \
+ extras/source/gallery/diagrams/Section-Pasters01.png \
+ extras/source/gallery/diagrams/Section-Pasters02-Blue.emf \
+ extras/source/gallery/diagrams/Section-Puzzle01.emf \
+ extras/source/gallery/diagrams/Section-Puzzle02.png \
+ extras/source/gallery/diagrams/Section-Puzzle03.png \
+ extras/source/gallery/diagrams/Section-Rectangles.png \
+ extras/source/gallery/diagrams/Section-Squares.png \
+ extras/source/gallery/diagrams/Section-Triangle.emf \
+ extras/source/gallery/diagrams/Target.png \
+ extras/source/gallery/diagrams/Venn01.png \
+ extras/source/gallery/diagrams/Venn02.png \
+ extras/source/gallery/diagrams/Venn03.png \
+ extras/source/gallery/diagrams/Venn04.png \
+ extras/source/gallery/diagrams/Venn05.png \
+ extras/source/gallery/diagrams/Venn06-Blue.png \
+ extras/source/gallery/diagrams/Venn07-Blue.emf \
+ extras/source/gallery/diagrams/Venn08.png \
+))
+
+# vim: set noet sw=4 ts=4: \
diff --git a/extras/Gallery_education.mk b/extras/Gallery_education.mk
new file mode 100644
index 0000000..1e90ae6
--- /dev/null
+++ b/extras/Gallery_education.mk
@@ -0,0 +1,28 @@
+# -*- 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/education))
+
+$(eval $(call gb_Gallery_add_files,sound,share/gallery/education,\
+ extras/source/gallery/education/Blackboard.png \
+ extras/source/gallery/education/Books.png \
+ extras/source/gallery/education/Chalk.png \
+ extras/source/gallery/education/Globe.png \
+ extras/source/gallery/education/Glue.png \
+ extras/source/gallery/education/GraduationCap.png \
+ extras/source/gallery/education/Microscope.png \
+ extras/source/gallery/education/Notebook.png \
+ extras/source/gallery/education/PaperClip-Blue.png \
+ extras/source/gallery/education/PaperClip-Red.png \
+ extras/source/gallery/education/Pencil.png \
+ extras/source/gallery/education/Ruler.png \
+ extras/source/gallery/education/TestTubes.png \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Gallery_environment.mk b/extras/Gallery_environment.mk
new file mode 100644
index 0000000..154e4a8
--- /dev/null
+++ b/extras/Gallery_environment.mk
@@ -0,0 +1,40 @@
+# -*- 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/environment))
+
+$(eval $(call gb_Gallery_add_files,sound,share/gallery/environment,\
+ extras/source/gallery/environment/DrippingFaucet.png \
+ extras/source/gallery/environment/Earth.png \
+ extras/source/gallery/environment/EndangeredAnimals1.png \
+ extras/source/gallery/environment/EndangeredAnimals2.png \
+ extras/source/gallery/environment/GreenCar.png \
+ extras/source/gallery/environment/GreenFactory.png \
+ extras/source/gallery/environment/GreenHouse.png \
+ extras/source/gallery/environment/Leaf1.png \
+ extras/source/gallery/environment/Leaf2.png \
+ extras/source/gallery/environment/LightBulb-Flourescent-Off.png \
+ extras/source/gallery/environment/LightBulb-Flourescent-On.png \
+ extras/source/gallery/environment/LightBulb-Standard-Off1.png \
+ extras/source/gallery/environment/LightBulb-Standard-Off2.png \
+ extras/source/gallery/environment/LightBulb-Standard-On.png \
+ extras/source/gallery/environment/Pollution-Car.png \
+ extras/source/gallery/environment/Pollution-Factory.png \
+ extras/source/gallery/environment/Raindrop.png \
+ extras/source/gallery/environment/RecycleBin.png \
+ extras/source/gallery/environment/RecycleSymbol.png \
+ extras/source/gallery/environment/RenewableEnergy-Solar.png \
+ extras/source/gallery/environment/RenewableEnergySymbol.png \
+ extras/source/gallery/environment/RenewableEnergy-Water.png \
+ extras/source/gallery/environment/RenewableEnergy-Wind.png \
+ extras/source/gallery/environment/Sun1.png \
+ extras/source/gallery/environment/Sun2.png \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Gallery_finance.mk b/extras/Gallery_finance.mk
new file mode 100644
index 0000000..cf7c991
--- /dev/null
+++ b/extras/Gallery_finance.mk
@@ -0,0 +1,57 @@
+# -*- 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/finance))
+
+$(eval $(call gb_Gallery_add_files,sound,share/gallery/finance,\
+ extras/source/gallery/finance/Agreement.png \
+ extras/source/gallery/finance/ATM01.png \
+ extras/source/gallery/finance/ATM02.png \
+ extras/source/gallery/finance/Balance-Balanced1.png \
+ extras/source/gallery/finance/Balance-Balanced2.png \
+ extras/source/gallery/finance/Balance-Unbalanced1.png \
+ extras/source/gallery/finance/Balance-Unbalanced2.png \
+ extras/source/gallery/finance/Calculator.png \
+ extras/source/gallery/finance/Chart-Decrease1.png \
+ extras/source/gallery/finance/Chart-Decrease2.png \
+ extras/source/gallery/finance/Chart-Increase1.png \
+ extras/source/gallery/finance/Chart-Increase2.png \
+ extras/source/gallery/finance/Chart-Plateau.png \
+ extras/source/gallery/finance/Check.png \
+ extras/source/gallery/finance/Contract.png \
+ extras/source/gallery/finance/CreditCard-Black.png \
+ extras/source/gallery/finance/CreditCard-Cut.png \
+ extras/source/gallery/finance/CreditCard-Gold.png \
+ extras/source/gallery/finance/Currency-Dollar.png \
+ extras/source/gallery/finance/Currency-Dollars.png \
+ extras/source/gallery/finance/Currency-StackCoins.png \
+ extras/source/gallery/finance/Currency-Stack.png \
+ extras/source/gallery/finance/GoldBar.png \
+ extras/source/gallery/finance/GoldBar-Stack.png \
+ extras/source/gallery/finance/MoneyBag01.png \
+ extras/source/gallery/finance/MoneyBag02.png \
+ extras/source/gallery/finance/PercentSign.png \
+ extras/source/gallery/finance/PiggyBank01-Broken.png \
+ extras/source/gallery/finance/PiggyBank02-Broken.png \
+ extras/source/gallery/finance/PiggyBank-Coins.png \
+ extras/source/gallery/finance/PiggyBank-Currency.png \
+ extras/source/gallery/finance/Portfolio.png \
+ extras/source/gallery/finance/PriceTag.png \
+ extras/source/gallery/finance/Safe-Closed.png \
+ extras/source/gallery/finance/Safe-Empty.png \
+ extras/source/gallery/finance/Safe-Full.png \
+ extras/source/gallery/finance/Seal-Gold.png \
+ extras/source/gallery/finance/Seal-Red.png \
+ extras/source/gallery/finance/Seal-Silver.png \
+ extras/source/gallery/finance/Wallet-Empty.png \
+ extras/source/gallery/finance/Wallet-Full1.png \
+ extras/source/gallery/finance/Wallet-Full2.png \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Gallery_people.mk b/extras/Gallery_people.mk
new file mode 100644
index 0000000..b42c412
--- /dev/null
+++ b/extras/Gallery_people.mk
@@ -0,0 +1,67 @@
+# -*- 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/people))
+
+$(eval $(call gb_Gallery_add_files,sound,share/gallery/people,\
+ extras/source/gallery/people/Artist-Female1.png \
+ extras/source/gallery/people/Artist-Female2.png \
+ extras/source/gallery/people/Artist-Male1.png \
+ extras/source/gallery/people/Artist-Male2.png \
+ extras/source/gallery/people/BusinessPerson-Female1.png \
+ extras/source/gallery/people/BusinessPerson-Female2.png \
+ extras/source/gallery/people/BusinessPerson-Female3.png \
+ extras/source/gallery/people/BusinessPerson-Female4.png \
+ extras/source/gallery/people/BusinessPerson-Female5.png \
+ extras/source/gallery/people/BusinessPerson-Female6.png \
+ extras/source/gallery/people/BusinessPerson-HeadSet1.png \
+ extras/source/gallery/people/BusinessPerson-HeadSet2.png \
+ extras/source/gallery/people/BusinessPerson-Male1.png \
+ extras/source/gallery/people/BusinessPerson-Male2.png \
+ extras/source/gallery/people/BusinessPerson-Male3.png \
+ extras/source/gallery/people/BusinessPerson-Male4.png \
+ extras/source/gallery/people/BusinessPerson-Male5.png \
+ extras/source/gallery/people/BusinessPerson-Male6.png \
+ extras/source/gallery/people/Chef1.png \
+ extras/source/gallery/people/Chef2.png \
+ extras/source/gallery/people/Computer-User-Female1.png \
+ extras/source/gallery/people/Computer-User-Female2.png \
+ extras/source/gallery/people/Computer-User-Male1.png \
+ extras/source/gallery/people/Computer-User-Male2.png \
+ extras/source/gallery/people/ConstructionWorker2.png \
+ extras/source/gallery/people/ConstructionWorker.png \
+ extras/source/gallery/people/Detective1.png \
+ extras/source/gallery/people/Detective2.png \
+ extras/source/gallery/people/Doctor-Female1.png \
+ extras/source/gallery/people/Doctor-Female2.png \
+ extras/source/gallery/people/Doctor-Male1.png \
+ extras/source/gallery/people/Doctor-Male2.png \
+ extras/source/gallery/people/Nurse1.png \
+ extras/source/gallery/people/Nurse2.png \
+ extras/source/gallery/people/PoliceOfficer1.png \
+ extras/source/gallery/people/PoliceOfficer2.png \
+ extras/source/gallery/people/Presenter-Female1.png \
+ extras/source/gallery/people/Presenter-Female2.png \
+ extras/source/gallery/people/Presenter-Male1.png \
+ extras/source/gallery/people/Presenter-Male2.png \
+ extras/source/gallery/people/Student-Female.png \
+ extras/source/gallery/people/Student-Male.png \
+ extras/source/gallery/people/Surgeon1.png \
+ extras/source/gallery/people/Surgeon2.png \
+ extras/source/gallery/people/Surgeon-Female1.png \
+ extras/source/gallery/people/Surgeon-Female2.png \
+ extras/source/gallery/people/Teacher1.png \
+ extras/source/gallery/people/Teacher2.png \
+ extras/source/gallery/people/Tourist-Female1.png \
+ extras/source/gallery/people/Tourist-Female2.png \
+ extras/source/gallery/people/Tourist-Male1.png \
+ extras/source/gallery/people/Tourist-Male2.png \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Gallery_symbols.mk b/extras/Gallery_symbols.mk
new file mode 100644
index 0000000..2ca0bdb
--- /dev/null
+++ b/extras/Gallery_symbols.mk
@@ -0,0 +1,105 @@
+# -*- 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/symbols))
+
+$(eval $(call gb_Gallery_add_files,sound,share/gallery/symbols,\
+ extras/source/gallery/symbols/Book.png \
+ extras/source/gallery/symbols/Box01.png \
+ extras/source/gallery/symbols/Box02.png \
+ extras/source/gallery/symbols/Bulb01-Yellow.png \
+ extras/source/gallery/symbols/Bulb02-Yellow.png \
+ extras/source/gallery/symbols/Calendar.png \
+ extras/source/gallery/symbols/Chart.png \
+ extras/source/gallery/symbols/Clipboard.png \
+ extras/source/gallery/symbols/Clock.png \
+ extras/source/gallery/symbols/Compass.png \
+ extras/source/gallery/symbols/Emotion01-Laughing.png \
+ extras/source/gallery/symbols/Emotion02-Smiling.png \
+ extras/source/gallery/symbols/Emotion03-Calm.png \
+ extras/source/gallery/symbols/Emotion04-Frowning.png \
+ extras/source/gallery/symbols/Emotion05-Angry.png \
+ extras/source/gallery/symbols/Emotion06-Crying.png \
+ extras/source/gallery/symbols/Flag01-Red.png \
+ extras/source/gallery/symbols/Flag02-Green.png \
+ extras/source/gallery/symbols/Flag03-Blue.png \
+ extras/source/gallery/symbols/Gift.png \
+ extras/source/gallery/symbols/House.png \
+ extras/source/gallery/symbols/Icon-Computer01-White.png \
+ extras/source/gallery/symbols/Icon-Computer02-Black.png \
+ extras/source/gallery/symbols/Icon-Disk01-Blue.png \
+ extras/source/gallery/symbols/Icon-Disk02-Green.png \
+ extras/source/gallery/symbols/Icon-Document01-Grey.png \
+ extras/source/gallery/symbols/Icon-Document02-Grey.png \
+ extras/source/gallery/symbols/Icon-Document03-Blue.png \
+ extras/source/gallery/symbols/Icon-Document04-Blue.png \
+ extras/source/gallery/symbols/Icon-Envelope01-Blue.png \
+ extras/source/gallery/symbols/Icon-Envelope02-Yellow.png \
+ extras/source/gallery/symbols/Icon-Envelope03-Open-Yellow.png \
+ extras/source/gallery/symbols/Icon-Envelope04-Open-Yellow.png \
+ extras/source/gallery/symbols/Icon-Folder01-Yellow.png \
+ extras/source/gallery/symbols/Icon-Folder02-Yellow.png \
+ extras/source/gallery/symbols/Icon-Folder03-Open-Yellow.png \
+ extras/source/gallery/symbols/Icon-Folder04-Open-Yellow.png \
+ extras/source/gallery/symbols/Icon-Gear01-Grey.png \
+ extras/source/gallery/symbols/Icon-Gear02-Blue.png \
+ extras/source/gallery/symbols/Icon-Network01-Blue.png \
+ extras/source/gallery/symbols/Icon-Network02.png \
+ extras/source/gallery/symbols/Icon-Pencil01.png \
+ extras/source/gallery/symbols/Icon-Pencil02.png \
+ extras/source/gallery/symbols/Icon-Printer01-White.png \
+ extras/source/gallery/symbols/Icon-Printer02-Black.png \
+ extras/source/gallery/symbols/Key01.png \
+ extras/source/gallery/symbols/Key02.png \
+ extras/source/gallery/symbols/Lock01-Yellow.png \
+ extras/source/gallery/symbols/Lock02-Yellow.png \
+ extras/source/gallery/symbols/Lock03-Blue.png \
+ extras/source/gallery/symbols/Lock04-Blue.png \
+ extras/source/gallery/symbols/Magnet.png \
+ extras/source/gallery/symbols/MagnifyingGlass.png \
+ extras/source/gallery/symbols/Medal.png \
+ extras/source/gallery/symbols/Notebook.png \
+ extras/source/gallery/symbols/Phone.png \
+ extras/source/gallery/symbols/PieChart.png \
+ extras/source/gallery/symbols/Pin.png \
+ extras/source/gallery/symbols/PuzzlePiece.png \
+ extras/source/gallery/symbols/PuzzlePieces.png \
+ extras/source/gallery/symbols/Roadblock.png \
+ extras/source/gallery/symbols/Scissors.png \
+ extras/source/gallery/symbols/Shield01.png \
+ extras/source/gallery/symbols/Shield02-Orange.png \
+ extras/source/gallery/symbols/Shield03-Blue.png \
+ extras/source/gallery/symbols/Sign-Ban01.png \
+ extras/source/gallery/symbols/Sign-Ban02.png \
+ extras/source/gallery/symbols/Sign-CheckBox01.png \
+ extras/source/gallery/symbols/Sign-CheckBox02-Unchecked.png \
+ extras/source/gallery/symbols/Sign-Checkmark01-Green.png \
+ extras/source/gallery/symbols/Sign-Checkmark02-Green.png \
+ extras/source/gallery/symbols/Sign-DoNotEnter.png \
+ extras/source/gallery/symbols/Sign-Error01.png \
+ extras/source/gallery/symbols/Sign-Error02.png \
+ extras/source/gallery/symbols/Sign-ExclamationPoint01-Red.png \
+ extras/source/gallery/symbols/Sign-ExclamationPoint02-Orange.png \
+ extras/source/gallery/symbols/Sign-Help01-Green.png \
+ extras/source/gallery/symbols/Sign-Help02-Blue.png \
+ extras/source/gallery/symbols/Sign-Information.png \
+ extras/source/gallery/symbols/Sign-Null.png \
+ extras/source/gallery/symbols/Sign-QuestionMark01-Blue.png \
+ extras/source/gallery/symbols/Sign-QuestionMark02-Red.png \
+ extras/source/gallery/symbols/Sign-RadioButton01.png \
+ extras/source/gallery/symbols/Sign-RadioButton02-Unchecked.png \
+ extras/source/gallery/symbols/Sign-Warning01-Red.png \
+ extras/source/gallery/symbols/Sign-Warning02-Orange.png \
+ extras/source/gallery/symbols/Sign-X01-Red.png \
+ extras/source/gallery/symbols/Sign-X02-Red.png \
+ extras/source/gallery/symbols/Star-Yellow.png \
+ extras/source/gallery/symbols/Wrench.png \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index a92c307..e7a3c0b 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -21,18 +21,10 @@ $(eval $(call gb_Module_add_targets,extras,\
Package_database \
Package_databasebiblio \
Package_fonts \
- Package_gallarrows \
Package_gallbullets \
- Package_gallcomputers \
- Package_galldiagrams \
- Package_galleducation \
- Package_gallenvironment \
- Package_gallfinance \
Package_gallhtmlexpo \
Package_gallmytheme \
- Package_gallpeople \
Package_gallroot \
- Package_gallsymbols \
Package_gallsystem \
Package_gallwwwback \
Package_gallwwwgraf \
@@ -53,6 +45,14 @@ $(eval $(call gb_Module_add_targets,extras,\
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,extras,\
+ Gallery_arrows \
+ Gallery_computers \
+ Gallery_diagrams \
+ Gallery_education \
+ Gallery_environment \
+ Gallery_finance \
+ Gallery_people \
+ Gallery_symbols \
Gallery_sound \
Gallery_txtshapes \
Gallery_transportation \
diff --git a/extras/Package_gallarrows.mk b/extras/Package_gallarrows.mk
deleted file mode 100644
index 4e718b3..0000000
--- a/extras/Package_gallarrows.mk
+++ /dev/null
@@ -1,85 +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_Package_Package,extras_gallarrows,$(SRCDIR)/extras/source/gallery/arrows))
-
-$(eval $(call gb_Package_set_outdir,extras_gallarrows,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files,extras_gallarrows,share/gallery/arrows,\
- A01-Arrow-Gray-Left.png \
- A02-Arrow-DarkBlue-Right.png \
- A03-Arrow-Gray-Left.png \
- A04-Arrow-DarkRed-Right.png \
- A05-Arrow-Blue-Left.png \
- A06-Arrow-Red-Right.png \
- A07-Arrow-LightBlue-Left.png \
- A08-Arrow-DarkRed-Right.png \
- A09-Arrow-Gray-Left.png \
- A10-Arrow-Purple-Right.png \
- A11-Arrow-Gray-Left.png \
- A12-Arrow-LightBlue-Right.png \
- A13-Arrow-Gray-Right.png \
- A14-CircleArrow-Green.png \
- A15-CircleArrow.png \
- A16-CircleArrow.png \
- A17-CircleArrow.png \
- A18-CircleArrow.png \
- A19-CircleArrow.png \
- A20-CircleArrow-LightBlue.png \
- A21-CircleArrow-Green.png \
- A22-CircleArrow.png \
- A23-CurvedArrow-Gray-Left.png \
- A24-CurvedArrow-LightBlue-Right.png \
- A25-CurvedArrow-DarkBlue.png \
- A26-CurvedArrow-Orange.png \
- A27-CurvedArrow-DarkRed.png \
- A28-CurvedArrow-DarkBlue.png \
- A29-CurvedArrow-Green.png \
- A30-CurvedArrow-Gray.png \
- A31-CurvedArrow-LightBlue.png \
- A32-CurvedArrow-Orange.png \
- A33-CurvedArrow-LightBlue-TwoDirections.png \
- A34-CurvedArrow-Green-TwoDirections.png \
- A35-CurvedArrow-Brown-Left.png \
- A36-CurvedArrow-LightBlue-Up.png \
- A37-CurvedArrow-Gray-TwoDirections.png \
- A38-CurvedArrow-Gray-TwoDirections.png \
- A39-CurvedArrow-Gray-Left.png \
- A40-CurvedArrow-Gray-Up.png \
- A41-CurvedArrow-Gray-Left.png \
- A42-TrendArrow-Red-GoUp.png \
- A43-TrendArrow-Green-GoDown.png \
- A44-TrendArrow-Orange-GoUp.png \
- A45-TrendArrow-Red-GoUp.png \
- A46-TrendArrow-Orange-GoUp.png \
- A47-TrendArrow-LightBlue.png \
- A48-TrendArrow-Orange-TwoDirections.png \
- A49-TrendArrow-Yellow-ThreeDirections.png \
- A50-TrendArrow-LightBlue-FourDirections.png \
- A51-TrendArrow-Blue-FourDirections.png \
- A52-TrendArrow-Blue-FourDirections.png \
- A53-TrendArrow-LightBlue-TwoDirections.png \
- A54-TrendArrow-Red-TwoDirections.png \
- A55-TrendArrow-TwoDirections.png \
- A56-TrendArrow-Blue-TwoDirections.png \
- A57-Arrow-Yellow-Left.png \
- A58-Arrow-Red-Right.png \
- A59-CurvedArrow-Gray-Left.png \
- A60-CurvedArrow-Purple-Right.png \
- A61-Arrow-StripedOrange-Left.png \
- A62-Arrow-StripedBlue-Right.png \
- A63-Arrow-LightBlue-Left.png \
- A64-Arrow-Green-Right.png \
- A65-Arrow-DarkBlue-Up.png \
- A66-Arrow-Green-Down.png \
- A67-Arrow-Yellow-Left.png \
- A68-Arrow-Gray-Right.png \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_gallcomputers.mk b/extras/Package_gallcomputers.mk
deleted file mode 100644
index 63bf889..0000000
--- a/extras/Package_gallcomputers.mk
+++ /dev/null
@@ -1,35 +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_Package_Package,extras_gallcomputers,$(SRCDIR)/extras/source/gallery/computers))
-
-$(eval $(call gb_Package_set_outdir,extras_gallcomputers,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files,extras_gallcomputers,share/gallery/computers,\
- Computer-Cloud.png \
- Computer-Desktop.png \
- Computer-Laptop-Black.png \
- Computer-Laptop-Silver.png \
- Database-Add.png \
- Database-Delete.png \
- Database-Download.png \
- Database.png \
- Folder01-Blue.png \
- Folder02-Green.png \
- Folder03-Manilla.png \
- Folder04-Yellow.png \
- Folder05-OpenBlue.png \
- Folder06-OpenGreen.png \
- Folder07-OpenManilla.png \
- Folder08-OpenYellow.png \
- Server.png \
- WirelessAccessPoint.png \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_galldiagrams.mk b/extras/Package_galldiagrams.mk
deleted file mode 100644
index 6a11b6e..0000000
--- a/extras/Package_galldiagrams.mk
+++ /dev/null
@@ -1,125 +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_Package_Package,extras_galldiagrams,$(SRCDIR)/extras/source/gallery/diagrams))
-
-$(eval $(call gb_Package_set_outdir,extras_galldiagrams,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files,extras_galldiagrams,share/gallery/diagrams,\
- Component-Circle01-Transparent-DarkBlue.png \
- Component-Circle02-Transparent-Bule.png \
- Component-Circle03-Transparent-Green.png \
- Component-Circle04-Transparent-Orange.png \
- Component-Circle05-Transparent-Red.png \
- Component-Cube01-DarkBlue.png \
- Component-Cube02-LightBlue.png \
- Component-Cube03-Green.png \
- Component-Cube04-Orange.png \
- Component-Cube05-DarkRed.png \
- Component-Cuboid01-DarkBlue.png \
- Component-Cuboid02-Blue.png \
- Component-Cuboid03-Green.png \
- Component-Cuboid04-Orange.png \
- Component-Cuboid05-Red.png \
- Component-Gear01-DarkBlue.png \
- Component-Gear02-LightBlue.png \
- Component-Gear03-Green.png \
- Component-Gear04-DarkRed.png \
- Component-Gear05-Orange.png \
- Component-Person01-DarkBlue.png \
- Component-Person02-Blue.png \
- Component-Person03-Green.png \
- Component-Person04-DarkRed.png \
- Component-Person05-Orange.png \
- Component-PuzzlePiece01-DarkBlue.png \
- Component-PuzzlePiece02-Blue.png \
- Component-PuzzlePiece03-Green.png \
- Component-PuzzlePiece04-Red.png \
- Component-PuzzlePiece05-Orange.png \
- Component-Sphere01-DarkBlue.png \
- Component-Sphere02-LightBlue.png \
- Component-Sphere03-Green.png \
- Component-Sphere04-DarkRed.png \
- Component-Sphere05-Orange.png \
- Cycle01-Transparent.png \
- Cycle02-Transparent-Blue.png \
- Cycle03-Blue.png \
- Cycle04-Blue.png \
- Cycle05.png \
- Cycle06.png \
- Cycle07.png \
- Cycle08-Blue.png \
- Cycle09-Orange.png \
- Donut01-LightBlue.png \
- Donut02-Blue.png \
- Donut03-Blue.png \
- Donut04-DarkBlue.png \
- Donut05-DarkBlue.png \
- Donut06-Blue.png \
- Donut07-Blue.png \
- Graph.png \
- People01-Blue.png \
- People02.png \
- Pillars01-Orange.png \
- Pillars02-LightBlue.png \
- Process01-Blue.png \
- Process02-Blue.png \
- Process03-Blue.emf \
- Process04-GoUp-Blue.png \
- Process05-GoUp-Red.png \
- Process06-GoUp-Yellow.png \
- Process07-Blue.png \
- Pyramid01.png \
- Pyramid02-Blue.png \
- Pyramid03.emf \
- Radial01-Green.emf \
- Radial02-Green.emf \
- Radial03-Sphere.png \
- Radial04-Sphere-Red.png \
- Radial05-Sphere-Blue.png \
- Radial06-Arrows-DarkBlue.png \
- Radial07-Arrows-DarkBlue.png \
- Section-Circle.emf \
- Section-Cubes01.png \
- Section-Cubes02-Blue.png \
- Section-Cubes03-Orange.png \
- Section-Cubes04.png \
- Section-Cubes05.png \
- Section-Cuboids01-Blue.png \
- Section-Cuboids02-Blue.png \
- Section-Cuboids03.png \
- Section-Gears01.png \
- Section-Gears02-Blue.emf \
- Section-Gears03.png \
- Section-Hexagons01.png \
- Section-Hexagons02-Blue.png \
- Section-Hexagons03-Blue.png \
- Section-Hexagons04-Orange.emf \
- Section-Leaves01-LightBlue.png \
- Section-Leaves02-Green.png \
- Section-Pasters01.png \
- Section-Pasters02-Blue.emf \
- Section-Puzzle01.emf \
- Section-Puzzle02.png \
- Section-Puzzle03.png \
- Section-Rectangles.png \
- Section-Squares.png \
- Section-Triangle.emf \
- Target.png \
- Venn01.png \
- Venn02.png \
- Venn03.png \
- Venn04.png \
- Venn05.png \
- Venn06-Blue.png \
- Venn07-Blue.emf \
- Venn08.png \
-))
-
-# vim: set noet sw=4 ts=4: \
diff --git a/extras/Package_galleducation.mk b/extras/Package_galleducation.mk
deleted file mode 100644
index d1f8d3e..0000000
--- a/extras/Package_galleducation.mk
+++ /dev/null
@@ -1,30 +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_Package_Package,extras_galleducation,$(SRCDIR)/extras/source/gallery/education))
-
-$(eval $(call gb_Package_set_outdir,extras_galleducation,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files,extras_galleducation,share/gallery/education,\
- Blackboard.png \
- Books.png \
- Chalk.png \
- Globe.png \
- Glue.png \
- GraduationCap.png \
- Microscope.png \
- Notebook.png \
- PaperClip-Blue.png \
- PaperClip-Red.png \
- Pencil.png \
- Ruler.png \
- TestTubes.png \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_gallenvironment.mk b/extras/Package_gallenvironment.mk
deleted file mode 100644
index 2402180..0000000
--- a/extras/Package_gallenvironment.mk
+++ /dev/null
@@ -1,42 +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_Package_Package,extras_gallenvironment,$(SRCDIR)/extras/source/gallery/environment))
-
-$(eval $(call gb_Package_set_outdir,extras_gallenvironment,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files,extras_gallenvironment,share/gallery/environment,\
- DrippingFaucet.png \
- Earth.png \
- EndangeredAnimals1.png \
- EndangeredAnimals2.png \
- GreenCar.png \
- GreenFactory.png \
- GreenHouse.png \
- Leaf1.png \
- Leaf2.png \
- LightBulb-Flourescent-Off.png \
- LightBulb-Flourescent-On.png \
- LightBulb-Standard-Off1.png \
- LightBulb-Standard-Off2.png \
- LightBulb-Standard-On.png \
- Pollution-Car.png \
- Pollution-Factory.png \
- Raindrop.png \
- RecycleBin.png \
- RecycleSymbol.png \
- RenewableEnergy-Solar.png \
- RenewableEnergySymbol.png \
- RenewableEnergy-Water.png \
- RenewableEnergy-Wind.png \
- Sun1.png \
- Sun2.png \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_gallfinance.mk b/extras/Package_gallfinance.mk
deleted file mode 100644
index d00ebea..0000000
--- a/extras/Package_gallfinance.mk
+++ /dev/null
@@ -1,59 +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_Package_Package,extras_gallfinance,$(SRCDIR)/extras/source/gallery/finance))
-
-$(eval $(call gb_Package_set_outdir,extras_gallfinance,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files,extras_gallfinance,share/gallery/finance,\
- Agreement.png \
- ATM01.png \
- ATM02.png \
- Balance-Balanced1.png \
- Balance-Balanced2.png \
- Balance-Unbalanced1.png \
- Balance-Unbalanced2.png \
- Calculator.png \
- Chart-Decrease1.png \
- Chart-Decrease2.png \
- Chart-Increase1.png \
- Chart-Increase2.png \
- Chart-Plateau.png \
- Check.png \
- Contract.png \
- CreditCard-Black.png \
- CreditCard-Cut.png \
- CreditCard-Gold.png \
- Currency-Dollar.png \
- Currency-Dollars.png \
- Currency-StackCoins.png \
- Currency-Stack.png \
- GoldBar.png \
- GoldBar-Stack.png \
- MoneyBag01.png \
- MoneyBag02.png \
- PercentSign.png \
- PiggyBank01-Broken.png \
- PiggyBank02-Broken.png \
- PiggyBank-Coins.png \
- PiggyBank-Currency.png \
- Portfolio.png \
- PriceTag.png \
- Safe-Closed.png \
- Safe-Empty.png \
- Safe-Full.png \
- Seal-Gold.png \
- Seal-Red.png \
- Seal-Silver.png \
- Wallet-Empty.png \
- Wallet-Full1.png \
- Wallet-Full2.png \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_gallmytheme.mk b/extras/Package_gallmytheme.mk
index 0b56289..4d46098 100644
--- a/extras/Package_gallmytheme.mk
+++ b/extras/Package_gallmytheme.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,extras_gallmytheme,$(SRCDIR)/extras/source/gallery/gallery_sound))
+$(eval $(call gb_Package_Package,extras_gallmytheme,$(SRCDIR)/extras/source/gallery/gallery_mytheme))
$(eval $(call gb_Package_set_outdir,extras_gallmytheme,$(INSTDIR)))
diff --git a/extras/Package_gallpeople.mk b/extras/Package_gallpeople.mk
deleted file mode 100644
index be373bb..0000000
--- a/extras/Package_gallpeople.mk
+++ /dev/null
@@ -1,69 +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_Package_Package,extras_gallpeople,$(SRCDIR)/extras/source/gallery/people))
-
-$(eval $(call gb_Package_set_outdir,extras_gallpeople,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files,extras_gallpeople,share/gallery/people,\
- Artist-Female1.png \
- Artist-Female2.png \
- Artist-Male1.png \
- Artist-Male2.png \
- BusinessPerson-Female1.png \
- BusinessPerson-Female2.png \
- BusinessPerson-Female3.png \
- BusinessPerson-Female4.png \
- BusinessPerson-Female5.png \
- BusinessPerson-Female6.png \
- BusinessPerson-HeadSet1.png \
- BusinessPerson-HeadSet2.png \
- BusinessPerson-Male1.png \
- BusinessPerson-Male2.png \
- BusinessPerson-Male3.png \
- BusinessPerson-Male4.png \
- BusinessPerson-Male5.png \
- BusinessPerson-Male6.png \
- Chef1.png \
- Chef2.png \
- Computer-User-Female1.png \
- Computer-User-Female2.png \
- Computer-User-Male1.png \
- Computer-User-Male2.png \
- ConstructionWorker2.png \
- ConstructionWorker.png \
- Detective1.png \
- Detective2.png \
- Doctor-Female1.png \
- Doctor-Female2.png \
- Doctor-Male1.png \
- Doctor-Male2.png \
- Nurse1.png \
- Nurse2.png \
- PoliceOfficer1.png \
- PoliceOfficer2.png \
- Presenter-Female1.png \
- Presenter-Female2.png \
- Presenter-Male1.png \
- Presenter-Male2.png \
- Student-Female.png \
- Student-Male.png \
- Surgeon1.png \
- Surgeon2.png \
- Surgeon-Female1.png \
- Surgeon-Female2.png \
- Teacher1.png \
- Teacher2.png \
- Tourist-Female1.png \
- Tourist-Female2.png \
- Tourist-Male1.png \
- Tourist-Male2.png \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_gallsymbols.mk b/extras/Package_gallsymbols.mk
deleted file mode 100644
index 36b74bb..0000000
--- a/extras/Package_gallsymbols.mk
+++ /dev/null
@@ -1,107 +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_Package_Package,extras_gallsymbols,$(SRCDIR)/extras/source/gallery/symbols))
-
-$(eval $(call gb_Package_set_outdir,extras_gallsymbols,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files,extras_gallsymbols,share/gallery/symbols,\
- Book.png \
- Box01.png \
- Box02.png \
- Bulb01-Yellow.png \
- Bulb02-Yellow.png \
- Calendar.png \
- Chart.png \
- Clipboard.png \
- Clock.png \
- Compass.png \
- Emotion01-Laughing.png \
- Emotion02-Smiling.png \
- Emotion03-Calm.png \
- Emotion04-Frowning.png \
- Emotion05-Angry.png \
- Emotion06-Crying.png \
- Flag01-Red.png \
- Flag02-Green.png \
- Flag03-Blue.png \
- Gift.png \
- House.png \
- Icon-Computer01-White.png \
- Icon-Computer02-Black.png \
- Icon-Disk01-Blue.png \
- Icon-Disk02-Green.png \
- Icon-Document01-Grey.png \
- Icon-Document02-Grey.png \
- Icon-Document03-Blue.png \
- Icon-Document04-Blue.png \
- Icon-Envelope01-Blue.png \
- Icon-Envelope02-Yellow.png \
- Icon-Envelope03-Open-Yellow.png \
- Icon-Envelope04-Open-Yellow.png \
- Icon-Folder01-Yellow.png \
- Icon-Folder02-Yellow.png \
- Icon-Folder03-Open-Yellow.png \
- Icon-Folder04-Open-Yellow.png \
- Icon-Gear01-Grey.png \
- Icon-Gear02-Blue.png \
- Icon-Network01-Blue.png \
- Icon-Network02.png \
- Icon-Pencil01.png \
- Icon-Pencil02.png \
- Icon-Printer01-White.png \
- Icon-Printer02-Black.png \
- Key01.png \
- Key02.png \
- Lock01-Yellow.png \
- Lock02-Yellow.png \
- Lock03-Blue.png \
- Lock04-Blue.png \
- Magnet.png \
- MagnifyingGlass.png \
- Medal.png \
- Notebook.png \
- Phone.png \
- PieChart.png \
- Pin.png \
- PuzzlePiece.png \
- PuzzlePieces.png \
- Roadblock.png \
- Scissors.png \
- Shield01.png \
- Shield02-Orange.png \
- Shield03-Blue.png \
- Sign-Ban01.png \
- Sign-Ban02.png \
- Sign-CheckBox01.png \
- Sign-CheckBox02-Unchecked.png \
- Sign-Checkmark01-Green.png \
- Sign-Checkmark02-Green.png \
- Sign-DoNotEnter.png \
- Sign-Error01.png \
- Sign-Error02.png \
- Sign-ExclamationPoint01-Red.png \
- Sign-ExclamationPoint02-Orange.png \
- Sign-Help01-Green.png \
- Sign-Help02-Blue.png \
- Sign-Information.png \
- Sign-Null.png \
- Sign-QuestionMark01-Blue.png \
- Sign-QuestionMark02-Red.png \
- Sign-RadioButton01.png \
- Sign-RadioButton02-Unchecked.png \
- Sign-Warning01-Red.png \
- Sign-Warning02-Orange.png \
- Sign-X01-Red.png \
- Sign-X02-Red.png \
- Star-Yellow.png \
- Wrench.png \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk
index eaf9254..9214ba2 100644
--- a/extras/Package_gallsystem.mk
+++ b/extras/Package_gallsystem.mk
@@ -21,30 +21,6 @@ $(eval $(call gb_Package_add_files,extras_gallsystem,share/gallery,\
sg4.sdg \
sg4.sdv \
sg4.thm \
- sg10.sdg \
- sg10.sdv \
- sg10.thm \
- sg11.sdg \
- sg11.sdv \
- sg11.thm \
- sg12.sdg \
- sg12.sdv \
- sg12.thm \
- sg13.sdg \
- sg13.sdv \
- sg13.thm \
- sg14.sdg \
- sg14.sdv \
- sg14.thm \
- sg15.sdg \
- sg15.sdv \
- sg15.thm \
- sg16.sdg \
- sg16.sdv \
- sg16.thm \
- sg17.sdg \
- sg17.sdv \
- sg17.thm \
sg24.sdg \
sg24.sdv \
sg24.thm \
diff --git a/extras/source/gallery/arrows/arrows.str b/extras/source/gallery/arrows/arrows.str
new file mode 100644
index 0000000..bae770e
--- /dev/null
+++ b/extras/source/gallery/arrows/arrows.str
@@ -0,0 +1,2 @@
+# Translated by desktop-translate and ulfex
+name = "see extras/source/gallery/share/gallery_names.ulf"
diff --git a/extras/source/gallery/computers/computers.str b/extras/source/gallery/computers/computers.str
new file mode 100644
index 0000000..bae770e
--- /dev/null
+++ b/extras/source/gallery/computers/computers.str
@@ -0,0 +1,2 @@
+# Translated by desktop-translate and ulfex
+name = "see extras/source/gallery/share/gallery_names.ulf"
diff --git a/extras/source/gallery/diagrams/diagrams.str b/extras/source/gallery/diagrams/diagrams.str
new file mode 100644
index 0000000..bae770e
--- /dev/null
+++ b/extras/source/gallery/diagrams/diagrams.str
@@ -0,0 +1,2 @@
+# Translated by desktop-translate and ulfex
+name = "see extras/source/gallery/share/gallery_names.ulf"
diff --git a/extras/source/gallery/education/education.str b/extras/source/gallery/education/education.str
new file mode 100644
index 0000000..bae770e
--- /dev/null
+++ b/extras/source/gallery/education/education.str
@@ -0,0 +1,2 @@
+# Translated by desktop-translate and ulfex
+name = "see extras/source/gallery/share/gallery_names.ulf"
diff --git a/extras/source/gallery/environment/environment.str b/extras/source/gallery/environment/environment.str
new file mode 100644
index 0000000..bae770e
--- /dev/null
+++ b/extras/source/gallery/environment/environment.str
@@ -0,0 +1,2 @@
+# Translated by desktop-translate and ulfex
+name = "see extras/source/gallery/share/gallery_names.ulf"
diff --git a/extras/source/gallery/finance/finance.str b/extras/source/gallery/finance/finance.str
new file mode 100644
index 0000000..bae770e
--- /dev/null
+++ b/extras/source/gallery/finance/finance.str
@@ -0,0 +1,2 @@
+# Translated by desktop-translate and ulfex
+name = "see extras/source/gallery/share/gallery_names.ulf"
diff --git a/extras/source/gallery/gallery_sound/sg30.sdv b/extras/source/gallery/gallery_mytheme/sg30.sdv
similarity index 100%
rename from extras/source/gallery/gallery_sound/sg30.sdv
rename to extras/source/gallery/gallery_mytheme/sg30.sdv
diff --git a/extras/source/gallery/gallery_sound/sg30.thm b/extras/source/gallery/gallery_mytheme/sg30.thm
similarity index 100%
rename from extras/source/gallery/gallery_sound/sg30.thm
rename to extras/source/gallery/gallery_mytheme/sg30.thm
diff --git a/extras/source/gallery/gallery_sound/sg100.sdv b/extras/source/gallery/gallery_sound/sg100.sdv
deleted file mode 100644
index fc17dd9..0000000
Binary files a/extras/source/gallery/gallery_sound/sg100.sdv and /dev/null differ
diff --git a/extras/source/gallery/gallery_sound/sg100.thm b/extras/source/gallery/gallery_sound/sg100.thm
deleted file mode 100644
index 0571a19..0000000
Binary files a/extras/source/gallery/gallery_sound/sg100.thm and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg10.sdg b/extras/source/gallery/gallery_system/sg10.sdg
deleted file mode 100755
index 93be5e2..0000000
Binary files a/extras/source/gallery/gallery_system/sg10.sdg and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg10.sdv b/extras/source/gallery/gallery_system/sg10.sdv
deleted file mode 100755
index fc17dd9..0000000
Binary files a/extras/source/gallery/gallery_system/sg10.sdv and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg10.thm b/extras/source/gallery/gallery_system/sg10.thm
deleted file mode 100755
index 9fc0921..0000000
Binary files a/extras/source/gallery/gallery_system/sg10.thm and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg11.sdg b/extras/source/gallery/gallery_system/sg11.sdg
deleted file mode 100755
index 2bcac97..0000000
Binary files a/extras/source/gallery/gallery_system/sg11.sdg and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg11.sdv b/extras/source/gallery/gallery_system/sg11.sdv
deleted file mode 100755
index 4449591..0000000
Binary files a/extras/source/gallery/gallery_system/sg11.sdv and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg11.thm b/extras/source/gallery/gallery_system/sg11.thm
deleted file mode 100755
index 1799a1c..0000000
Binary files a/extras/source/gallery/gallery_system/sg11.thm and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg12.sdg b/extras/source/gallery/gallery_system/sg12.sdg
deleted file mode 100755
index c5467b3..0000000
Binary files a/extras/source/gallery/gallery_system/sg12.sdg and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg12.sdv b/extras/source/gallery/gallery_system/sg12.sdv
deleted file mode 100755
index 4449591..0000000
Binary files a/extras/source/gallery/gallery_system/sg12.sdv and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg12.thm b/extras/source/gallery/gallery_system/sg12.thm
deleted file mode 100755
index b5bf69e..0000000
Binary files a/extras/source/gallery/gallery_system/sg12.thm and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg13.sdg b/extras/source/gallery/gallery_system/sg13.sdg
deleted file mode 100755
index 32a7465..0000000
Binary files a/extras/source/gallery/gallery_system/sg13.sdg and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg13.sdv b/extras/source/gallery/gallery_system/sg13.sdv
deleted file mode 100755
index fc17dd9..0000000
Binary files a/extras/source/gallery/gallery_system/sg13.sdv and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg13.thm b/extras/source/gallery/gallery_system/sg13.thm
deleted file mode 100755
index ca42be1..0000000
Binary files a/extras/source/gallery/gallery_system/sg13.thm and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg14.sdg b/extras/source/gallery/gallery_system/sg14.sdg
deleted file mode 100755
index f96aced..0000000
Binary files a/extras/source/gallery/gallery_system/sg14.sdg and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg14.sdv b/extras/source/gallery/gallery_system/sg14.sdv
deleted file mode 100755
index 4449591..0000000
Binary files a/extras/source/gallery/gallery_system/sg14.sdv and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg14.thm b/extras/source/gallery/gallery_system/sg14.thm
deleted file mode 100755
index 0001b1f..0000000
Binary files a/extras/source/gallery/gallery_system/sg14.thm and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg15.sdg b/extras/source/gallery/gallery_system/sg15.sdg
deleted file mode 100755
index 2c36e8d..0000000
Binary files a/extras/source/gallery/gallery_system/sg15.sdg and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg15.sdv b/extras/source/gallery/gallery_system/sg15.sdv
deleted file mode 100755
index 4449591..0000000
Binary files a/extras/source/gallery/gallery_system/sg15.sdv and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg15.thm b/extras/source/gallery/gallery_system/sg15.thm
deleted file mode 100755
index ef153e2..0000000
Binary files a/extras/source/gallery/gallery_system/sg15.thm and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg16.sdg b/extras/source/gallery/gallery_system/sg16.sdg
deleted file mode 100755
index 93a399a..0000000
Binary files a/extras/source/gallery/gallery_system/sg16.sdg and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg16.sdv b/extras/source/gallery/gallery_system/sg16.sdv
deleted file mode 100755
index 4449591..0000000
Binary files a/extras/source/gallery/gallery_system/sg16.sdv and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg16.thm b/extras/source/gallery/gallery_system/sg16.thm
deleted file mode 100755
index dfbae85..0000000
Binary files a/extras/source/gallery/gallery_system/sg16.thm and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg17.sdg b/extras/source/gallery/gallery_system/sg17.sdg
deleted file mode 100755
index 5986dba..0000000
Binary files a/extras/source/gallery/gallery_system/sg17.sdg and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg17.sdv b/extras/source/gallery/gallery_system/sg17.sdv
deleted file mode 100755
index fc17dd9..0000000
Binary files a/extras/source/gallery/gallery_system/sg17.sdv and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg17.thm b/extras/source/gallery/gallery_system/sg17.thm
deleted file mode 100755
index 774e310..0000000
Binary files a/extras/source/gallery/gallery_system/sg17.thm and /dev/null differ
diff --git a/extras/source/gallery/people/people.str b/extras/source/gallery/people/people.str
new file mode 100644
index 0000000..bae770e
--- /dev/null
+++ b/extras/source/gallery/people/people.str
@@ -0,0 +1,2 @@
+# Translated by desktop-translate and ulfex
+name = "see extras/source/gallery/share/gallery_names.ulf"
diff --git a/extras/source/gallery/share/gallery_names.ulf b/extras/source/gallery/share/gallery_names.ulf
index 2c95acb..6d8cd456 100644
--- a/extras/source/gallery/share/gallery_names.ulf
+++ b/extras/source/gallery/share/gallery_names.ulf
@@ -6,9 +6,34 @@
* 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/.
*/
+
+[arrows]
+en-US = "Arrows"
+
+[computers]
+en-US = "Computers"
+
+[diagrams]
+en-US = "Diagrams"
+
+[education]
+en-US = "School & University"
+
+[environment]
+en-US = "Environment"
+
+[finance]
+en-US = "Finance"
+
+[people]
+en-US = "People"
+
[sound]
en-US = "Sounds"
+[symbols]
+en-US = "Symbols"
+
[txtshapes]
en-US = "Text Shapes"
diff --git a/extras/source/gallery/symbols/symbols.str b/extras/source/gallery/symbols/symbols.str
new file mode 100644
index 0000000..bae770e
--- /dev/null
+++ b/extras/source/gallery/symbols/symbols.str
@@ -0,0 +1,2 @@
+# Translated by desktop-translate and ulfex
+name = "see extras/source/gallery/share/gallery_names.ulf"
diff --git a/extras/source/gallery/transportation/transportation.str b/extras/source/gallery/transportation/transportation.str
new file mode 100644
index 0000000..bae770e
--- /dev/null
+++ b/extras/source/gallery/transportation/transportation.str
@@ -0,0 +1,2 @@
+# Translated by desktop-translate and ulfex
+name = "see extras/source/gallery/share/gallery_names.ulf"
diff --git a/extras/source/gallery/txtshapes/txtshapes.str b/extras/source/gallery/txtshapes/txtshapes.str
new file mode 100644
index 0000000..bae770e
--- /dev/null
+++ b/extras/source/gallery/txtshapes/txtshapes.str
@@ -0,0 +1,2 @@
+# Translated by desktop-translate and ulfex
+name = "see extras/source/gallery/share/gallery_names.ulf"
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 5b143f7..f8aa148 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -161,65 +161,17 @@ File gid_File_Extra_Gallroot
Name = "extras_gallroot.filelist";
End
-File gid_File_Extra_Gallarrows
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_gallarrows.filelist";
-End
-
-File gid_File_Extra_Gallcomputers
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_gallcomputers.filelist";
-End
-
-File gid_File_Extra_Galldiagrams
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_galldiagrams.filelist";
-End
-
-File gid_File_Extra_Galleducation
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_galleducation.filelist";
-End
-
-File gid_File_Extra_Gallenvironment
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_gallenvironment.filelist";
-End
-
-File gid_File_Extra_Gallfinance
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_gallfinance.filelist";
-End
-
-File gid_File_Extra_Gallpeople
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_gallpeople.filelist";
-End
-
-File gid_File_Extra_Gallsymbols
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_gallsymbols.filelist";
-End
-
+GALLERY_FILELIST(arrows)
+GALLERY_FILELIST(computers)
+GALLERY_FILELIST(diagrams)
+GALLERY_FILELIST(education)
+GALLERY_FILELIST(environment)
+GALLERY_FILELIST(finance)
+GALLERY_FILELIST(people)
+GALLERY_FILELIST(sound)
+GALLERY_FILELIST(symbols)
GALLERY_FILELIST(transportation)
GALLERY_FILELIST(txtshapes)
-GALLERY_FILELIST(sound)
File gid_File_Extra_Gallmytheme
Dir = FILELIST_DIR;
@@ -228,13 +180,6 @@ File gid_File_Extra_Gallmytheme
Name = "extras_gallmytheme.filelist";
End
-File gid_File_Extra_Gallsounds
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_gallsounds.filelist";
-End
-
File gid_File_Extra_Gallsystem
Dir = FILELIST_DIR;
TXT_FILE_BODY;
commit d7f7a6de9c8a854af7b2997ccfff30e921cacb69
Author: Michael Meeks <michael.meeks at suse.com>
Date: Tue May 14 12:20:19 2013 +0100
linkoo - link instset into install
Change-Id: I9f1c340562030bccbe0627ba9e91a56e1611b64e
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index e7c0dca..297ad5f 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -146,6 +146,13 @@ my %replaceable = (
# 'share/uno_packages' => '\.zip$'
);
+my @instdir_replaceable = (
+ 'share',
+ 'program',
+# 'presets', # leave these guys alone for now
+ 'help',
+);
+
my @search_dirs = ( 'lib', 'bin', 'class' );
my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm', 'libsqlite3', 'libnssutil3', 'pythonloader.uno', 'pyuno', 'libpyuno' );
@@ -520,6 +527,46 @@ sub link_rdb_files()
print "\n";
}
+# instdir is an internal directory in the build tree
+# installdir is the directory we installed into.
+sub do_recursive_link($$)
+{
+ my ($instdir, $installdir) = @_;
+
+ (-d $installdir && -d $instdir) || die "not directories";
+
+ my $dirhandle;
+ if (opendir ($dirhandle, $instdir)) {
+ while (my $fname = readdir ($dirhandle)) {
+ $fname =~ /^\./ && next;
+ if (-d "$instdir/$fname") {
+ if (-d "$installdir/$fname") {
+ do_recursive_link("$instdir/$fname", "$installdir/$fname");
+ } else {
+ print STDERR "mismatching directories $instdir/$fname vs. $installdir/$fname\n";
+ }
+ } elsif (-f "$installdir/$fname") {
+ do_link ($instdir, $installdir, $fname, $fname, 0);
+ } else {
+ print STDERR "Warning: odd file type for $instdir/$fname\n";
+ }
+ }
+ } else {
+ print STDERR "Couldn't scan '$instdir': $!";
+ }
+}
+
+sub link_instdir($$)
+{
+ my ($instdir, $installdir) = @_;
+
+ print "linking instdir ...\n";
+ for my $dir (@instdir_replaceable) {
+# include target ...
+ do_recursive_link("$instdir/$dir", "$installdir/$dir");
+ }
+}
+
evilness ('undo');
my $installed_files = build_installed_list ($OOO_INSTALL);
@@ -529,6 +576,7 @@ link_gdb_py();
link_pagein_files();
link_ui_files();
link_rdb_files();
+link_instdir("$OOO_BUILD/instdir/$TARGET", $OOO_INSTALL);
if (!-f "$OOO_INSTALL/" . $brand_program_dir . "/ooenv") {
my $ooenv;
commit 324cae2f713e6a192d8cd34c276c73634b5111e4
Author: Michael Meeks <michael.meeks at suse.com>
Date: Mon May 13 22:33:03 2013 +0100
gallery: cleanup scaling code.
Change-Id: I783b0fe54c6273ce3d78996a02da02dc51944606
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index d743ac8..dc5b441 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -127,7 +127,6 @@ gb_Package_OUTDIR_$(1) := $(2)
endef
define gb_Package_add_file
-$(info gb_Package_add_file,$(1), $(2), $(3), $(4))
$(call gb_Package__check,$(1))
$(if $(strip $(3)),,$(call gb_Output_error,gb_Package_add_file requires 3 arguments))
$(call gb_Package_get_target,$(1)) : $$(gb_Package_OUTDIR_$(1))/$(2)
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 462d8cc..573dcf6 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -99,7 +99,6 @@ sal_Bool SgaObject::CreateThumb( const Graphic& rGraphic )
const float fFactor = (float) aBmpSize.Width() / aBmpSize.Height();
const Size aNewSize( std::max( (long) (fFactor < 1. ? S_THUMB * fFactor : S_THUMB), 8L ),
std::max( (long) (fFactor < 1. ? S_THUMB : S_THUMB / fFactor), 8L ) );
-
if(aThumbBmp.Scale(
(double) aNewSize.Width() / aBmpSize.Width(),
(double) aNewSize.Height() / aBmpSize.Height(),
commit b54709dd2ccf9017c3f359b25ff72c038b471ded
Author: Michael Meeks <michael.meeks at suse.com>
Date: Mon May 13 21:20:00 2013 +0100
remove pre-compiled textshapes and transportation galleries.
Further gnumake fixups, package the files in the Gallery rules.
Change-Id: Icda2de9cfcd2ff573db2e9ab27e2670dcfa5f0a8
diff --git a/extras/Gallery_sound.mk b/extras/Gallery_sound.mk
index 358da05..b48a2f0 100644
--- a/extras/Gallery_sound.mk
+++ b/extras/Gallery_sound.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_Gallery_Gallery,sound,extras/source/gallery/sounds))
-$(eval $(call gb_Gallery_add_files,sound,\
+$(eval $(call gb_Gallery_add_files,sound,share/gallery/sounds,\
extras/source/gallery/sounds/apert2.wav \
extras/source/gallery/sounds/apert.wav \
extras/source/gallery/sounds/applause.wav \
diff --git a/extras/Gallery_transportation.mk b/extras/Gallery_transportation.mk
index 8b84c96..605782f 100644
--- a/extras/Gallery_transportation.mk
+++ b/extras/Gallery_transportation.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Gallery_Gallery,transportation,extras/source/gallery/transportation))
-$(eval $(call gb_Gallery_add_files,transportation,\
+$(eval $(call gb_Gallery_add_files,transportation,share/gallery/transportation,\
extras/source/gallery/transportation/Airplane-Blue.png \
extras/source/gallery/transportation/Bicycle-Blue.png \
extras/source/gallery/transportation/Boat.png \
diff --git a/extras/Gallery_txtshapes.mk b/extras/Gallery_txtshapes.mk
index 85645a5..df8bc3a 100644
--- a/extras/Gallery_txtshapes.mk
+++ b/extras/Gallery_txtshapes.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Gallery_Gallery,txtshapes,extras/source/gallery/txtshapes))
-$(eval $(call gb_Gallery_add_files,txtshapes,\
+$(eval $(call gb_Gallery_add_files,txtshapes,share/gallery/txtshapes,\
extras/source/gallery/txtshapes/Circle01-DarkBlue.png \
extras/source/gallery/txtshapes/Circle02-LightBlue.png \
extras/source/gallery/txtshapes/Circle03-Green.png \
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 3551ce0..a92c307 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Module_add_targets,extras,\
Package_gallmytheme \
Package_gallpeople \
Package_gallroot \
- Package_gallsounds \
Package_gallsymbols \
Package_gallsystem \
Package_gallwwwback \
diff --git a/extras/Package_gallsounds.mk b/extras/Package_gallsounds.mk
deleted file mode 100644
index 61a093f..0000000
--- a/extras/Package_gallsounds.mk
+++ /dev/null
@@ -1,52 +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_Package_Package,extras_gallsounds,$(SRCDIR)/extras/source/gallery/sounds))
-
-$(eval $(call gb_Package_set_outdir,extras_gallsounds,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files,extras_gallsounds,share/gallery/sounds,\
- apert2.wav \
- apert.wav \
- applause.wav \
- beam2.wav \
- beam.wav \
- cow.wav \
- curve.wav \
- drama.wav \
- explos.wav \
- falling.wav \
- glasses.wav \
- gong.wav \
- horse.wav \
- kling.wav \
- kongas.wav \
- laser.wav \
- left.wav \
- nature1.wav \
- nature2.wav \
- ok.wav \
- pluck.wav \
- roll.wav \
- romans.wav \
- soft.wav \
- space2.wav \
- space3.wav \
- space.wav \
- sparcle.wav \
- strom.wav \
- theetone.wav \
- top.wav \
- train.wav \
- untie.wav \
- ups.wav \
- wallewal.wav \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk
index 441dbfd..eaf9254 100644
--- a/extras/Package_gallsystem.mk
+++ b/extras/Package_gallsystem.mk
@@ -45,12 +45,6 @@ $(eval $(call gb_Package_add_files,extras_gallsystem,share/gallery,\
sg17.sdg \
sg17.sdv \
sg17.thm \
- sg18.sdg \
- sg18.sdv \
- sg18.thm \
- sg19.sdg \
- sg19.sdv \
- sg19.thm \
sg24.sdg \
sg24.sdv \
sg24.thm \
diff --git a/extras/source/gallery/gallery_system/sg18.sdg b/extras/source/gallery/gallery_system/sg18.sdg
deleted file mode 100755
index fb0bf91..0000000
Binary files a/extras/source/gallery/gallery_system/sg18.sdg and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg18.sdv b/extras/source/gallery/gallery_system/sg18.sdv
deleted file mode 100755
index 4449591..0000000
Binary files a/extras/source/gallery/gallery_system/sg18.sdv and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg18.thm b/extras/source/gallery/gallery_system/sg18.thm
deleted file mode 100755
index 4683a2f..0000000
Binary files a/extras/source/gallery/gallery_system/sg18.thm and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg19.sdg b/extras/source/gallery/gallery_system/sg19.sdg
deleted file mode 100755
index c140012..0000000
Binary files a/extras/source/gallery/gallery_system/sg19.sdg and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg19.sdv b/extras/source/gallery/gallery_system/sg19.sdv
deleted file mode 100755
index 4449591..0000000
Binary files a/extras/source/gallery/gallery_system/sg19.sdv and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg19.thm b/extras/source/gallery/gallery_system/sg19.thm
deleted file mode 100755
index 6aa8926..0000000
Binary files a/extras/source/gallery/gallery_system/sg19.thm and /dev/null differ
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 3b0bcce..066354e 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -430,6 +430,12 @@ File gid_File_Extra_Gall##id \
TXT_FILE_BODY; \
Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); \
Name = STRING(CONCAT3(Gallery/,id,.filelist)); \
+End \
+File gid_File_Extra_GallFiles##id \
+ Dir = FILELIST_DIR; \
+ TXT_FILE_BODY; \
+ Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); \
+ Name = STRING(CONCAT3(Gallery/Files/,id,.filelist)); \
End
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 7b28238..19b79b3 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -95,7 +95,10 @@ $(call gb_Gallery_get_clean_target,%) :
$(call gb_Gallery_get_workdir,$*) \
)
+# the theme package
gb_Gallery_get_packagename = Gallery/$(1)
+# the files package
+gb_Gallery_get_files_packagename = Gallery/Files/$(1)
# Create a gallery.
#
@@ -106,6 +109,10 @@ gb_Gallery_get_packagename = Gallery/$(1)
define gb_Gallery_Gallery
$(call gb_Gallery__Gallery_impl,$(1),$(call gb_Gallery_get_packagename,$(1)),$(2),$(3))
+# setup the files package - we install all of these too
+$(call gb_Package_Package_internal,$(call gb_Gallery_get_files_packagename,$(1)),$(SRCDIR)/$(2))
+$(call gb_Package_set_outdir,$(call gb_Gallery_get_files_packagename,$(1)),$(INSTDIR))
+
endef
@@ -129,6 +136,7 @@ $(call gb_Gallery_get_workdir,$(1))/$(1).sdg \
$(call gb_Gallery_get_workdir,$(1))/$(1).sdv \
$(call gb_Gallery_get_workdir,$(1))/$(1).thm : $(call gb_Gallery_get_target,$(1))
$(call gb_Gallery__get_final_target,$(1)) : $(call gb_Package_get_target,$(2))
+
$(call gb_Gallery_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(2))
$(call gb_Gallery_get_target,$(1)) :| $(dir $(call gb_Gallery_get_target,$(1))).dir \
$(call gb_Gallery_get_workdir,$(1))/.dir
@@ -169,8 +177,9 @@ endef
#
# gb_Gallery_add_file gallery file
define gb_Gallery_add_file
-$(call gb_Gallery_get_target,$(1)) : $(SRCDIR)/$(2)
-$(call gb_Gallery_get_target,$(1)) : GALLERY_FILES += $(call gb_Helper_make_url,$(SRCDIR)/$(2))
+$(call gb_Gallery_get_target,$(1)) : $(SRCDIR)/$(3)
+$(call gb_Gallery_get_target,$(1)) : GALLERY_FILES += $(call gb_Helper_make_url,$(SRCDIR)/$(3))
+$(call gb_Package_add_file,$(call gb_Gallery_get_files_packagename,$(1)),$(2)/$(notdir $(3)),$(notdir $(3)))
endef
@@ -180,7 +189,7 @@ endef
#
# gb_Gallery_add_files gallery file(s)
define gb_Gallery_add_files
-$(foreach fname,$(2),$(call gb_Gallery_add_file,$(1),$(fname)))
+$(foreach fname,$(3),$(call gb_Gallery_add_file,$(1),$(2),$(fname)))
endef
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index dc5b441..d743ac8 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -127,6 +127,7 @@ gb_Package_OUTDIR_$(1) := $(2)
endef
define gb_Package_add_file
+$(info gb_Package_add_file,$(1), $(2), $(3), $(4))
$(call gb_Package__check,$(1))
$(if $(strip $(3)),,$(call gb_Output_error,gb_Package_add_file requires 3 arguments))
$(call gb_Package_get_target,$(1)) : $$(gb_Package_OUTDIR_$(1))/$(2)
commit 857a8b9566f7c50b734d6c312809391e94c43967
Author: Michael Meeks <michael.meeks at suse.com>
Date: Mon May 13 18:05:06 2013 +0100
migrate transportation gallery.
Change-Id: Idec88df28724bcf4b3145bb169fa0fe08a8e282a
diff --git a/extras/Gallery_transportation.mk b/extras/Gallery_transportation.mk
new file mode 100644
index 0000000..8b84c96
--- /dev/null
+++ b/extras/Gallery_transportation.mk
@@ -0,0 +1,29 @@
+# -*- 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,transportation,extras/source/gallery/transportation))
+
+$(eval $(call gb_Gallery_add_files,transportation,\
+ extras/source/gallery/transportation/Airplane-Blue.png \
+ extras/source/gallery/transportation/Bicycle-Blue.png \
+ extras/source/gallery/transportation/Boat.png \
+ extras/source/gallery/transportation/Bus.png \
+ extras/source/gallery/transportation/Canoe-Blue.png \
+ extras/source/gallery/transportation/Car-Red.png \
+ extras/source/gallery/transportation/Helicopter-Blue.png \
+ extras/source/gallery/transportation/Motorcycle-Red.png \
+ extras/source/gallery/transportation/Pedestrian-Blue.png \
+ extras/source/gallery/transportation/PersonalTransporter-Green.png \
+ extras/source/gallery/transportation/Sailboat-Red.png \
+ extras/source/gallery/transportation/Scooter-Orange.png \
+ extras/source/gallery/transportation/Train-Red.png \
+ extras/source/gallery/transportation/Truck-Blue.png \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index f830186..3551ce0 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Module_add_targets,extras,\
Package_gallsounds \
Package_gallsymbols \
Package_gallsystem \
- Package_galltransport \
Package_gallwwwback \
Package_gallwwwgraf \
Package_glade \
@@ -57,6 +56,7 @@ ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,extras,\
Gallery_sound \
Gallery_txtshapes \
+ Gallery_transportation \
))
endif
diff --git a/extras/Package_galltransport.mk b/extras/Package_galltransport.mk
deleted file mode 100644
index 9ada8b2..0000000
--- a/extras/Package_galltransport.mk
+++ /dev/null
@@ -1,31 +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_Package_Package,extras_galltransport,$(SRCDIR)/extras/source/gallery/transportation))
-
-$(eval $(call gb_Package_set_outdir,extras_galltransport,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files,extras_galltransport,share/gallery/transport,\
- Airplane-Blue.png \
- Bicycle-Blue.png \
- Boat.png \
- Bus.png \
- Canoe-Blue.png \
- Car-Red.png \
- Helicopter-Blue.png \
- Motorcycle-Red.png \
- Pedestrian-Blue.png \
- PersonalTransporter-Green.png \
- Sailboat-Red.png \
- Scooter-Orange.png \
- Train-Red.png \
- Truck-Blue.png \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/source/gallery/share/gallery_names.ulf b/extras/source/gallery/share/gallery_names.ulf
index 35e3c49..2c95acb 100644
--- a/extras/source/gallery/share/gallery_names.ulf
+++ b/extras/source/gallery/share/gallery_names.ulf
@@ -12,4 +12,7 @@ en-US = "Sounds"
[txtshapes]
en-US = "Text Shapes"
+[transportation]
+en-US = "Transportation"
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extras/source/gallery/sounds/sound.str b/extras/source/gallery/sounds/sound.str
index fab10d3..bae770e 100644
--- a/extras/source/gallery/sounds/sound.str
+++ b/extras/source/gallery/sounds/sound.str
@@ -1,2 +1,2 @@
# Translated by desktop-translate and ulfex
-name = "Sounds"
+name = "see extras/source/gallery/share/gallery_names.ulf"
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index feb17f9..5b143f7 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -217,13 +217,7 @@ File gid_File_Extra_Gallsymbols
Name = "extras_gallsymbols.filelist";
End
-File gid_File_Extra_Galltransport
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_galltransport.filelist";
-End
-
+GALLERY_FILELIST(transportation)
GALLERY_FILELIST(txtshapes)
GALLERY_FILELIST(sound)
commit 9954b562939390feb728b911b300854cc9675997
Author: Michael Meeks <michael.meeks at suse.com>
Date: Mon May 13 17:56:35 2013 +0100
gallery: get windows gengal command-name right.
Change-Id: I488c57cfa58510e50b9b6819d55b23283aaddf49
diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk
index 51d8641..39dd1f5 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -10,8 +10,8 @@
ifeq (,$(filter WNT,$(OS)))
gb_GENGAL = gengal.bin
-else
- gb_GENGAL = gengal.exe
+else # windows appends the .exe
+ gb_GENGAL = gengal
endif
# Tools we need to build for cross-compiling
commit 5d5950a766311cac4c851744c6622f8ac525975f
Author: Michael Meeks <michael.meeks at suse.com>
Date: Mon May 13 17:52:18 2013 +0100
gallery: convert text-shapes to new build logic.
Change-Id: Ia45a2eed7104b376b92290e1a40219e8988d927b
diff --git a/extras/Gallery_txtshapes.mk b/extras/Gallery_txtshapes.mk
new file mode 100644
index 0000000..85645a5
--- /dev/null
+++ b/extras/Gallery_txtshapes.mk
@@ -0,0 +1,53 @@
+# -*- 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,txtshapes,extras/source/gallery/txtshapes))
+
+$(eval $(call gb_Gallery_add_files,txtshapes,\
+ extras/source/gallery/txtshapes/Circle01-DarkBlue.png \
+ extras/source/gallery/txtshapes/Circle02-LightBlue.png \
+ extras/source/gallery/txtshapes/Circle03-Green.png \
+ extras/source/gallery/txtshapes/Circle04-DarkRed.png \
+ extras/source/gallery/txtshapes/Circle05-Orange.png \
+ extras/source/gallery/txtshapes/Hexagon01-DarkBlue.png \
+ extras/source/gallery/txtshapes/Hexagon02-Blue.png \
+ extras/source/gallery/txtshapes/Hexagon03-Green.png \
+ extras/source/gallery/txtshapes/Hexagon04-DarkRed.png \
+ extras/source/gallery/txtshapes/Hexagon05-Orange.png \
+ extras/source/gallery/txtshapes/Leaf01-DarkBlue.png \
+ extras/source/gallery/txtshapes/Leaf02-LightBlue.png \
+ extras/source/gallery/txtshapes/Leaf03-Green.png \
+ extras/source/gallery/txtshapes/Leaf04-DarkRed.png \
+ extras/source/gallery/txtshapes/Leaf05-Orange.png \
+ extras/source/gallery/txtshapes/Paster01-DarkBlue.png \
+ extras/source/gallery/txtshapes/Paster02-LightBlue.png \
+ extras/source/gallery/txtshapes/Paster03-Green.png \
+ extras/source/gallery/txtshapes/Paster04-Red.png \
+ extras/source/gallery/txtshapes/Paster05-Orange.png \
+ extras/source/gallery/txtshapes/Rectangle01-DarkBlue.png \
+ extras/source/gallery/txtshapes/Rectangle02-LightBlue.png \
+ extras/source/gallery/txtshapes/Rectangle03-Green.png \
+ extras/source/gallery/txtshapes/Rectangle04-DarkRed.png \
+ extras/source/gallery/txtshapes/Rectangle05-Orange.png \
+ extras/source/gallery/txtshapes/Rectangle06-Striped-Blue.png \
+ extras/source/gallery/txtshapes/Rectangle07-Striped-Green.png \
+ extras/source/gallery/txtshapes/Rectangle08-Striped-Red.png \
+ extras/source/gallery/txtshapes/Rectangle09-Striped-Orange.png \
+ extras/source/gallery/txtshapes/Square01-DarkBlue.png \
+ extras/source/gallery/txtshapes/Square02-LightBlue.png \
+ extras/source/gallery/txtshapes/Square03-Green.png \
+ extras/source/gallery/txtshapes/Square04-DarkRed.png \
+ extras/source/gallery/txtshapes/Square05-Orange.png \
+ extras/source/gallery/txtshapes/Square06-Striped-Blue.png \
+ extras/source/gallery/txtshapes/Square07-Striped-Green.png \
+ extras/source/gallery/txtshapes/Square08-Striped-Red.png \
+ extras/source/gallery/txtshapes/Square09-Striped-Orange.png \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 82fc5ea..f830186 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Module_add_targets,extras,\
Package_gallsymbols \
Package_gallsystem \
Package_galltransport \
- Package_galltxtshapes \
Package_gallwwwback \
Package_gallwwwgraf \
Package_glade \
@@ -57,6 +56,7 @@ $(eval $(call gb_Module_add_targets,extras,\
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,extras,\
Gallery_sound \
+ Gallery_txtshapes \
))
endif
diff --git a/extras/Package_galltxtshapes.mk b/extras/Package_galltxtshapes.mk
deleted file mode 100644
index 7040c7c..0000000
--- a/extras/Package_galltxtshapes.mk
+++ /dev/null
@@ -1,55 +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_Package_Package,extras_galltxtshapes,$(SRCDIR)/extras/source/gallery/txtshapes))
-
-$(eval $(call gb_Package_set_outdir,extras_galltxtshapes,$(INSTDIR)))
-
-$(eval $(call gb_Package_add_files,extras_galltxtshapes,share/gallery/textshapes,\
- Circle01-DarkBlue.png \
- Circle02-LightBlue.png \
- Circle03-Green.png \
- Circle04-DarkRed.png \
- Circle05-Orange.png \
- Hexagon01-DarkBlue.png \
- Hexagon02-Blue.png \
- Hexagon03-Green.png \
- Hexagon04-DarkRed.png \
- Hexagon05-Orange.png \
- Leaf01-DarkBlue.png \
- Leaf02-LightBlue.png \
- Leaf03-Green.png \
- Leaf04-DarkRed.png \
- Leaf05-Orange.png \
- Paster01-DarkBlue.png \
- Paster02-LightBlue.png \
- Paster03-Green.png \
- Paster04-Red.png \
- Paster05-Orange.png \
- Rectangle01-DarkBlue.png \
- Rectangle02-LightBlue.png \
- Rectangle03-Green.png \
- Rectangle04-DarkRed.png \
- Rectangle05-Orange.png \
- Rectangle06-Striped-Blue.png \
- Rectangle07-Striped-Green.png \
- Rectangle08-Striped-Red.png \
- Rectangle09-Striped-Orange.png \
- Square01-DarkBlue.png \
- Square02-LightBlue.png \
- Square03-Green.png \
- Square04-DarkRed.png \
- Square05-Orange.png \
- Square06-Striped-Blue.png \
- Square07-Striped-Green.png \
- Square08-Striped-Red.png \
- Square09-Striped-Orange.png \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/source/gallery/share/gallery_names.ulf b/extras/source/gallery/share/gallery_names.ulf
index 47f75b5..35e3c49 100644
--- a/extras/source/gallery/share/gallery_names.ulf
+++ b/extras/source/gallery/share/gallery_names.ulf
@@ -9,4 +9,7 @@
[sound]
en-US = "Sounds"
+[txtshapes]
+en-US = "Text Shapes"
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 405da24..3b0bcce 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -285,7 +285,7 @@ End
Value = STRING(CONCAT2(LibreOffice.,name)); \
Styles = (); \
End
-
+
#define REGISTRY_ENTRY_KINDMAP(name, modid, key) \
RegistryItem CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Explorer_KindMap_,name) \
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
@@ -422,5 +422,15 @@ End
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); \
End
-#endif // MACROS_INC
+#define GALLERY_NAME(id) \
+
+#define GALLERY_FILELIST(id) \
+File gid_File_Extra_Gall##id \
+ Dir = FILELIST_DIR; \
+ TXT_FILE_BODY; \
+ Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); \
+ Name = STRING(CONCAT3(Gallery/,id,.filelist)); \
+End
+
+#endif // MACROS_INC
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 1ec4e9f..feb17f9 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -224,19 +224,8 @@ File gid_File_Extra_Galltransport
Name = "extras_galltransport.filelist";
End
-File gid_File_Extra_Galltxtshapes
- Dir = FILELIST_DIR;
- TXT_FILE_BODY;
- Styles = (FILELIST);
- Name = "extras_galltxtshapes.filelist";
-End
-
-File gid_File_Extra_Gallsound
- Dir = FILELIST_DIR;
- USER_FILE_BODY;
- Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
- Name = "Gallery/sound.filelist";
-End
+GALLERY_FILELIST(txtshapes)
+GALLERY_FILELIST(sound)
File gid_File_Extra_Gallmytheme
Dir = FILELIST_DIR;
diff --git a/solenv/bin/desktop-translate.pl b/solenv/bin/desktop-translate.pl
index 21d80ab..2b7b882 100644
--- a/solenv/bin/desktop-translate.pl
+++ b/solenv/bin/desktop-translate.pl
@@ -116,15 +116,19 @@ while (<SOURCE>) {
close(SOURCE);
+my $processed = 0;
# process templates
foreach $template (keys %templates) {
my $outfile = $templates{$template}->{'outfile'};
# open the template file - ignore sections for which no
# templates exist
- unless(open(TEMPLATE, $outfile)) {
- print STDERR "Warning: No template found for item '$template' : '$outfile' : '$_': $!\n";
- exit -1;
+ if (open(TEMPLATE, $outfile)) {
+ $processed++;
+ } elsif ($ext eq 'str') { # string files processed one by one
+ next;
+ } else {
+ die "Warning: No template found for item '$template' : '$outfile' : '$_': $!\n";
}
# open output file
@@ -161,3 +165,7 @@ foreach $template (keys %templates) {
system "mv -f $outfile.tmp $outfile\n";
}
}
+
+if ($ext eq 'str' && $processed == 0) {
+ die "Warning: No matching templates processed";
+}
commit 08df0ab05ee209f1198ee0879f97a63ffaf56d76
Author: Michael Meeks <michael.meeks at suse.com>
Date: Mon May 13 17:16:56 2013 +0100
gallery: use icerun for building, and tweak for windows use.
Change-Id: Ic9e30661f05506b3616eaf417f8e3deed7290830
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 0e3f84b..7b28238 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -59,7 +59,7 @@ $(call gb_Output_announce,$(2),$(true),GAL,1)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Gallery_get_workdir,$(2))/* && \
SAL_USE_VCLPLUGIN=svp \
- $(call gb_Executable_get_command,gengal.bin) \
+ $(call gb_Executable_get_command,$(gb_GENGAL),$(ICECREAM_RUN)) \
$(call gb_Gallery__make_env_args) \
--build-tree \
--destdir $(GALLERY_BASEDIR) \
@@ -78,7 +78,7 @@ $(dir $(call gb_Gallery_get_target,$(1)))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
$(call gb_Gallery_get_target,%) : \
- $(call gb_Executable_get_runtime_dependencies,gengal.bin) \
+ $(call gb_Executable_get_runtime_dependencies,$(gb_GENGAL)) \
$(gb_Gallery_EXTRA_DEPENCENCIES)
$(call gb_Gallery__command,$@,$*)
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 1757e84..a91e0b4 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -399,7 +399,7 @@ endef
#
# gb_Executable_get_command executable
define gb_Executable_get_command
-$(gb_Helper_set_ld_path) $(call gb_Executable_get_target_for_build,$(1))
+$(gb_Helper_set_ld_path) $(2) $(call gb_Executable_get_target_for_build,$(1))
endef
gb_Executable_get_linktargetname = Executable/$(1)$(gb_Executable_EXT)
diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk
index eea1bbb..51d8641 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -7,6 +7,13 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
+
+ifeq (,$(filter WNT,$(OS)))
+ gb_GENGAL = gengal.bin
+else
+ gb_GENGAL = gengal.exe
+endif
+
# Tools we need to build for cross-compiling
gb_BUILD_TOOLS = \
$(foreach executable, \
@@ -38,7 +45,7 @@ gb_BUILD_TOOLS = \
ulfex \
xrmex \
$(call gb_Helper_optional_for_host,DESKTOP, \
- gengal.bin \
+ $(gb_GENGAL) \
HelpIndexer \
HelpLinker \
) \
commit 726409167507aa20fb90882ceed3ca3e770d3d4b
Author: Michael Meeks <michael.meeks at suse.com>
Date: Mon May 13 16:26:40 2013 +0100
gallery: don't build galleries unless in the desktop profile.
Change-Id: I03fbfb173958c4d9e1e917f0d098ea8930d6041d
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 1b5de31..82fc5ea 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -13,7 +13,6 @@ $(eval $(call gb_Module_add_targets,extras,\
AllLangPackage_autotextshare \
CustomTarget_autocorr \
CustomTarget_glade \
- Gallery_sound \
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list