Resolves tdf#132904 and tdf#133788 - Gallery clean-up
Rename
* sg1 -> bullets
* sg24 -> symbolshapes
* sg36 -> fontwork
Delete
* sg3 (backgrounds) -> 7273bb3534264867e818c13baffcdf3862189cd2
* sg4 (www-graf) -> 82ab7a1559170889c5647a04dc3e85edc38a4e0f
Translation
* ulf completed
Visibility
* New gallery content moved to share/
Change-Id: I718c627a71d4ed0d9eef61ff53814da7ec3922be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96382
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 86b1b062cfc2768a971bb842de1c16f8646d4b4b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96501
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
diff --git a/extras/Package_gallmytheme.mk b/extras/Package_gallmytheme.mk
index c4e8744..8814991 100644
--- a/extras/Package_gallmytheme.mk
+++ b/extras/Package_gallmytheme.mk
@@ -12,25 +12,4 @@ $(eval $(call gb_Package_Package,extras_gallmytheme,$(SRCDIR)/extras/source/gall
$(eval $(call gb_Package_add_files,extras_gallmytheme,$(LIBO_SHARE_PRESETS_FOLDER)/gallery,\
sg30.sdv \
sg30.thm \
arrows.sdg \
arrows.sdv \
arrows.thm \
bpmn.sdg \
bpmn.sdv \
bpmn.thm \
flowchart.sdg \
flowchart.sdv \
flowchart.thm \
icons.sdg \
icons.sdv \
icons.thm \
shapes.sdg \
shapes.sdv \
shapes.thm \
network.sdg \
network.sdv \
network.thm \
diagrams.sdg \
diagrams.sdv \
diagrams.thm \
))
diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk
index 1f49921..c17099c 100644
--- a/extras/Package_gallsystem.mk
+++ b/extras/Package_gallsystem.mk
@@ -10,18 +10,36 @@
$(eval $(call gb_Package_Package,extras_gallsystem,$(SRCDIR)/extras/source/gallery/gallery_system))
$(eval $(call gb_Package_add_files,extras_gallsystem,$(LIBO_SHARE_FOLDER)/gallery,\
sg1.sdg \
sg1.sdv \
sg1.thm \
sg4.sdg \
sg4.sdv \
sg4.thm \
sg24.sdg \
sg24.sdv \
sg24.thm \
sg36.sdg \
sg36.sdv \
sg36.thm \
arrows.sdg \
arrows.sdv \
arrows.thm \
bpmn.sdg \
bpmn.sdv \
bpmn.thm \
bullets.sdg \
bullets.sdv \
bullets.thm \
diagrams.sdg \
diagrams.sdv \
diagrams.thm \
flowchart.sdg \
flowchart.sdv \
flowchart.thm \
fontwork.sdg \
fontwork.sdv \
fontwork.thm \
icons.sdg \
icons.sdv \
icons.thm \
network.sdg \
network.sdv \
network.thm \
shapes.sdg \
shapes.sdv \
shapes.thm \
symbolshapes.sdg \
symbolshapes.sdv \
symbolshapes.thm \
))
# vim: set noet sw=4 ts=4:
diff --git a/extras/source/gallery/gallery_mytheme/arrows.sdg b/extras/source/gallery/gallery_system/arrows.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/arrows.sdg
rename to extras/source/gallery/gallery_system/arrows.sdg
Binary files differ
diff --git a/extras/source/gallery/gallery_mytheme/arrows.sdv b/extras/source/gallery/gallery_system/arrows.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/arrows.sdv
rename to extras/source/gallery/gallery_system/arrows.sdv
Binary files differ
diff --git a/extras/source/gallery/gallery_mytheme/arrows.thm b/extras/source/gallery/gallery_system/arrows.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/arrows.thm
rename to extras/source/gallery/gallery_system/arrows.thm
Binary files differ
diff --git a/extras/source/gallery/gallery_mytheme/bpmn.sdg b/extras/source/gallery/gallery_system/bpmn.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/bpmn.sdg
rename to extras/source/gallery/gallery_system/bpmn.sdg
Binary files differ
diff --git a/extras/source/gallery/gallery_mytheme/bpmn.sdv b/extras/source/gallery/gallery_system/bpmn.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/bpmn.sdv
rename to extras/source/gallery/gallery_system/bpmn.sdv
Binary files differ
diff --git a/extras/source/gallery/gallery_mytheme/bpmn.thm b/extras/source/gallery/gallery_system/bpmn.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/bpmn.thm
rename to extras/source/gallery/gallery_system/bpmn.thm
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg1.sdg b/extras/source/gallery/gallery_system/bullets.sdg
similarity index 100%
rename from extras/source/gallery/gallery_system/sg1.sdg
rename to extras/source/gallery/gallery_system/bullets.sdg
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg1.sdv b/extras/source/gallery/gallery_system/bullets.sdv
similarity index 100%
rename from extras/source/gallery/gallery_system/sg1.sdv
rename to extras/source/gallery/gallery_system/bullets.sdv
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg1.thm b/extras/source/gallery/gallery_system/bullets.thm
similarity index 100%
rename from extras/source/gallery/gallery_system/sg1.thm
rename to extras/source/gallery/gallery_system/bullets.thm
Binary files differ
diff --git a/extras/source/gallery/gallery_mytheme/diagrams.sdg b/extras/source/gallery/gallery_system/diagrams.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/diagrams.sdg
rename to extras/source/gallery/gallery_system/diagrams.sdg
Binary files differ
diff --git a/extras/source/gallery/gallery_mytheme/diagrams.sdv b/extras/source/gallery/gallery_system/diagrams.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/diagrams.sdv
rename to extras/source/gallery/gallery_system/diagrams.sdv
Binary files differ
diff --git a/extras/source/gallery/gallery_mytheme/diagrams.thm b/extras/source/gallery/gallery_system/diagrams.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/diagrams.thm
rename to extras/source/gallery/gallery_system/diagrams.thm
Binary files differ
diff --git a/extras/source/gallery/gallery_mytheme/flowchart.sdg b/extras/source/gallery/gallery_system/flowchart.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/flowchart.sdg
rename to extras/source/gallery/gallery_system/flowchart.sdg
Binary files differ
diff --git a/extras/source/gallery/gallery_mytheme/flowchart.sdv b/extras/source/gallery/gallery_system/flowchart.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/flowchart.sdv
rename to extras/source/gallery/gallery_system/flowchart.sdv
Binary files differ
diff --git a/extras/source/gallery/gallery_mytheme/flowchart.thm b/extras/source/gallery/gallery_system/flowchart.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/flowchart.thm
rename to extras/source/gallery/gallery_system/flowchart.thm
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg36.sdg b/extras/source/gallery/gallery_system/fontwork.sdg
similarity index 100%
rename from extras/source/gallery/gallery_system/sg36.sdg
rename to extras/source/gallery/gallery_system/fontwork.sdg
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg36.sdv b/extras/source/gallery/gallery_system/fontwork.sdv
similarity index 100%
rename from extras/source/gallery/gallery_system/sg36.sdv
rename to extras/source/gallery/gallery_system/fontwork.sdv
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg36.thm b/extras/source/gallery/gallery_system/fontwork.thm
similarity index 100%
rename from extras/source/gallery/gallery_system/sg36.thm
rename to extras/source/gallery/gallery_system/fontwork.thm
Binary files differ
diff --git a/extras/source/gallery/gallery_mytheme/icons.sdg b/extras/source/gallery/gallery_system/icons.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/icons.sdg
rename to extras/source/gallery/gallery_system/icons.sdg
Binary files differ
diff --git a/extras/source/gallery/gallery_mytheme/icons.sdv b/extras/source/gallery/gallery_system/icons.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/icons.sdv
rename to extras/source/gallery/gallery_system/icons.sdv
Binary files differ
diff --git a/extras/source/gallery/gallery_mytheme/icons.thm b/extras/source/gallery/gallery_system/icons.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/icons.thm
rename to extras/source/gallery/gallery_system/icons.thm
Binary files differ
diff --git a/extras/source/gallery/gallery_mytheme/network.sdg b/extras/source/gallery/gallery_system/network.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/network.sdg
rename to extras/source/gallery/gallery_system/network.sdg
Binary files differ
diff --git a/extras/source/gallery/gallery_mytheme/network.sdv b/extras/source/gallery/gallery_system/network.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/network.sdv
rename to extras/source/gallery/gallery_system/network.sdv
Binary files differ
diff --git a/extras/source/gallery/gallery_mytheme/network.thm b/extras/source/gallery/gallery_system/network.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/network.thm
rename to extras/source/gallery/gallery_system/network.thm
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg3.sdg b/extras/source/gallery/gallery_system/sg3.sdg
deleted file mode 100644
index 269e572..0000000
--- a/extras/source/gallery/gallery_system/sg3.sdg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg3.sdv b/extras/source/gallery/gallery_system/sg3.sdv
deleted file mode 100644
index 4449591..0000000
--- a/extras/source/gallery/gallery_system/sg3.sdv
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg3.thm b/extras/source/gallery/gallery_system/sg3.thm
deleted file mode 100644
index b81238c..0000000
--- a/extras/source/gallery/gallery_system/sg3.thm
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg4.sdg b/extras/source/gallery/gallery_system/sg4.sdg
deleted file mode 100644
index da114195..0000000
--- a/extras/source/gallery/gallery_system/sg4.sdg
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg4.sdv b/extras/source/gallery/gallery_system/sg4.sdv
deleted file mode 100644
index fc17dd9..0000000
--- a/extras/source/gallery/gallery_system/sg4.sdv
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg4.thm b/extras/source/gallery/gallery_system/sg4.thm
deleted file mode 100644
index 91b9ba3..0000000
--- a/extras/source/gallery/gallery_system/sg4.thm
+++ /dev/null
Binary files differ
diff --git a/extras/source/gallery/gallery_mytheme/shapes.sdg b/extras/source/gallery/gallery_system/shapes.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/shapes.sdg
rename to extras/source/gallery/gallery_system/shapes.sdg
Binary files differ
diff --git a/extras/source/gallery/gallery_mytheme/shapes.sdv b/extras/source/gallery/gallery_system/shapes.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/shapes.sdv
rename to extras/source/gallery/gallery_system/shapes.sdv
Binary files differ
diff --git a/extras/source/gallery/gallery_mytheme/shapes.thm b/extras/source/gallery/gallery_system/shapes.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/shapes.thm
rename to extras/source/gallery/gallery_system/shapes.thm
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg24.sdg b/extras/source/gallery/gallery_system/symbolshapes.sdg
similarity index 100%
rename from extras/source/gallery/gallery_system/sg24.sdg
rename to extras/source/gallery/gallery_system/symbolshapes.sdg
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg24.sdv b/extras/source/gallery/gallery_system/symbolshapes.sdv
similarity index 100%
rename from extras/source/gallery/gallery_system/sg24.sdv
rename to extras/source/gallery/gallery_system/symbolshapes.sdv
Binary files differ
diff --git a/extras/source/gallery/gallery_system/sg24.thm b/extras/source/gallery/gallery_system/symbolshapes.thm
similarity index 100%
rename from extras/source/gallery/gallery_system/sg24.thm
rename to extras/source/gallery/gallery_system/symbolshapes.thm
Binary files differ
diff --git a/extras/source/gallery/share/gallery_names.ulf b/extras/source/gallery/share/gallery_names.ulf
index 0d1da8d..f013ce7 100644
--- a/extras/source/gallery/share/gallery_names.ulf
+++ b/extras/source/gallery/share/gallery_names.ulf
@@ -13,34 +13,25 @@ en-US = "Arrows"
[backgrounds]
en-US = "Backgrounds"
[computers]
en-US = "Computers"
[bpmn]
en-US = "BPMN"
[diagrams]
en-US = "Diagrams"
[education]
en-US = "School & University"
[flowchart]
en-US = "Flow chart"
[environment]
en-US = "Environment"
[icons]
en-US = "Icons"
[finance]
en-US = "Finance"
[network]
en-US = "Network"
[people]
en-US = "People"
[shapes]
en-US = "Shapes"
[sounds]
en-US = "Sounds"
[symbols]
en-US = "Symbols"
[txtshapes]
en-US = "Text Shapes"
[transportation]
en-US = "Transportation"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
