diff options
| -rw-r--r-- | extras/Gallery_txtshapes.mk | 53 | ||||
| -rw-r--r-- | extras/Module_extras.mk | 2 | ||||
| -rw-r--r-- | extras/Package_galltxtshapes.mk | 55 | ||||
| -rw-r--r-- | extras/source/gallery/share/gallery_names.ulf | 3 | ||||
| -rwxr-xr-x | scp2/inc/macros.inc | 14 | ||||
| -rw-r--r-- | scp2/source/ooo/file_extra_ooo.scp | 15 | ||||
| -rw-r--r-- | solenv/bin/desktop-translate.pl | 14 |
7 files changed, 82 insertions, 74 deletions
diff --git a/extras/Gallery_txtshapes.mk b/extras/Gallery_txtshapes.mk new file mode 100644 index 000000000000..85645a504955 --- /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 82fc5ea73f09..f83018673d26 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 7040c7c0462f..000000000000 --- 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 47f75b562135..35e3c49fb2a5 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 405da24c6c2f..3b0bcce86448 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 1ec4e9fea42f..feb17f9c240a 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 21d80ab91a76..2b7b88263fb8 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"; +} |