diff options
| -rwxr-xr-x | configure.in | 27 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 8 | ||||
| -rw-r--r-- | set_soenv.in | 1 |
3 files changed, 36 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 7fe1e954759b..7007d3f56b94 100755 --- a/configure.in +++ b/configure.in @@ -487,6 +487,12 @@ 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, @@ -7635,8 +7641,29 @@ else 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 AC_MSG_CHECKING([whether to enable ActiveX embedding of LibO components]) if test "$enable_activex_component" = "yes" -o "$enable_activex_component" = "TRUE" -o "$enable_activex_component" = ""; then diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 0ab9fa24c590..64d91e5a3bb3 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1843,33 +1843,41 @@ File gid_File_Images_Zip Styles = (PACKED); End +#ifdef THEME_CRYSTAL File gid_File_ImagesCrystal_Zip TXT_FILE_BODY; Dir = gid_Dir_Share_Config; Name = "images_crystal.zip"; Styles = (PACKED); End +#endif +#ifdef THEME_OXYGEN File gid_File_ImagesOxygen_Zip TXT_FILE_BODY; Dir = gid_Dir_Share_Config; Name = "images_oxygen.zip"; Styles = (PACKED); End +#endif +#ifdef THEME_HICONTRAST File gid_File_ImagesHicontrast_Zip TXT_FILE_BODY; Dir = gid_Dir_Share_Config; Name = "images_hicontrast.zip"; Styles = (PACKED); End +#endif +#ifdef THEME_TANGO File gid_File_ImagesTango_Zip TXT_FILE_BODY; Dir = gid_Dir_Share_Config; Name = "images_tango.zip"; Styles = (PACKED); End +#endif File gid_File_Share_Registry_Lingucomponent_Xcd TXT_FILE_BODY; diff --git a/set_soenv.in b/set_soenv.in index cc41e617c8a7..4985cb026780 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1694,6 +1694,7 @@ 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( "OOO_JUNIT_JAR", "@OOO_JUNIT_JAR@", "e" ); ToFile( "SAC_JAR", "@SAC_JAR@", "e" ); |