diff options
| -rwxr-xr-x | configure.in | 50 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 16 | ||||
| -rw-r--r-- | set_soenv.in | 2 |
4 files changed, 41 insertions, 29 deletions
diff --git a/configure.in b/configure.in index 7007d3f56b94..9c9c842c0d7a 100755 --- a/configure.in +++ b/configure.in @@ -487,12 +487,6 @@ AC_ARG_ENABLE(extra-font, [Add extra font content.]), ,) -AC_ARG_ENABLE(theme, - AS_HELP_STRING([--enable-theme="theme1 theme2..."], - [Choose which themes to include. By default all available themes are included. - Possible choices: crystal, hicontrast, oxygen, tango.]), -,) - dnl ---------- Deprecated since 2010-11-05 ---------- AC_ARG_ENABLE(mysql-connector, @@ -605,6 +599,12 @@ AC_ARG_WITH(vba-package-format, ], ,) +AC_ARG_WITH(theme, + AS_HELP_STRING([--with-theme="theme1 theme2..."], + [Choose which themes to include. By default those themes with an '*' are included. + Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, classic, industrial.]), +,) + AC_ARG_WITH(extension-integration, AS_HELP_STRING([--with-extension-integration], [It will integrate the builded extensions to the installer of the product.]), @@ -7320,6 +7320,24 @@ else fi dnl =================================================================== +dnl Test which themes to include +dnl =================================================================== +AC_MSG_CHECKING([which themes to include]) +# if none given, use all available themes +if test "z$enable_theme" = "z" -o "z$enable_theme" = "zyes"; then + enable_theme="default crystal hicontrast oxygen tango" +fi + + WITH_THEMES="" + for theme in $enable_theme + do + WITH_THEMES="$WITH_THEMES $theme" + SCPDEFS="$SCPDEFS -DTHEME_`echo $theme|tr '[a-z]' '[A-Z]'`" + done + AC_MSG_RESULT([$WITH_THEMES]) +AC_SUBST(WITH_THEMES) + +dnl =================================================================== dnl Test whether to integrate extensions into the product's installer dnl =================================================================== AC_MSG_CHECKING([for extensions integration]) @@ -7642,26 +7660,6 @@ fi AC_SUBST(WITH_EXTRA_FONT) dnl =================================================================== -dnl Test which themes to include -dnl =================================================================== -AC_MSG_CHECKING([which themes to include]) -# if none given, use all available themes -if test "z$enable_theme" = "z" -o "z$enable_theme" = "zyes"; then - enable_theme="crystal hicontrast oxygen tango" -fi - - ENABLE_THEMES="" - for theme in $enable_theme - do - ENABLE_THEMES="$ENABLE_THEMES $theme" - SCPDEFS="$SCPDEFS -DTHEME_`echo $theme|tr '[a-z]' '[A-Z]'`" - done - AC_MSG_RESULT([$ENABLE_THEMES]) - -AC_SUBST(ENABLE_THEMES) -AC_SUBST(SCPDEFS) - -dnl =================================================================== dnl Test whether to enable ActiveX embedding dnl =================================================================== if test "$_os" = "WINNT"; then diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 64d91e5a3bb3..8c425b837c6c 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1836,12 +1836,14 @@ File gid_File_Jar_Productregistration End #endif +#ifdef THEME_DEFAULT File gid_File_Images_Zip TXT_FILE_BODY; Dir = gid_Dir_Share_Config; Name = "images.zip"; Styles = (PACKED); End +#endif #ifdef THEME_CRYSTAL File gid_File_ImagesCrystal_Zip diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 84f96a51c5f4..d5214eb1f354 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -766,11 +766,23 @@ Module gid_Module_Root_Files_Images Sortkey = "2050"; Default = YES; Styles = (HIDDEN_ROOT); - Files = (gid_File_Images_Zip, + Files = ( +#ifdef THEME_DEFAULT + gid_File_Images_Zip, +#endif +#ifdef THEME_CRYSTAL gid_File_ImagesCrystal_Zip, +#endif +#ifdef THEME_OXYGEN gid_File_ImagesOxygen_Zip, +#endif +#ifdef THEME_HICONTRAST gid_File_ImagesHicontrast_Zip, - gid_File_ImagesTango_Zip); +#endif +#ifdef THEME_TANGO + gid_File_ImagesTango_Zip +#endif + ); End #ifndef WITHOUT_FONTS diff --git a/set_soenv.in b/set_soenv.in index 4985cb026780..855d18452275 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1694,8 +1694,8 @@ ToFile( "ENABLE_MINIMIZER", "@ENABLE_MINIMIZER@","e" ); ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" ); ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" ); ToFile( "ENABLE_UNIX_QUICKSTARTER", "@ENABLE_UNIX_QUICKSTARTER@", "e" ); -ToFile( "ENABLE_THEMES", "@ENABLE_THEMES@","e"); ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" ); +ToFile( "WITH_THEMES", "@WITH_THEMES@", "e"); ToFile( "OOO_JUNIT_JAR", "@OOO_JUNIT_JAR@", "e" ); ToFile( "SAC_JAR", "@SAC_JAR@", "e" ); ToFile( "LIBXML_JAR", "@LIBXML_JAR@", "e" ); |