diff options
37 files changed, 8 insertions, 5 deletions
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk index 6a1ff592d636..a382d51e797a 100644 --- a/desktop/zipintro/makefile.mk +++ b/desktop/zipintro/makefile.mk @@ -37,16 +37,16 @@ DEFAULT_FLAVOURS=dev dev_nologo nologo broffice dev_broffice nologo_broffice nol ZIP1LIST= \ $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.bmp $(ABOUT_BITMAPS)) + $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS)) ZIP2LIST= \ $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev_nologo$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.bmp $(ABOUT_BITMAPS)) + $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS)) ZIP3LIST= \ $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/nologo$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.bmp $(ABOUT_BITMAPS)) + $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS)) ZIP4LIST= \ - $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.bmp $(ABOUT_BITMAPS)) + $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/intro.png $(INTRO_BITMAPS)) \ + $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS)) ZIP5LIST= \ $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev_broffice$/introabout$/intro.bmp $(INTRO_BITMAPS)) \ $(null,$(ABOUT_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/about.bmp $(ABOUT_BITMAPS)) @@ -129,3 +129,6 @@ $(MISC)$/%.bmp : $(SOLARSRC)$/%.bmp @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ +$(MISC)$/%.png : $(SOLARSRC)$/%.png + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ diff --git a/sysui/desktop/icons/hicolor/128x128/apps/base.png b/sysui/desktop/icons/hicolor/128x128/apps/base.png Binary files differindex 42b027626c3a..398c2f058d92 100755 --- a/sysui/desktop/icons/hicolor/128x128/apps/base.png +++ b/sysui/desktop/icons/hicolor/128x128/apps/base.png diff --git a/sysui/desktop/icons/hicolor/128x128/apps/calc.png b/sysui/desktop/icons/hicolor/128x128/apps/calc.png Binary files differindex 368fb03e2d9c..8156308833f7 100644 --- a/sysui/desktop/icons/hicolor/128x128/apps/calc.png +++ b/sysui/desktop/icons/hicolor/128x128/apps/calc.png diff --git a/sysui/desktop/icons/hicolor/128x128/apps/draw.png b/sysui/desktop/icons/hicolor/128x128/apps/draw.png Binary files differindex 72b67c831218..3f71b25fe107 100755 --- a/sysui/desktop/icons/hicolor/128x128/apps/draw.png +++ b/sysui/desktop/icons/hicolor/128x128/apps/draw.png diff --git a/sysui/desktop/icons/hicolor/128x128/apps/impress.png b/sysui/desktop/icons/hicolor/128x128/apps/impress.png Binary files differindex 32ad785e16ce..b62b449e574f 100755 --- a/sysui/desktop/icons/hicolor/128x128/apps/impress.png +++ b/sysui/desktop/icons/hicolor/128x128/apps/impress.png diff --git a/sysui/desktop/icons/hicolor/128x128/apps/main.png b/sysui/desktop/icons/hicolor/128x128/apps/main.png Binary files differindex fd68a10960a6..1b51a60bddea 100755 --- a/sysui/desktop/icons/hicolor/128x128/apps/main.png +++ b/sysui/desktop/icons/hicolor/128x128/apps/main.png diff --git a/sysui/desktop/icons/hicolor/128x128/apps/math.png b/sysui/desktop/icons/hicolor/128x128/apps/math.png Binary files differindex 79e71ce22321..d37c98aa405e 100755 --- a/sysui/desktop/icons/hicolor/128x128/apps/math.png +++ b/sysui/desktop/icons/hicolor/128x128/apps/math.png diff --git a/sysui/desktop/icons/hicolor/128x128/apps/writer.png b/sysui/desktop/icons/hicolor/128x128/apps/writer.png Binary files differindex 0d057fa4baff..b991a6d2e233 100755 --- a/sysui/desktop/icons/hicolor/128x128/apps/writer.png +++ b/sysui/desktop/icons/hicolor/128x128/apps/writer.png diff --git a/sysui/desktop/icons/hicolor/16x16/apps/base.png b/sysui/desktop/icons/hicolor/16x16/apps/base.png Binary files differindex 3a08ee118221..57a4477cc662 100644 --- a/sysui/desktop/icons/hicolor/16x16/apps/base.png +++ b/sysui/desktop/icons/hicolor/16x16/apps/base.png diff --git a/sysui/desktop/icons/hicolor/16x16/apps/calc.png b/sysui/desktop/icons/hicolor/16x16/apps/calc.png Binary files differindex 2dc540711b3c..78f923d0edf7 100644 --- a/sysui/desktop/icons/hicolor/16x16/apps/calc.png +++ b/sysui/desktop/icons/hicolor/16x16/apps/calc.png diff --git a/sysui/desktop/icons/hicolor/16x16/apps/draw.png b/sysui/desktop/icons/hicolor/16x16/apps/draw.png Binary files differindex afc037060da2..7779dd46f374 100644 --- a/sysui/desktop/icons/hicolor/16x16/apps/draw.png +++ b/sysui/desktop/icons/hicolor/16x16/apps/draw.png diff --git a/sysui/desktop/icons/hicolor/16x16/apps/impress.png b/sysui/desktop/icons/hicolor/16x16/apps/impress.png Binary files differindex f1957da748a3..ff07597b1d5e 100644 --- a/sysui/desktop/icons/hicolor/16x16/apps/impress.png +++ b/sysui/desktop/icons/hicolor/16x16/apps/impress.png diff --git a/sysui/desktop/icons/hicolor/16x16/apps/main.png b/sysui/desktop/icons/hicolor/16x16/apps/main.png Binary files differnew file mode 100755 index 000000000000..3aa8f08a8c5d --- /dev/null +++ b/sysui/desktop/icons/hicolor/16x16/apps/main.png diff --git a/sysui/desktop/icons/hicolor/16x16/apps/math.png b/sysui/desktop/icons/hicolor/16x16/apps/math.png Binary files differindex de1488226a19..10c71e6caa2e 100644 --- a/sysui/desktop/icons/hicolor/16x16/apps/math.png +++ b/sysui/desktop/icons/hicolor/16x16/apps/math.png diff --git a/sysui/desktop/icons/hicolor/16x16/apps/writer.png b/sysui/desktop/icons/hicolor/16x16/apps/writer.png Binary files differindex 8304269862ac..2b82110e180b 100644 --- a/sysui/desktop/icons/hicolor/16x16/apps/writer.png +++ b/sysui/desktop/icons/hicolor/16x16/apps/writer.png diff --git a/sysui/desktop/icons/hicolor/32x32/apps/base.png b/sysui/desktop/icons/hicolor/32x32/apps/base.png Binary files differindex f30fe4a53c54..f4772d75dac3 100644 --- a/sysui/desktop/icons/hicolor/32x32/apps/base.png +++ b/sysui/desktop/icons/hicolor/32x32/apps/base.png diff --git a/sysui/desktop/icons/hicolor/32x32/apps/calc.png b/sysui/desktop/icons/hicolor/32x32/apps/calc.png Binary files differindex 4e7e423d713e..a1eae7b37a17 100644 --- a/sysui/desktop/icons/hicolor/32x32/apps/calc.png +++ b/sysui/desktop/icons/hicolor/32x32/apps/calc.png diff --git a/sysui/desktop/icons/hicolor/32x32/apps/draw.png b/sysui/desktop/icons/hicolor/32x32/apps/draw.png Binary files differindex f34faf5b51fa..4dc928a35168 100644 --- a/sysui/desktop/icons/hicolor/32x32/apps/draw.png +++ b/sysui/desktop/icons/hicolor/32x32/apps/draw.png diff --git a/sysui/desktop/icons/hicolor/32x32/apps/impress.png b/sysui/desktop/icons/hicolor/32x32/apps/impress.png Binary files differindex 7b8ec6432fc7..9abced7df4ba 100644 --- a/sysui/desktop/icons/hicolor/32x32/apps/impress.png +++ b/sysui/desktop/icons/hicolor/32x32/apps/impress.png diff --git a/sysui/desktop/icons/hicolor/32x32/apps/main.png b/sysui/desktop/icons/hicolor/32x32/apps/main.png Binary files differnew file mode 100755 index 000000000000..296c6f4c58b1 --- /dev/null +++ b/sysui/desktop/icons/hicolor/32x32/apps/main.png diff --git a/sysui/desktop/icons/hicolor/32x32/apps/math.png b/sysui/desktop/icons/hicolor/32x32/apps/math.png Binary files differindex 6c3c3b68f05d..146a7dea71b6 100644 --- a/sysui/desktop/icons/hicolor/32x32/apps/math.png +++ b/sysui/desktop/icons/hicolor/32x32/apps/math.png diff --git a/sysui/desktop/icons/hicolor/32x32/apps/writer.png b/sysui/desktop/icons/hicolor/32x32/apps/writer.png Binary files differindex 8a5943255821..97b9d3f5cfb3 100644 --- a/sysui/desktop/icons/hicolor/32x32/apps/writer.png +++ b/sysui/desktop/icons/hicolor/32x32/apps/writer.png diff --git a/sysui/desktop/icons/hicolor/48x48/apps/base.png b/sysui/desktop/icons/hicolor/48x48/apps/base.png Binary files differindex d68e712812d1..382ad3e6ec54 100644 --- a/sysui/desktop/icons/hicolor/48x48/apps/base.png +++ b/sysui/desktop/icons/hicolor/48x48/apps/base.png diff --git a/sysui/desktop/icons/hicolor/48x48/apps/calc.png b/sysui/desktop/icons/hicolor/48x48/apps/calc.png Binary files differindex 33690ba3c21c..d94aae38fbdd 100644 --- a/sysui/desktop/icons/hicolor/48x48/apps/calc.png +++ b/sysui/desktop/icons/hicolor/48x48/apps/calc.png diff --git a/sysui/desktop/icons/hicolor/48x48/apps/draw.png b/sysui/desktop/icons/hicolor/48x48/apps/draw.png Binary files differindex 2acb57226dc0..1a2d252c7cbf 100644 --- a/sysui/desktop/icons/hicolor/48x48/apps/draw.png +++ b/sysui/desktop/icons/hicolor/48x48/apps/draw.png diff --git a/sysui/desktop/icons/hicolor/48x48/apps/impress.png b/sysui/desktop/icons/hicolor/48x48/apps/impress.png Binary files differindex a46324e006bb..35d3b25c5566 100644 --- a/sysui/desktop/icons/hicolor/48x48/apps/impress.png +++ b/sysui/desktop/icons/hicolor/48x48/apps/impress.png diff --git a/sysui/desktop/icons/hicolor/48x48/apps/main.png b/sysui/desktop/icons/hicolor/48x48/apps/main.png Binary files differnew file mode 100755 index 000000000000..86bcf599553f --- /dev/null +++ b/sysui/desktop/icons/hicolor/48x48/apps/main.png diff --git a/sysui/desktop/icons/hicolor/48x48/apps/math.png b/sysui/desktop/icons/hicolor/48x48/apps/math.png Binary files differindex 691ef832b1a0..3572d76b6bd9 100644 --- a/sysui/desktop/icons/hicolor/48x48/apps/math.png +++ b/sysui/desktop/icons/hicolor/48x48/apps/math.png diff --git a/sysui/desktop/icons/hicolor/48x48/apps/writer.png b/sysui/desktop/icons/hicolor/48x48/apps/writer.png Binary files differindex 9ae740237401..8041a209ddda 100644 --- a/sysui/desktop/icons/hicolor/48x48/apps/writer.png +++ b/sysui/desktop/icons/hicolor/48x48/apps/writer.png diff --git a/sysui/desktop/icons/main.icns b/sysui/desktop/icons/main.icns Binary files differindex c7ee5d7552aa..8357c09c0c89 100644..100755 --- a/sysui/desktop/icons/main.icns +++ b/sysui/desktop/icons/main.icns diff --git a/sysui/desktop/icons/ooo3_base_app.ico b/sysui/desktop/icons/ooo3_base_app.ico Binary files differindex c728e830273d..ba96b7987627 100644..100755 --- a/sysui/desktop/icons/ooo3_base_app.ico +++ b/sysui/desktop/icons/ooo3_base_app.ico diff --git a/sysui/desktop/icons/ooo3_calc_app.ico b/sysui/desktop/icons/ooo3_calc_app.ico Binary files differindex f46433ec0864..c96041541556 100644..100755 --- a/sysui/desktop/icons/ooo3_calc_app.ico +++ b/sysui/desktop/icons/ooo3_calc_app.ico diff --git a/sysui/desktop/icons/ooo3_draw_app.ico b/sysui/desktop/icons/ooo3_draw_app.ico Binary files differindex 74abe03ace38..6e00cb893786 100644..100755 --- a/sysui/desktop/icons/ooo3_draw_app.ico +++ b/sysui/desktop/icons/ooo3_draw_app.ico diff --git a/sysui/desktop/icons/ooo3_impress_app.ico b/sysui/desktop/icons/ooo3_impress_app.ico Binary files differindex 1eed9c1f1753..23ee3ecc5edf 100644..100755 --- a/sysui/desktop/icons/ooo3_impress_app.ico +++ b/sysui/desktop/icons/ooo3_impress_app.ico diff --git a/sysui/desktop/icons/ooo3_main_app.ico b/sysui/desktop/icons/ooo3_main_app.ico Binary files differindex f858d92bdd6f..98fcea3748a9 100644..100755 --- a/sysui/desktop/icons/ooo3_main_app.ico +++ b/sysui/desktop/icons/ooo3_main_app.ico diff --git a/sysui/desktop/icons/ooo3_math_app.ico b/sysui/desktop/icons/ooo3_math_app.ico Binary files differindex a7123627957a..605814c96e95 100644..100755 --- a/sysui/desktop/icons/ooo3_math_app.ico +++ b/sysui/desktop/icons/ooo3_math_app.ico diff --git a/sysui/desktop/icons/ooo3_writer_app.ico b/sysui/desktop/icons/ooo3_writer_app.ico Binary files differindex 3e7efa610be3..005bd587661b 100644..100755 --- a/sysui/desktop/icons/ooo3_writer_app.ico +++ b/sysui/desktop/icons/ooo3_writer_app.ico |
