Hi All, Please review the attached files and integrate into libreoffice-3-3
Background: Now png files are default as intro and about picture files. It seems only intro.png and about.png used. These patches are: * force tu specify png files * rename and pack custom definied intro as intro.png and about as about.png. TODO: Convert the currently available custom intro and about files from bmp format to png. -- KAMI
From 9d228f63430452e52cf23c15eaf722c596128683 Mon Sep 17 00:00:00 2001 From: Kalman Szalai - KAMI <[email protected]> Date: Fri, 24 Dec 2010 03:26:44 +0100 Subject: [PATCH] Custom intro and about files now defaultly png files Prefer intro.png and about.png files following the OOo changes: 44d020db548943777b4b72334dc1b5d087e7fe02 Custom intro file renamed to intro.png Custom about file renamed to about.png --- configure.in | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index 266f7e3..5442178 100644 --- a/configure.in +++ b/configure.in @@ -1097,14 +1097,14 @@ AC_ARG_WITH(intro-bitmaps, commas), the order means priority of fallback if the first does not exist (in the installed tree). - Usage: --with-intro-bitmaps=/path/my_ooo_intro.bmp + Usage: --with-intro-bitmaps=/path/my_ooo_intro.png ],,) AC_ARG_WITH(about-bitmaps, [ --with-about-bitmaps Similarly to --with-intro-bitmaps, this allows specification of bitmaps for the About box. - Usage: --with-about-bitmaps=/path/my_ooo_about.bmp + Usage: --with-about-bitmaps=/path/my_ooo_about.png ],,) AC_ARG_WITH(vendor, @@ -7783,8 +7783,8 @@ if test -z "$with_intro_bitmaps" -o "$with_intro_bitmaps" = "no" ; then else for bitmap in `echo $with_intro_bitmaps | tr ',' ' '` ; do case "$bitmap" in - *.bmp) ;; - *) bitmap= ; AC_MSG_WARN([Intro bitmaps should be .bmp files!]) ;; + *.png) ;; + *) bitmap= ; AC_MSG_WARN([Intro bitmaps should be .png files!]) ;; esac if test -n "$bitmap" ; then INTRO_BITMAPS="$INTRO_BITMAPS $bitmap" @@ -7802,8 +7802,8 @@ if test -z "$with_about_bitmaps" -o "$with_about_bitmaps" = "no" ; then else for bitmap in `echo $with_about_bitmaps | tr ',' ' '` ; do case "$bitmap" in - *.bmp) ;; - *) bitmap= ; AC_MSG_WARN([About bitmaps should be .bmp files!]) ;; + *.png) ;; + *) bitmap= ; AC_MSG_WARN([About bitmaps should be .png files!]) ;; esac if test -n "$bitmap" ; then ABOUT_BITMAPS="$ABOUT_BITMAPS $bitmap" -- 1.7.1
From 060d1df775aca8493501ace3292e57f4baef6aba Mon Sep 17 00:00:00 2001 From: Kalman Szalai - KAMI <[email protected]> Date: Fri, 24 Dec 2010 03:13:51 +0100 Subject: [PATCH 2/2] Custom intro and about files now defaultly png files Prefer intro.png and about.png files following the OOo changes: 44d020db548943777b4b72334dc1b5d087e7fe02 Custom intro file renamed to intro.png Custom about file renamed to about.png --- desktop/util/makefile.mk | 8 ++++++++ desktop/zipintro/makefile.mk | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 3d4950c..cad11d5 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -262,3 +262,11 @@ $(MISC)$/binso_created.flg : @@-$(MKDIRHIER) $(BIN)$/so && $(TOUCH) $@ .ENDIF +.IF "$(INTRO_BITMAPS)"!="" + - $(MKDIRHIER) $(BIN)$/brand_new$/ + @$(COPY) $(INTRO_BITMAPS) $(BIN)$/brand_new$/intro.png +.ENDIF +.IF "$(ABOUT_BITMAPS)"!="" + - $(MKDIRHIER) $(BIN)$/brand_new$/ + @$(COPY) $(ABOUT_BITMAPS) $(BIN)$/brand_new$/about.png +.ENDIF diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk index d15f2de..aa9fef7 100644 --- a/desktop/zipintro/makefile.mk +++ b/desktop/zipintro/makefile.mk @@ -33,11 +33,11 @@ TARGET=zipintro .INCLUDE : settings.mk ZIP1LIST= \ - $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/intro.png $(INTRO_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/about.png $(ABOUT_BITMAPS)) + $(null,$(COMMONBIN)$/brand_new$/intro.png $(MISC)$/$(RSCDEFIMG)$/brand$/intro.png $(COMMONBIN)$/brand_new$/intro.png) \ + $(null,$(COMMONBIN)$/brand_new$/about.png $(MISC)$/$(RSCDEFIMG)$/brand$/about.png $(COMMONBIN)$/brand_new$/about.png) ZIP2LIST= \ - $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro.png $(INTRO_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about.png $(ABOUT_BITMAPS)) + $(null,$(COMMONBIN)$/brand_new$/intro.png $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro.png $(COMMONBIN)$/brand_new$/intro.png) \ + $(null,$(COMMONBIN)$/brand_new$/about.png $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about.png $(COMMONBIN)$/brand_new$/about.png) ZIP3LIST= \ $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_left.png \ $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_right.png \ -- 1.7.1
signature.asc
Description: OpenPGP digital signature
_______________________________________________ LibreOffice mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice
