Adds OxygenOffice extras as configurable optional

 Introduces:
 --enable-extra-gallery  - for additional galleries
 --enable-extra-template - for additional templates
 --enable-extra-sample   - for additional samples
 --enable-extra-font     - for additional fonts
 configure options.

configure.in

@@ -369,9 +369,92 @@ AC_ARG_ENABLE(icecream,
 ],,)
 
 AC_ARG_ENABLE(zenity,
-[  --enable-zenity         Display a icon in the notification area during
-                          build.
-],,)
+    AS_HELP_STRING([--enable-zenity],
+        [Display a icon in the notification area during build.]),
+,)
+
+AC_ARG_ENABLE(cl-x64,
+    AS_HELP_STRING([--enable-cl-x64],
+        [Use the Microsoft C/C++ x64 compiler instead of the default x86 one.]),
+,)
+
+AC_ARG_ENABLE(extra-gallery,
+    AS_HELP_STRING([--enable-extra-gallery],
+	[Add extra gallery content.]),
+,)
+
+AC_ARG_ENABLE(extra-template,
+    AS_HELP_STRING([--enable-extra-template],
+	[Add extra temaplte content.]),
+,)
+
+AC_ARG_ENABLE(extra-sample,
+    AS_HELP_STRING([--enable-extra-sample],
+	[Add extra sample content.]),
+,)
+
+AC_ARG_ENABLE(extra-font,
+    AS_HELP_STRING([--enable-extra-font],
+	[Add extra font content.]),
+,)
+
+dnl ---------- Deprecated since 2010-11-05 ----------
+
+AC_ARG_ENABLE(mysql-connector,
+    AS_HELP_STRING([--enable-mysql-connector],
+        [Deprecated: use --enable-ext-mysql-connector instead.]),
+    if test -z "$enable_ext_mysql_connector"; then
+        enable_ext_mysql_connector=$enable_mysql_connector;
+    fi ,
+)
+
+AC_ARG_ENABLE(presenter-extra-ui,
+    AS_HELP_STRING([--enable-presenter-extra-ui],
+        [Deprecated: use --enable-ext-presenter-ui instead.]),
+    if test -z "$enable_ext_presenter_ui"; then
+        enable_ext_presenter_ui=$enable_presenter_extra_ui;
+    fi ,
+)
+
+AC_ARG_ENABLE(minimizer,
+    AS_HELP_STRING([--enable-minimizer],
+        [Deprecated: use --enable-ext-presenter-minimizer instead.]),
+    if test -z "$enable_ext_presenter_minimizer"; then
+        enable_ext_presenter_minimizer=$enable_minimizer;
+    fi ,
+)
+
+AC_ARG_ENABLE(presenter-console,
+    AS_HELP_STRING([--enable-presenter-console],
+        [Deprecated: use --enable-ext-presenter-console instead.]),
+    if test -z "$enable_ext_presenter_console"; then
+        enable_ext_presenter_console=$enable_presenter_console;
+    fi ,
+)
+
+AC_ARG_ENABLE(pdfimport,
+    AS_HELP_STRING([--enable-pdfimport],
+        [Deprecated: use --enable-ext-pdfimport instead.]),
+    if test -z "$enable_ext_pdfimport"; then
+        enable_ext_pdfimport=$enable_pdfimport;
+    fi ,
+)
+
+AC_ARG_ENABLE(wiki-publisher,
+    AS_HELP_STRING([--enable-wiki-publisher],
+        [Deprecated: use --enable-ext-wiki-publisher instead.]),
+    if test -z "$enable_ext_wiki_publisher"; then
+        enable_ext_wiki_publisher=$enable_wiki_publisher;
+    fi ,
+)
+
+AC_ARG_ENABLE(report-builder,
+    AS_HELP_STRING([--enable-report-builder],
+        [Deprecated: use --enable-ext-report-builder instead.]),
+    if test -z "$enable_ext_report_builder"; then
+        enable_ext_report_builder=$enable_report_builder;
+    fi ,
+)
 
 dnl ===================================================================
 dnl Optional Packages (--with/without-)
@@ -7234,6 +7317,66 @@ else
 fi
 AC_SUBST(WITHOUT_AFMS)
 
+dnl ===================================================================
+dnl Test whether to include extra galleries
+dnl ===================================================================
+AC_MSG_CHECKING([whether to include extra galleries])
+if test "z$enable_extra_gallery" = "z" -o "z$enable_extra_gallery" = "zno" ; then
+  AC_MSG_RESULT([no])
+  WITH_EXTRA_GALLERY=NO
+else
+  AC_MSG_RESULT([yes])
+  WITH_EXTRA_GALLERY=YES
+  BUILD_TYPE="$BUILD_TYPE EXTRA_GALLERY"
+  SCPDEFS="$SCPDEFS -DWITH_EXTRA_GALLERY"  
+fi
+AC_SUBST(WITH_EXTRA_GALLERY)
+
+dnl ===================================================================
+dnl Test whether to include extra templates
+dnl ===================================================================
+AC_MSG_CHECKING([whether to include extra templates])
+if test "z$enable_extra_template" = "z" -o "z$enable_extra_template" = "zno" ; then
+  AC_MSG_RESULT([no])
+  WITH_EXTRA_TEMPLATE=NO
+else
+  AC_MSG_RESULT([yes])
+  WITH_EXTRA_TEMPLATE=YES
+  BUILD_TYPE="$BUILD_TYPE EXTRA_TEMPLATE"
+  SCPDEFS="$SCPDEFS -DWITH_EXTRA_TEMPLATE"
+fi
+AC_SUBST(WITH_EXTRA_TEMPLATE)
+
+dnl ===================================================================
+dnl Test whether to include extra samples
+dnl ===================================================================
+AC_MSG_CHECKING([whether to include extra samples])
+if test "z$enable_extra_sample" = "z" -o "z$enable_extra_sample" = "zno" ; then
+  AC_MSG_RESULT([no])
+  WITH_EXTRA_SAMPLE=NO
+else
+  AC_MSG_RESULT([yes])
+  WITH_EXTRA_SAMPLE=YES
+  BUILD_TYPE="$BUILD_TYPE EXTRA_SAMPLE"
+  SCPDEFS="$SCPDEFS -DWITH_EXTRA_SAMPLE"
+fi
+AC_SUBST(WITH_EXTRA_SAMPLE)
+
+dnl ===================================================================
+dnl Test whether to include extra fonts
+dnl ===================================================================
+AC_MSG_CHECKING([whether to include extra fonts])
+if test "z$enable_extra_font" = "z" -o "z$enable_extra_font" = "zno" ; then
+  AC_MSG_RESULT([no])
+  WITH_EXTRA_FONT=NO
+else
+  AC_MSG_RESULT([yes])
+  WITH_EXTRA_FONT=YES
+  BUILD_TYPE="$BUILD_TYPE EXTRA_FONT"
+  SCPDEFS="$SCPDEFS -DWITH_EXTRA_FONT"
+fi
+AC_SUBST(WITH_EXTRA_FONT)
+
 AC_SUBST(SCPDEFS)
 
 if test "$_os" = "WINNT"; then

scp2/prj/build.lst

@@ -26,4 +26,5 @@ cp    scp2\source\base            nmake    -    all    cp_base cp_langmacros cp_
 cp    scp2\source\xsltfilter      nmake    -    all    cp_xsltfilter cp_langmacros cp_langtemplates NULL
 cp    scp2\source\winexplorerext  nmake    -    all    cp_winexplorerext cp_langmacros cp_langtemplates NULL
 cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros cp_langtemplates NULL
-cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
+cp    scp2\source\accessories     nmake    -    all    cp_accessories cp_langmacros NULL
+cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL

scp2/source/accessories/file_gallery_accessories.scp

+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+/* *** Accessories Extras *** */
+
+/* ** Gallery ** */
+
+#ifdef WITH_EXTRA_GALLERY
+
+File gid_File_Extra_Gallery_Accessories
+    Dir = gid_Dir_Gallery;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigallery.zip";
+End
+
+File gid_File_Extra_Gallery_Draws_People_Accessories
+    Dir = gid_Dir_Gallery_Draws_People;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigallerydrawspeople.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Plants_Accessories
+    Dir = gid_Dir_Gallery_Photos_Plants;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosplants.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Celebration_Accessories
+    Dir = gid_Dir_Gallery_Photos_Celebration;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotoscelebration.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Fauna_Accessories
+    Dir = gid_Dir_Gallery_Photos_Fauna;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosfauna.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Flowers_Accessories
+    Dir = gid_Dir_Gallery_Photos_Flowers;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosflowers.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_FoodsandDrinks_Accessories
+    Dir = gid_Dir_Gallery_Photos_FoodsandDrinks;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosfoodsanddrinks.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Humans_Accessories
+    Dir = gid_Dir_Gallery_Photos_Humans;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotoshumans.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Landscapes_Accessories
+    Dir = gid_Dir_Gallery_Photos_Landscapes;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotoslandscapes.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Buildings_Accessories
+    Dir = gid_Dir_Gallery_Photos_Buildings;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosbuildings.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Objects_Accessories
+    Dir = gid_Dir_Gallery_Photos_Objects;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosobjects.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Cities_Accessories
+    Dir = gid_Dir_Gallery_Photos_Cities;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotoscities.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Space_Accessories
+    Dir = gid_Dir_Gallery_Photos_Space;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosspace.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Statues_Accessories
+    Dir = gid_Dir_Gallery_Photos_Statues;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosstatues.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Travel_Accessories
+    Dir = gid_Dir_Gallery_Photos_Travel;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotostravel.zip";
+End
+
+File gid_File_Extra_Gallery_Elements_Bullets2_Accessories
+    Dir = gid_Dir_Gallery_Elements_Bullets2;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryelementsbullets2.zip";
+End
+
+File gid_File_Extra_Gallery_NONFREE_Accessories
+    Dir = gid_Dir_Gallery;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigallerynonfree.zip";
+End
+
+#endif

scp2/source/accessories/file_samples_accessories.scp

+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+/* *** Accessories Extras *** */
+
+/* ** Samples ** */
+
+#ifdef WITH_EXTRA_SAMPLE
+
+File gid_File_Extra_Samples_Accessories
+    Dir = gid_Dir_Samples_Language;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamples,zip);
+End
+
+File gid_File_Extra_Samples_Documentations_Accessories
+    Dir = gid_Dir_Samples_Documentations;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesdocumentation,zip);
+End
+
+File gid_File_Extra_Samples_Advertisement_Accessories
+    Dir = gid_Dir_Samples_Advertisement;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesadvertisement,zip);
+End
+
+/* ** Samples - NON FREE** */
+
+File gid_File_Extra_Samples_NONFREE_Accessories
+    Dir = gid_Dir_Samples_Language;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesnonfree,zip);
+End
+
+File gid_File_Extra_Samples_NONFREE_Documentations_Accessories
+    Dir = gid_Dir_Samples_Documentations;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesnonfreedocumentation,zip);
+End
+
+File gid_File_Extra_Samples_NONFREE_Advertisement_Accessories
+    Dir = gid_Dir_Samples_Advertisement;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesnonfreeadvertisement,zip);
+End
+
+#endif

scp2/source/accessories/file_templates_accessories.scp

+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+/* *** Accessories Extras *** */
+
+/* ** Templates ** */
+
+#ifdef WITH_EXTRA_TEMPLATE
+
+File gid_File_Extra_Templates_Accessories
+    Dir = gid_Dir_Template_Language;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplates,zip);
+End
+
+File gid_File_Extra_Templates_Layout_Accessories
+    Dir = gid_Dir_Template_Layout;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplateslayout,zip);
+End
+
+File gid_File_Extra_Templates_Present_Accessories
+    Dir = gid_Dir_Template_Presnt;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatespresent,zip);
+End
+
+File gid_File_Extra_Templates_Educate_Accessories
+    Dir = gid_Dir_Template_Educate;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplateseducate,zip);
+End
+
+File gid_File_Extra_Templates_Finance_Accessories
+    Dir = gid_Dir_Template_Finance;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesfinance,zip);
+End
+
+File gid_File_Extra_Templates_Forms_Accessories
+    Dir = gid_Dir_Template_Forms;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesforms,zip);
+End
+
+File gid_File_Extra_Templates_Labels_Accessories
+    Dir = gid_Dir_Template_Labels;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplateslabels,zip);
+End
+
+File gid_File_Extra_Templates_Misc_Accessories
+    Dir = gid_Dir_Template_Misc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesmisc,zip);
+End
+
+File gid_File_Extra_Templates_Officorr_Accessories
+    Dir = gid_Dir_Template_Officorr;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesofficorr,zip);
+End
+
+File gid_File_Extra_Templates_Offimisc_Accessories
+    Dir = gid_Dir_Template_Offimisc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesoffimisc,zip);
+End
+
+File gid_File_Extra_Templates_Personal_Accessories
+    Dir = gid_Dir_Template_Personal;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatespersonal,zip);
+End
+
+/* ** Templates - Common ** */
+
+File gid_File_Extra_Templates_Common
+    Dir = gid_Dir_Template_Common;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommon.zip";
+End
+
+File gid_File_Extra_Templates_Common_Layout
+    Dir = gid_Dir_Template_Common_Layout;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonlayout.zip";
+End
+
+File gid_File_Extra_Templates_Common_Present
+    Dir = gid_Dir_Template_Common_Presnt;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonpresent.zip";
+End
+
+File gid_File_Extra_Templates_Common_Educate
+    Dir = gid_Dir_Template_Common_Educate;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommoneducate.zip";
+End
+
+File gid_File_Extra_Templates_Common_Finance
+    Dir = gid_Dir_Template_Common_Finance;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonfinance.zip";
+End
+
+File gid_File_Extra_Templates_Common_Forms
+    Dir = gid_Dir_Template_Common_Forms;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonforms.zip";
+End
+
+File gid_File_Extra_Templates_Common_Labels
+    Dir = gid_Dir_Template_Common_Labels;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonlabels.zip";
+End
+
+File gid_File_Extra_Templates_Common_Misc
+    Dir = gid_Dir_Template_Common_Misc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonmisc.zip";
+End
+
+File gid_File_Extra_Templates_Common_Officorr
+    Dir = gid_Dir_Template_Common_Officorr;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonofficorr.zip";
+End
+
+File gid_File_Extra_Templates_Common_Offimisc
+    Dir = gid_Dir_Template_Common_Offimisc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonoffimisc.zip";
+End
+
+File gid_File_Extra_Templates_Common_Personal
+    Dir = gid_Dir_Template_Common_Personal;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonpersonal.zip";
+End
+
+/* ** Templates - NON FREE ** */
+
+File gid_File_Extra_Templates_NONFREE_Accessories
+    Dir = gid_Dir_Template_Language;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfree,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Layout_Accessories
+    Dir = gid_Dir_Template_Layout;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreelayout,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Present_Accessories
+    Dir = gid_Dir_Template_Presnt;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreepresent,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Educate_Accessories
+    Dir = gid_Dir_Template_Educate;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreeeducate,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Finance_Accessories
+    Dir = gid_Dir_Template_Finance;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreefinance,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Forms_Accessories
+    Dir = gid_Dir_Template_Forms;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreeforms,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Labels_Accessories
+    Dir = gid_Dir_Template_Labels;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreelabels,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Misc_Accessories
+    Dir = gid_Dir_Template_Misc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreemisc,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Officorr_Accessories
+    Dir = gid_Dir_Template_Officorr;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreeofficorr,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Offimisc_Accessories
+    Dir = gid_Dir_Template_Offimisc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreeoffimisc,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Personal_Accessories
+    Dir = gid_Dir_Template_Personal;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreepersonal,zip);
+End
+
+#endif

scp2/source/accessories/makefile.mk

+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+PRJ=..$/..
+
+PRJPCH=
+
+PRJNAME=scp2
+TARGET=accessories
+TARGETTYPE=CUI
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+SCP_PRODUCT_TYPE=osl
+PARFILES= \
+        module_accessories.par
+.IF "$(WITH_EXTRA_GALLERY)" != ""
+PARFILES += \
+        module_gallery_accessories.par     \
+        file_gallery_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_TEMPLATE)" != ""
+PARFILES += \
+        module_templates_accessories.par   \
+        file_templates_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_SAMPLE)" != ""
+PARFILES += \
+        module_samples_accessories.par     \
+        file_samples_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_FONT)" != ""
+PARFILES += \
+        module_font_accessories.par        \
+        file_font_accessories.par
+.ENDIF
+
+ULFFILES= \
+        module_accessories.ulf
+.IF "$(WITH_EXTRA_GALLERY)" != ""
+ULFFILES += \
+        module_gallery_accessories.ulf
+.ENDIF
+.IF "$(WITH_EXTRA_TEMPLATE)" != ""
+ULFFILES += \
+        module_templates_accessories.ulf
+.ENDIF
+.IF "$(WITH_EXTRA_SAMPLE)" != ""
+ULFFILES += \
+        module_samples_accessories.ulf
+.ENDIF
+.IF "$(WITH_EXTRA_FONT)" != ""
+ULFFILES += \
+        module_font_accessories.ulf
+.ENDIF
+
+
+# --- File ---------------------------------------------------------
+.INCLUDE :  target.mk

scp2/source/accessories/module_accessories.scp

+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Accessories
+    ParentID = gid_Module_Optional;
+    Files = (
+  ); 
+    Sortkey = "300";
+    Minimal = NO;
+    Default = YES;
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES);
+End
+

scp2/source/accessories/module_accessories.ulf

+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES]
+en-US = "Accessories"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES]
+en-US = "Useful %PRODUCTNAME accessories including various Galleries, Templates, Sample documents and Fonts."

scp2/source/accessories/module_font_accessories.scp

+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+#ifdef WITH_EXTRA_FONT
+
+Module gid_Module_Optional_Accessories_Fonts
+    PackageInfo = "packinfo_accessories.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_FONTS);
+    ParentID = gid_Module_Optional_Accessories;
+    Files = ( 
+        gid_File_Fnt_airmole,
+        gid_File_Fnt_airmolea,
+        gid_File_Fnt_airmoles,
+        gid_File_Fnt_airmoleq,
+        gid_File_Fnt_astronbo,
+        gid_File_Fnt_astronbi,
+        gid_File_Fnt_astronbv,
+        gid_File_Fnt_astronbw,
+        gid_File_Fnt_baveuse,
+        gid_File_Fnt_Berylium,
+        gid_File_Fnt_Beryliub,
+        gid_File_Fnt_Berylibi,
+        gid_File_Fnt_Beryliui,
+        gid_File_Fnt_BETSY2,
+        gid_File_Fnt_bluehigh,
+        gid_File_Fnt_bluebold,
+        gid_File_Fnt_bluecond,
+        gid_File_Fnt_bluehigl,
+        gid_File_Fnt_bullpen_,
+        gid_File_Fnt_bullpen3,
+        gid_File_Fnt_bullpeni,
+        gid_File_Fnt_colourba,
+        gid_File_Fnt_colourbb,
+        gid_File_Fnt_counters,
+        gid_File_Fnt_creditva,
+        gid_File_Fnt_creditvb,
+        gid_File_Fnt_creditvz,
+        gid_File_Fnt_creditvi,
+        gid_File_Fnt_edmunds,
+        gid_File_Fnt_edmundis,
+        gid_File_Fnt_engeregu,
+        gid_File_Fnt_engebold,
+        gid_File_Fnt_engeboit,
+        gid_File_Fnt_engeexpa,
+        gid_File_Fnt_engeexbo,
+        gid_File_Fnt_engeexbi,
+        gid_File_Fnt_engeexit,
+        gid_File_Fnt_engeital,
+        gid_File_Fnt_goodfish,
+        gid_File_Fnt_goodfisb,
+        gid_File_Fnt_goodfisc,
+        gid_File_Fnt_goodfisi,
+        gid_File_Fnt_guanine_,
+        gid_File_Fnt_gunplay,
+        gid_File_Fnt_kirsty__,
+        gid_File_Fnt_kirsty_b,
+        gid_File_Fnt_kirstybi,
+        gid_File_Fnt_kirsty_i,
+        gid_File_Fnt_kirstyin,
+        gid_File_Fnt_mufferaw,
+        gid_File_Fnt_nasaliza,
+        gid_File_Fnt_NEUROPOL,
+        gid_File_Fnt_numberpi,
+        gid_File_Fnt_pricedow,
+        gid_File_Fnt_pupcat__,
+        gid_File_Fnt_rina,
+        gid_File_Fnt_sandoval,
+        gid_File_Fnt_SAPPM___,
+        gid_File_Fnt_screenge,
+        gid_File_Fnt_steelfis,
+        gid_File_Fnt_steelfib,
+        gid_File_Fnt_steelout,
+        gid_File_Fnt_strenuou,
+        gid_File_Fnt_strenu3d,
+        gid_File_Fnt_subpear_,
+        gid_File_Fnt_teen____,
+        gid_File_Fnt_teenbold,
+        gid_File_Fnt_teenbdit,
+        gid_File_Fnt_teenital,
+        gid_File_Fnt_teenlite,
+        gid_File_Fnt_teenlita,
+        gid_File_Fnt_typoderm,
+        gid_File_Fnt_vahika_,
+        gid_File_Fnt_vahikab,
+        gid_File_Fnt_vahikac,
+        gid_File_Fnt_vahikai,
+        gid_File_Fnt_vectroid,
+        gid_File_Fnt_velvendc,
+        gid_File_Fnt_velvenda,
+        gid_File_Fnt_vibrocen,
+        gid_File_Fnt_vibroceb,
+        gid_File_Fnt_vibrocex,
+        gid_File_Fnt_vibrocei,
+        gid_File_Fnt_wintermu,
+        gid_File_Fnt_youregon,
+        gid_File_Fnt_youregoi,
+        gid_File_Fnt_zekton__,
+        gid_File_Fnt_zektonbo,
+        gid_File_Fnt_zektonbi,
+        gid_File_Fnt_zektonit,
+        gid_File_Fnt_zorque,
+        gid_File_Fnt_-URW-Gothic_L_Avantgarde,
+        gid_File_Fnt_-URW-Gothic_L_Bold_Avantgarde,
+        gid_File_Fnt_-URW-Gothic_L_Italic_Avantgarde,
+        gid_File_Fnt_-URW-Gothic_L_Bold_Italic_Avantgarde,
+        gid_File_Fnt_-URW-Bookman_L_Bookman,
+        gid_File_Fnt_-URW-Bookman_L_Bold_Bookman,
+        gid_File_Fnt_-URW-Bookman_L_Italic_Bookman,
+        gid_File_Fnt_-URW-Bookman_L_Bold_Italic_Bookman,
+        gid_File_Fnt_-URW-Century_Schoolbook_L_New_Century_SchoolBook,
+        gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_New_Century_SchoolBook,
+        gid_File_Fnt_-URW-Century_Schoolbook_L_Italic_New_Century_SchoolBook,
+        gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook,
+        gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica,
+        gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica,
+        gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica,
+        gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica,
+        gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica_Condensed,
+        gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica_Condensed,
+        gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica_Condensed,
+        gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed,
+        gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Times,
+        gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Times,
+        gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Italic_Times,
+        gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Italic_Times,
+        gid_File_Fnt_-URW-Nimbus_Mono_L_Courier,
+        gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Courier,
+        gid_File_Fnt_-URW-Nimbus_Mono_LK_Italic_Courier,
+        gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Italic_Courier,
+        gid_File_Fnt_-URW-Palladio_L_Palitino,
+        gid_File_Fnt_-URW-Palladio_L_Bold_Palitino,
+        gid_File_Fnt_-URW-Palladio_L_Italic_Palitino,
+        gid_File_Fnt_-URW-Palladio_L_Bold_Italic_Palitino,
+        gid_File_Fnt_-URW-Standard_Symbols_L_Symbol,
+        gid_File_Fnt_-URW-Chancery_L_Zapf_Chancery,
+        gid_File_Fnt_Dingbats,
+        gid_File_Fnt_Luxi_Mono_Bold,
+        gid_File_Fnt_Luxi_Mono_Bold_Oblique,
+        gid_File_Fnt_Luxi_Mono_Regular,
+        gid_File_Fnt_Luxi_Mono_Oblique,
+        gid_File_Fnt_Luxi_Serif_Bold,
+        gid_File_Fnt_Luxi_Serif_Bold_Oblique,
+        gid_File_Fnt_Luxi_Serif_Regular,
+        gid_File_Fnt_Luxi_Serif_Oblique,
+        gid_File_Fnt_Luxi_Sans_Bold,
+        gid_File_Fnt_Luxi_Sans_Bold_Oblique,
+        gid_File_Fnt_Luxi_Sans_Regular,
+        gid_File_Fnt_Luxi_Sans_Oblique,
+        gid_File_Fnt_Gentium,
+        gid_File_Fnt_Gentium_Italic,
+        gid_File_Fnt_GentiumAlt,
+        gid_File_Fnt_GentiumAlt_Italic,
+        gid_File_Fnt_MgOpen_Canonica_Bold,
+        gid_File_Fnt_MgOpen_Canonica_Bold_Italic,
+        gid_File_Fnt_MgOpen_Canonica_Italic,
+        gid_File_Fnt_MgOpen_Canonica_Regular,
+        gid_File_Fnt_MagyarLinBiolinum,
+        gid_File_Fnt_MagyarLinBiolinumB,
+        gid_File_Fnt_MagyarLinLibertine,
+        gid_File_Fnt_MagyarLinLibertineB,
+        gid_File_Fnt_MagyarLinLibertineBI,
+        gid_File_Fnt_MagyarLinLibertineC,
+        gid_File_Fnt_MagyarLinLibertineG,
+        gid_File_Fnt_MagyarLinLibertineGB,
+        gid_File_Fnt_MagyarLinLibertineGBI,
+        gid_File_Fnt_MagyarLinLibertineGI,
+        gid_File_Fnt_MagyarLinLibertineI,
+        gid_File_Fnt_MagyarLinLibertineN,
+        gid_File_Fnt_MagyarLinLibertineNB,
+        gid_File_Fnt_MagyarLinLibertineNBI,
+        gid_File_Fnt_MagyarLinLibertineNI,
+        gid_File_Fnt_MagyarLinLibertineNC );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#endif

scp2/source/accessories/module_font_accessories.ulf

+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_FONTS]
+en-US = "Fonts"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_FONTS]
+en-US = "Additional fonts for %PRODUCTNAME and other applications."

scp2/source/accessories/module_gallery_accessories.scp

+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+#ifdef WITH_EXTRA_GALLERY
+
+Module gid_Module_Optional_Accessories_Gallery
+    PackageInfo = "packinfo_accessories.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_GALLERY);
+    ParentID = gid_Module_Optional_Accessories;
+    Files = (
+        gid_File_Extra_Gallery_Accessories,
+        gid_File_Extra_Gallery_Draws_People_Accessories,
+        gid_File_Extra_Gallery_Photos_Plants_Accessories,
+        gid_File_Extra_Gallery_Photos_Celebration_Accessories,
+        gid_File_Extra_Gallery_Photos_Fauna_Accessories,
+        gid_File_Extra_Gallery_Photos_Flowers_Accessories,
+        gid_File_Extra_Gallery_Photos_FoodsandDrinks_Accessories,
+        gid_File_Extra_Gallery_Photos_Humans_Accessories,
+        gid_File_Extra_Gallery_Photos_Landscapes_Accessories,
+        gid_File_Extra_Gallery_Photos_Objects_Accessories,
+        gid_File_Extra_Gallery_Photos_Buildings_Accessories,
+        gid_File_Extra_Gallery_Photos_Cities_Accessories,
+        gid_File_Extra_Gallery_Photos_Space_Accessories,
+        gid_File_Extra_Gallery_Photos_Statues_Accessories
+        gid_File_Extra_Gallery_Photos_Travel_Accessories,
+        gid_File_Extra_Gallery_Elements_Bullets2_Accessories,
+        gid_File_Extra_Gallery_NONFREE_Accessories );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#endif

scp2/source/accessories/module_gallery_accessories.ulf

+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_GALLERY]
+en-US = "Additional Gallery Themes"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_GALLERY]
+en-US = "The %PRODUCTNAME Gallery contains more than 3400 elements in various themes."

scp2/source/accessories/module_samples_accessories.scp

+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+#ifdef WITH_EXTRA_SAMPLE
+
+Module gid_Module_Optional_Accessories_Advertisement
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT);
+    ParentID = gid_Module_Optional_Accessories;
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+Module gid_Module_Optional_Accessories_Documentations
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS);
+    ParentID = gid_Module_Optional_Accessories;
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+Module gid_Module_Optional_Accessories_Samples
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_SAMPLES);
+    ParentID = gid_Module_Optional_Accessories;
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#include "alllangmodules_accessories_samples_root.inc"
+
+Module gid_Module_Optional_Accessories_Adv_Template
+    ParentID = gid_Module_Optional_Accessories_Advertisement;
+    Name = "gid_Module_Optional_Accessories_Adv_Template";
+    Description = "gid_Module_Optional_Accessories_Adv_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (
+        gid_File_Extra_Samples_Advertisement_Accessories,
+        gid_File_Extra_Samples_NONFREE_Advertisement_Accessories );
+    Minimal = NO;
+    Default = YES;
+End
+
+Module gid_Module_Optional_Accessories_Doc_Template
+    ParentID = gid_Module_Optional_Accessories_Documentations;
+    Name = "gid_Module_Optional_Accessories_Doc_Template";
+    Description = "gid_Module_Optional_Accessories_Doc_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (
+        gid_File_Extra_Samples_Documentations_Accessories,
+        gid_File_Extra_Samples_NONFREE_Documentations_Accessories );
+    Minimal = YES;
+    Default = YES;
+End
+
+Module gid_Module_Optional_Accessories_Sam_Template
+    ParentID = gid_Module_Optional_Accessories_Samples;
+    Name = "gid_Module_Optional_Accessories_Sam_Template";
+    Description = "gid_Module_Optional_Accessories_Sam_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (
+        gid_File_Extra_Samples_Accessories,
+        gid_File_Extra_Samples_NONFREE_Accessories  );
+    Minimal = NO;
+    Default = YES;
+End
+
+#include "alllangmodules_accessories_samples.inc"
+
+#endif
+

scp2/source/accessories/module_templates_accessories.scp

+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+#ifdef WITH_EXTRA_TEMPLATE
+
+Module gid_Module_Optional_Accessories_Templates
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_TEMPLATES);
+    ParentID = gid_Module_Optional_Accessories;
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#include "alllangmodules_accessories_templates_root.inc"
+
+Module gid_Module_Optional_Accessories_Tem_Template
+    ParentID = gid_Module_Optional_Accessories_Templates;
+    Name = "gid_Module_Optional_Accessories_Tem_Template";
+    Description = "gid_Module_Optional_Accessories_Tem_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (
+        gid_File_Extra_Templates_Accessories,
+        gid_File_Extra_Templates_Layout_Accessories,
+        gid_File_Extra_Templates_Present_Accessories,
+        gid_File_Extra_Templates_Educate_Accessories,
+        gid_File_Extra_Templates_Finance_Accessories,
+        gid_File_Extra_Templates_Forms_Accessories,
+        gid_File_Extra_Templates_Labels_Accessories,
+        gid_File_Extra_Templates_Misc_Accessories,
+        gid_File_Extra_Templates_Officorr_Accessories,
+        gid_File_Extra_Templates_Offimisc_Accessories,
+        gid_File_Extra_Templates_Personal_Accessories,
+        gid_File_Extra_Templates_NONFREE_Accessories,
+        gid_File_Extra_Templates_NONFREE_Layout_Accessories,
+        gid_File_Extra_Templates_NONFREE_Present_Accessories,
+        gid_File_Extra_Templates_NONFREE_Educate_Accessories,
+        gid_File_Extra_Templates_NONFREE_Finance_Accessories,
+        gid_File_Extra_Templates_NONFREE_Forms_Accessories,
+        gid_File_Extra_Templates_NONFREE_Labels_Accessories,
+        gid_File_Extra_Templates_NONFREE_Misc_Accessories,
+        gid_File_Extra_Templates_NONFREE_Officorr_Accessories,
+        gid_File_Extra_Templates_NONFREE_Offimisc_Accessories,
+        gid_File_Extra_Templates_NONFREE_Personal_Accessories );
+    Minimal = NO;
+    Default = YES;
+End
+
+Module gid_Module_Optional_Accessories_Tem_Common
+    PackageInfo = "packinfo_accessories.txt";
+    ParentID = gid_Module_Optional_Accessories;
+    Name = "gid_Module_Optional_Accessories_Tem_Common";
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_TEMPLATES_COMMON);
+    Files = (
+        gid_File_Extra_Templates_Common,
+        gid_File_Extra_Templates_Common_Layout,
+        gid_File_Extra_Templates_Common_Present,
+        gid_File_Extra_Templates_Common_Educate,
+        gid_File_Extra_Templates_Common_Finance,
+        gid_File_Extra_Templates_Common_Forms,
+        gid_File_Extra_Templates_Common_Labels,
+        gid_File_Extra_Templates_Common_Misc,
+        gid_File_Extra_Templates_Common_Officorr,
+        gid_File_Extra_Templates_Common_Offimisc,
+        gid_File_Extra_Templates_Common_Personal );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#include "alllangmodules_accessories_templates.inc"
+
+#endif

scp2/source/ooo/directory_ooo.scp

@@ -1005,6 +1005,11 @@ Directory gid_Dir_Template_Forms
     DIR_IDENT_ALL_LANG(forms);
 End
 
+Directory gid_Dir_Template_Labels
+    ParentID = gid_Dir_Template_Language;
+    DIR_IDENT_ALL_LANG(labels);
+End
+
 Directory gid_Dir_Template_Layout
     ParentID = gid_Dir_Template_Language;
     DIR_IDENT_ALL_LANG(layout);
@@ -1339,3 +1344,182 @@ Directory gid_Dir_Share_Icons
 End
 
 #endif
+
+/* *** Accessories Extras *** */
+
+/* ** Gallery ** */
+
+/* Draws */
+Directory gid_Dir_Gallery_Draws
+    ParentID = gid_Dir_Gallery;
+    DosName = "Draws";
+End
+
+/* Draws - People */
+Directory gid_Dir_Gallery_Draws_People
+    ParentID = gid_Dir_Gallery_Draws;
+    DosName = "People";
+End
+
+/* Photos */
+Directory gid_Dir_Gallery_Photos
+    ParentID = gid_Dir_Gallery;
+    DosName = "Photos";
+End
+
+/* Photos - Cities */
+Directory gid_Dir_Gallery_Photos_Cities
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Cities";
+End
+
+/* Photos - Buildings */
+Directory gid_Dir_Gallery_Photos_Buildings
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Buildings";
+End
+
+/* Photos - Plants */
+Directory gid_Dir_Gallery_Photos_Plants
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Plants";
+End
+
+/* Photos - Fauna */
+Directory gid_Dir_Gallery_Photos_Fauna
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Fauna";
+End
+
+/* Photos - Flowers */
+Directory gid_Dir_Gallery_Photos_Flowers
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Flowers";
+End
+
+/* Photos - Landscapes */
+Directory gid_Dir_Gallery_Photos_Landscapes
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Landscapes";
+End
+
+/* Photos - Statues */
+Directory gid_Dir_Gallery_Photos_Statues
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Statues";
+End
+
+/* Photos - Space */
+Directory gid_Dir_Gallery_Photos_Space
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Space";
+End
+
+/* Photos - Travel */
+Directory gid_Dir_Gallery_Photos_Travel
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Travel";
+End
+
+/* Photos - Objects */
+Directory gid_Dir_Gallery_Photos_Objects
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Objects";
+End
+
+/* Photos - Humans */
+Directory gid_Dir_Gallery_Photos_Humans
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Humans";
+End
+
+/* Photos - FoodsandDrinks */
+Directory gid_Dir_Gallery_Photos_FoodsandDrinks
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "FoodsandDrinks";
+End
+
+/* Photos - Celebration */
+Directory gid_Dir_Gallery_Photos_Celebration
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Celebration";
+End
+
+/* Samples - Documentations */
+Directory gid_Dir_Samples_Documentations
+    ParentID = gid_Dir_Samples_Language;
+    DosName = "Documentations";
+End
+
+/* Samples - Advertisement */
+Directory gid_Dir_Samples_Advertisement
+    ParentID = gid_Dir_Samples_Language;
+    DosName = "Advertisement";
+End
+
+/* Elements */
+Directory gid_Dir_Gallery_Elements
+    ParentID = gid_Dir_Gallery;
+    DosName = "Elements";
+End
+
+/* Elements - Bullets 2 */
+Directory gid_Dir_Gallery_Elements_Bullets2
+    ParentID = gid_Dir_Gallery_Elements;
+    DosName = "Bullets2";
+End
+
+ /* Templates - Common */
+Directory gid_Dir_Template_Common
+    ParentID = gid_Dir_Template;
+    DosName = "common";
+End
+
+Directory gid_Dir_Template_Common_Educate
+    ParentID = gid_Dir_Template_Common;
+    DosName = "educate";
+End
+
+Directory gid_Dir_Template_Common_Finance
+    ParentID = gid_Dir_Template_Common;
+    DosName = "finance";
+End
+
+Directory gid_Dir_Template_Common_Forms
+    ParentID = gid_Dir_Template_Common;
+    DosName = "forms";
+End
+
+Directory gid_Dir_Template_Common_Labels
+    ParentID = gid_Dir_Template_Common;
+    DosName = "labels";
+End
+
+Directory gid_Dir_Template_Common_Layout
+    ParentID = gid_Dir_Template_Common;
+    DosName = "layout";
+End
+
+Directory gid_Dir_Template_Common_Misc
+    ParentID = gid_Dir_Template_Common;
+    DosName = "misc";
+End
+
+Directory gid_Dir_Template_Common_Officorr
+    ParentID = gid_Dir_Template_Common;
+    DosName = "officorr";
+End
+
+Directory gid_Dir_Template_Common_Offimisc
+    ParentID = gid_Dir_Template_Common;
+    DosName = "offimisc";
+End
+
+Directory gid_Dir_Template_Common_Personal
+    ParentID = gid_Dir_Template_Common;
+    DosName = "personal";
+End
+
+Directory gid_Dir_Template_Common_Presnt
+    ParentID = gid_Dir_Template_Common;
+    DosName = "presnt";

scp2/util/makefile.mk

@@ -86,6 +86,28 @@ SCP1FILES  = installation_ooo.par          \
              module_python_mailmerge.par   \
              file_python.par               \
              profileitem_python.par        \
+             module_accessories.par
+.IF "$(WITH_EXTRA_GALLERY)" != ""
+SCP1FILES +=                               \
+             module_gallery_accessories.par   \
+             file_gallery_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_SAMPLE)" != ""
+SCP1FILES +=                               \
+             module_samples_accessories.par   \
+             file_samples_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_TEMPLATE)" != ""
+SCP1FILES +=                               \
+             module_templates_accessories.par \
+             file_templates_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_FONT)" != ""
+SCP1FILES +=                               \
+             module_font_accessories.par      \
+             file_font_accessories.par
+.ENDIF
+SCP1FILES +=                               \
              ure_into_ooo.par              \
              ure.par                       \
              module_improvement.par        \
@@ -249,6 +271,28 @@ SCP2FILES  = installation_ooo.par          \
              module_python_mailmerge.par   \
              file_python.par               \
              profileitem_python.par        \
+             module_accessories.par
+.IF "$(WITH_EXTRA_GALLERY)" != ""
+SCP2FILES +=                               \
+             module_gallery_accessories.par   \
+             file_gallery_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_SAMPLE)" != ""
+SCP2FILES +=                               \
+             module_samples_accessories.par   \
+             file_samples_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_TEMPLATE)" != ""
+SCP2FILES +=                               \
+             module_templates_accessories.par \
+             file_templates_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_FONT)" != ""
+SCP2FILES +=                               \
+             module_font_accessories.par      \
+             file_font_accessories.par
+.ENDIF
+SCP2FILES +=                           \
              ure_into_ooo.par              \
              ure.par                       \
              module_improvement.par        \

set_soenv.in

@@ -1950,6 +1950,10 @@ ToFile( "USE_FT_EMBOLDEN",   "@USE_FT_EMBOLDEN@",  "e" );
 ToFile( "LIBXML_CFLAGS",     "@LIBXML_CFLAGS@",    "e" );
 ToFile( "LIBXML_LIBS",       "@LIBXML_LIBS@",      "e" );
 ToFile( "SYSTEM_EXPAT",      "@SYSTEM_EXPAT@",     "e" );
+ToFile( "WITH_EXTRA_GALLERY",       "@WITH_EXTRA_GALLERY@",      "e" );
+ToFile( "WITH_EXTRA_TEMPLATE",       "@WITH_EXTRA_TEMPLATE@",      "e" );
+ToFile( "WITH_EXTRA_SAMPLE",       "@WITH_EXTRA_SAMPLE@",      "e" );
+ToFile( "WITH_EXTRA_FONT",       "@WITH_EXTRA_FONT@",      "e" );
 ToFile( "SYSTEM_DB",         "@SYSTEM_DB@",        "e" );
 ToFile( "DB_VERSION",        "@DB_VERSION@",       "e" );
 ToFile( "DB_INCLUDES",       "@DB_INCLUDES@",      "e" );