[Libreoffice-commits] .: 2 commits - bin/install-artwork doc/splash.txt

Michael Meeks mmeeks at kemper.freedesktop.org
Mon Oct 11 07:20:53 PDT 2010 

 bin/install-artwork |    9 -----
 doc/splash.txt      |   92 +++++-----------------------------------------------
 2 files changed, 9 insertions(+), 92 deletions(-)

New commits:
commit c48e65fee096f17331d98d9e3c10ba555cd4fca6
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Mon Oct 11 15:19:47 2010 +0100

    remove un-necessary conversion, all .png now; and document in splash.txt

diff --git a/bin/install-artwork b/bin/install-artwork
index f7857cf..7695e4a 100755
--- a/bin/install-artwork
+++ b/bin/install-artwork
@@ -37,15 +37,6 @@ if test -d $dest/default_images; then
 	cp $src/open*_*.png $dest/default_images/svx/res/ || echo "no about images to copy"
 	cp $src/*-team.png $dest/default_images/sw/res/ || echo "no team images to copy"
 
-	# Ignore convert.exe in windows/system32
-	if test -d $dest/default_images/introabout; then
-		case "`which convert`" in
-		*32/convert) ;;
-		/*) test -f $dest/default_images/introabout/intro.bmp && mv $dest/default_images/introabout/intro.bmp $dest/default_images/introabout/intro-save.bmp
-		convert $dest/default_images/introabout/intro.png -depth 24 -type TrueColor $dest/default_images/introabout/intro.bmp
-		    ;;
-		esac
-	fi
 	mkdir -p $dest/default_images/res/commandimagelist
 	mkdir -p $dest/ooo_custom_images/industrial/res/commandimagelist
 	mkdir -p $dest/ooo_custom_images/tango/res/commandimagelist
diff --git a/doc/splash.txt b/doc/splash.txt
index 458efc4..81a7828 100644
--- a/doc/splash.txt
+++ b/doc/splash.txt
@@ -1,52 +1,11 @@
 Changes / complexity in splash branding
 
-* We need a per-locale splash:
-	+ BROffice brand as well ...
-	+ need two splashes installed [ everywhere ]
-		+ what fun ! :-)
-
-* instsetoo_native/util/openoffice.lst
-	+ this needs dunging out: a devel version and a non-devel - that's it.
-	+ is this the path for the packager ?
-
-* TODO:
-	+ hack Kendy's new Linux splash code
-
-* Brazilian locale is pt_br ?
-
-* done:
-	+ binned old branding from ooo_custom_images
-	+ stopped ooo_custom_images from compiling
-	+ removed INTRO/ABOUT_BITMAP_STRINGLIST
-
-* TODO:
-	+ fix Kendy's new splash foo ...
-	+ framework branding ...
-
-* FIXME:
-	+ create a branch in clone/ to do the splash work ...
-		+ first bin broffice branding completely ...
-		+ and make the build logic fully sane
-			+ then add it back: splash first ?
-
-
-	* FIXME: we need the framework/res stuff to work too [!]
-		* SRC1FILES is the build rule ...
-		+ framework/source/services/fwk_
-
-	* FIXME - we should just grab those images from images.zip
-	  explicitly & manually ... - rather than fooling around ;-)
-
-Making:    fwk_services.srs
-: &&     LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/lib  /opt/OpenOffice/loffice/solver/330/unxlngi6.pro/bin/rsc -presponse -verbose @/tmp/mk9NVUTU
-Preprocessor commandline:  -I. -I. -I../../unxlngi6.pro/inc/fwk_services -I../inc -I../../inc/pch -I../../inc -I../../unx/inc -I../../unxlngi6.pro/inc -I. -I/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/inc/stl -I/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/inc/external -I/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/inc -I/opt/OpenOffice/loffice/solenv/unxlngi6/inc -I/opt/OpenOffice/loffice/solenv/inc -I/opt/OpenOffice/loffice/res -I/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/inc/stl -I/opt/OpenOffice/loffice/solenv/inc/Xp31 -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -I/usr/lib/jvm/java/include/native_threads/include -I/usr/include -I/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/inc/offuh -I. -I../../res -I. -DUNX -DVCL -DGCC -DC341 -DSOLAR_JAVA -DPRODUCT -DNDEBUG -DOSL_DEBUG_LEVEL=0 -DUPDVER="330m9(Build:1)" fwk_services.src /tmp/KyDZtd
-Preprocessor startline:  /opt/OpenOffice/loffice/solver/330/unxlngi6.pro/bin/rscpp @/tmp/YzOCGg
-Rsc2 commandline: /opt/OpenOffice/loffice/solver/330/unxlngi6.pro/bin/rsc2 @/tmp/W5Sqdk
-rm -f ../../unxlngi6.pro/srs/fwk_services.srs
-mv ../../unxlngi6.pro/srs/fwk_services.srs.unxlngi6.pro ../../unxlngi6.pro/srs/fwk_services.srs
-rm -f ../../unxlngi6.pro/srs/fwk_services.srs.unxlngi6.pro
-Compiling: framework/source/services/fwk_services.src
-: &&     LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/lib /usr/bin/perl /opt/OpenOffice/loffice/solenv/bin/mhids.pl fwk_services.src ../../unxlngi6.pro/srs framework -DLINUX -DUNX -DVCL -DGCC -DC341 -DINTEL -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -DHAVE_GCC_VISIBILITY_FEATURE -DX86 -D__DMAKE -DUNIX -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=/usr/include/c++/4.5 -DSUPD=330 -DPRODUCT -DNDEBUG -DOSL_DEBUG_LEVEL=0 -DOPTIMIZE -DGSTREAMER -DCUI -DSOLAR_JAVA   -I. -I../../unxlngi6.pro/inc/fwk_services -I../inc -I../../inc/pch -I../../inc -I../../unx/inc -I../../unxlngi6.pro/inc -I. -I/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/inc/stl -I/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/inc/external -I/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/inc -I/opt/OpenOffice/loffice/solenv/unxlngi6/inc -I/opt/OpenOffice/loffice/solenv/inc -I/opt/OpenOffice/loffice/res -I/opt/OpenOffice/loff
 ice/solver/330/unxlngi6.pro/inc/stl -I/opt/OpenOffice/loffice/solenv/inc/Xp31 -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -I/usr/lib/jvm/java/include/native_threads/include -I/usr/include  -I/opt/OpenOffice/loffice/solver/330/unxlngi6.pro/inc/offuh -I. -I../../res -I.
-Making:    fwk_services_srs.hid
-cat /tmp/mkKnhkL3 | xargs -s 1000 cat > ../../unxlngi6.pro/srs/fwk_services_srs.hid.unxlngi6.pro.tmp
-Making:    all_fwk_services.dpslo
+* The new splash code is simple.
+	+ we only load .png files
+	+ we look in program/ for 'about.png' and 'intro.png'
+	+ we load locale-sensitive images
+	+ we install brazilian variants for BrOffice
+
+* The new 'shell' code is simple too
+	+ it looks in program/shell for it's artwork
+	+ I added a README.txt to default_images to explain the code locations
commit b908244a7f00b7d0b4713ca6684ffce8618dbc0e
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Mon Oct 11 12:07:56 2010 +0100

    update

diff --git a/doc/splash.txt b/doc/splash.txt
index 50538d2..458efc4 100644
--- a/doc/splash.txt
+++ b/doc/splash.txt
@@ -1,43 +1,27 @@
 Changes / complexity in splash branding
 
-* Current code just reads intro.bmp from program/
-
-* Help->About code
-    + reads file of name from ooo.src
-    + images.zip created in instsetoo_native/packimages/makefile.mk
-	+ includes file with name from ooo.src via .ilst
-    + not included in Gnome though ...
-
-* For now - just hack d.lst to deliver our splash
-    + this also grotesquely dithered - by slow loading code.
-
-
----- per locale splash ----
-
-* we should add some locale foo to that [!]
-
 * We need a per-locale splash:
-	+ BROffice ... [!] fun.
+	+ BROffice brand as well ...
 	+ need two splashes installed [ everywhere ]
 		+ what fun ! :-)
 
-+ BROffice splash ... [!]
-	+ [fun!]
-	+ locale-based splashing ...
+* instsetoo_native/util/openoffice.lst
+	+ this needs dunging out: a devel version and a non-devel - that's it.
+	+ is this the path for the packager ?
 
-	* what loads the splash ?
-		+ and how - also hack Kendy's new splash app :-)
+* TODO:
+	+ hack Kendy's new Linux splash code
 
 * Brazilian locale is pt_br ?
 
+* done:
+	+ binned old branding from ooo_custom_images
+	+ stopped ooo_custom_images from compiling
+	+ removed INTRO/ABOUT_BITMAP_STRINGLIST
 
-ooo_custom_images:
-	./broffice/introabout/intro.png
-	./nologo_broffice/introabout/intro.png
-
-	./dev/introabout/intro.png
-	./dev_broffice/introabout/intro.png
-
+* TODO:
+	+ fix Kendy's new splash foo ...
+	+ framework branding ...
 
 * FIXME:
 	+ create a branch in clone/ to do the splash work ...
@@ -45,23 +29,6 @@ ooo_custom_images:
 		+ and make the build logic fully sane
 			+ then add it back: splash first ?
 
-* FIXME - we want the 'frame' stuff ...
-
-	default_images/introabout/ ?
-
-instsetoo_native/prj/build.lst:oon instsetoo_native :: l10n postprocess packimages testautomation ooo_custom_images NULL
-        + clean it up !
-
-	* checkout desktop/zipintro [!]
-
-	* we no longer need the 'deliver' in there ...
-		* creates an images_brand_$(TARGET)
-		+ no need for that [!] :-)
-
-	+ no 'deliver' foo so ...
-
-	* we want to include the intro.png as a file ...
-
 
 	* FIXME: we need the framework/res stuff to work too [!]
 		* SRC1FILES is the build rule ...

More information about the Libreoffice-commits mailing list