[Libreoffice] ooo_custom_images to icon-themes, was: Re: Do we support classic and industrial theme?

Stefan Knorr (Astron) heinzlesspam at googlemail.com
Thu Jan 5 03:37:58 PST 2012


Hi,

On 4 January 2012 17:39, Michael Meeks <michael.meeks at suse.com> wrote:
>        Great; so - moving default_images into there and making it 'galaxy'
> would be a nice cleanup I guess; then again it may need quite some
> tweaking of scripts that hard-code it's path I suppose; particularly
> (IIRC) 'rsc' checks to make sure that the icons actually exist in there
> and would need a path.

Hm, yeah, I would like to move this to icon-themes/galaxy, but
replacing all occurrences of the string "default_images" that came up
with git grep didn't lead to something buildable, which stopped me
from implementing the idea for now, but I hope to get back to it
later. It also fails during tail_build with something rather
non-descriptive if I remember correctly.

Interestingly, there seem to be no occurrences in rsc/, instead the
ones I found are

chart2/source/controller/dialogs/dlg_DataEditor.hrc://the numbers correspond to
desktop/Zip_brand_dev.mk:$(eval $(call gb_Zip_Zip,brand_dev/intro,$(SRCDIR)/defa
desktop/Zip_shell.mk:$(eval $(call gb_Zip_Zip,shell,$(SRCDIR)/default_images/bra
desktop/branding/Makefile:ABOUT_BITMAP := $(SRCDIR)/default_images/brand/about.p
desktop/branding/Makefile:INTRO_BITMAP := $(SRCDIR)/default_images/brand/intro.p
icon-themes/industrial/TODO:    for file in `cat ../../missing`; do foo=`md5sum
reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu:
sc/source/ui/src/toolbox.src:// folder in default_images. This list is now only
set_soenv.in:$DEFIMGS              = $ds."default_images";
solenv/doc/gbuild/solenv/gbuild/alllangres.mk:            /// Sets the location
solenv/doc/gbuild/solenv/gbuild/alllangres.mk:            /// below default_imag
solenv/gbuild/AllLangResTarget.mk:gb_ResTarget_DEFIMAGESLOCATION := $(realpath $
solenv/gbuild/templates/AllLangResTarget.mk:# declaration of images folder (e.g.
solenv/inc/settings.mk:RSCDEFIMG*=default_images
sw/source/ui/app/app.src: // folder in default_images. This list is now only use

So, the real meat seems to be in solenv. I assume that either
a. default_images and custom_images need to lie in different base
folders and thus something tries to pack the Galaxy icon theme twice
(once as the default, once as a custom set) which goes wrong
b. there's a ../ too few or too many somewhere

Regards,

Astron.


More information about the LibreOffice mailing list