Skip to content

C
core
Kaydet (Commit) 73fdc1e1 authored tarafından Jan-Marek Glogowski's avatar Jan-Marek Glogowski
Dosyalara gözat
Seçenekler

Package separate SVG icon sets 

This change packages all SVG based icon sets in seperate zip
files. It automatically generates the SVGs links.txt from
the non-SVG version, if it doesn't exists by 's/\.png/\.svg/g'.

Same for the _dark version, but this just copies it.
This would also work for a _dark_svg version, if needed.

The patch explicitly does't package sifr_svg and tango_svg.

Change-Id: I8d7fda42d0ff9a2108ba8406bd4e82af4c54ff0c
Reviewed-on: https://gerrit.libreoffice.org/62706
Tested-by: Jenkins
Reviewed-by: 's avatarJan-Marek Glogowski <glogow@fbihome.de>
üst b0dbd78d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 473 deletions
configure.ac
Dosyayı görüntüle @ 73fdc1e1
......@@ -1576,7 +1576,8 @@ AC_ARG_WITH(galleries,
AC_ARG_WITH(theme,
AS_HELP_STRING([--with-theme="theme1 theme2..."],
[Choose which themes to include. By default those themes with an '*' are included.
Possible choices: *breeze, *breeze_dark, *colibre, *elementary, *karasa_jaga, *sifr, *sifr_dark, *tango.]),
Possible choices: *breeze, *breeze_dark, *breeze_svg, *colibre, *colibre_svg, *elementary,
*elementary_svg, *karasa_jaga, *sifr, *sifr_dark, *tango.]),
,)
libo_FUZZ_ARG_WITH(helppack-integration,
......@@ -11377,14 +11378,14 @@ dnl ===================================================================
AC_MSG_CHECKING([which themes to include])
# if none given use default subset of available themes
if test "x$with_theme" = "x" -o "x$with_theme" = "xyes"; then
with_theme="breeze breeze_dark colibre elementary karasa_jaga sifr sifr_dark tango"
with_theme="breeze breeze_dark breeze_svg colibre colibre_svg elementary elementary_svg karasa_jaga sifr sifr_dark tango"
fi
WITH_THEMES=""
if test "x$with_theme" != "xno"; then
for theme in $with_theme; do
case $theme in
breeze|breeze_dark|colibre|elementary|karasa_jaga|sifr|sifr_dark|tango) real_theme="$theme" ;;
breeze|breeze_dark|breeze_svg|colibre|colibre_svg|elementary|elementary_svg|karasa_jaga|sifr|sifr_dark|tango) real_theme="$theme" ;;
default) real_theme=colibre ;;
*) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
esac
......
icon-themes/breeze_dark/links.txt deleted 100644 → 0
Dosyayı görüntüle @ b0dbd78d
This diff is collapsed.
icon-themes/breeze_svg/links.txt deleted 100644 → 0
Dosyayı görüntüle @ b0dbd78d
This diff is collapsed.
icon-themes/elementary_svg/links.txt deleted 100644 → 0
Dosyayı görüntüle @ b0dbd78d
This diff is collapsed.
icon-themes/sifr_dark/links.txt deleted 100644 → 0
Dosyayı görüntüle @ b0dbd78d
# Navigator - Writer
sw/res/all_left.png cmd/sc_firstpage.png
sw/res/all_right.png cmd/sc_lastpage.png
sw/res/one_left.png cmd/sc_navigateback.png
sw/res/one_right.png cmd/sc_navigateforward.png
sw/res/styfamnu.png cmd/sc_defaultbullet.png
sw/res/nc20001.png cmd/sc_inserttable.png
sw/res/nc20002.png cmd/sc_text.png
sw/res/nc20003.png cmd/sc_insertgraphic.png
sw/res/nc20004.png cmd/sc_drawchart.png
sw/res/nc20005.png cmd/sc_insertbookmark.png
sw/res/nc20006.png cmd/sc_insertsection.png
sw/res/nc20007.png cmd/sc_inserthyperlink.png
sw/res/nc20008.png cmd/sc_insertreferencefield.png
sw/res/nc20009.png cmd/sc_insertindexesentry.png
sw/res/nc20010.png cmd/sc_insertannotation.png
sw/res/nc20011.png cmd/sc_insertdraw.png
sw/res/sc20171.png cmd/sc_downsearch.png
sw/res/sc20172.png cmd/sc_navigateback.png
sw/res/sc20173.png cmd/sc_navigateforward.png
sw/res/sc20174.png cmd/sc_upsearch.png
sw/res/sc20175.png cmd/sc_flowchartshapes.flowchart-merge.png
sw/res/sc20186.png cmd/sc_flowchartshapes.flowchart-extract.png
sw/res/sc20235.png cmd/sc_inserthyperlink.png
sw/res/sc20239.png cmd/sc_copy.png
sw/res/sc20249.png cmd/sc_navigator.png
sw/res/sf01.png cmd/sc_controlcodes.png
sw/res/sf02.png cmd/sc_bold.png
sw/res/sf04.png cmd/sc_adddirect.png
sw/res/sf05.png cmd/sc_defaultbullet.png
sw/res/sr20000.png cmd/sc_downsearch.png
sw/res/sr20001.png cmd/sc_upsearch.png
sw/res/sr20002.png cmd/sc_inserttable.png
sw/res/sr20003.png cmd/sc_text.png
sw/res/sr20004.png cmd/sc_adddirect.png
sw/res/sr20005.png cmd/sc_insertdraw.png
sw/res/sr20006.png cmd/sc_choosecontrols.png
sw/res/sr20007.png cmd/sc_insertsection.png
sw/res/sr20008.png cmd/sc_insertbookmark.png
sw/res/sr20009.png cmd/sc_insertgraphic.png
sw/res/sr20010.png cmd/sc_drawchart.png
sw/res/sr20015.png cmd/sc_insertannotation.png
sw/res/sr20016.png cmd/sc_searchdialog.png
sw/res/sr20013.png cmd/sc_insertfootnote.png
sw/res/sr20014.png sw/res/sc20183.png
sw/res/sr20017.png cmd/sc_insertindexesentry.png
# Navigator - Calc
sc/res/na05.png cmd/sc_upsearch.png
sc/res/na06.png cmd/sc_downsearch.png
sc/res/nc01.png cmd/sc_inserttable.png
sc/res/nc04.png cmd/sc_insertgraphic.png
sc/res/nc05.png cmd/sc_drawchart.png
sc/res/nc06.png cmd/sc_insertannotation.png
sc/res/nc08.png cmd/sc_insertdraw.png
sc/res/table.png cmd/sc_inserttable.png
# Thesaurus
cmd/lc_thesaurusdialog.png cmd/lc_thesaurus.png
cmd/sc_thesaurusdialog.png cmd/sc_thesaurus.png
# Print Preview Toolbar
cmd/lc_showsinglepage.png cmd/lc_adddirect.png
cmd/sc_showsinglepage.png cmd/sc_adddirect.png
cmd/lc_closepreview.png cmd/lc_exitsearch.png
cmd/sc_closepreview.png cmd/sc_exitsearch.png
# Horizontal Text Alignment (align* is in calc and *para is used in writer)
#cmd/lc_alignleft.png cmd/lc_leftpara.png
#cmd/sc_alignleft.png cmd/sc_leftpara.png
#cmd/lc_alignhorizontalcenter.png cmd/lc_centerpara.png
#cmd/sc_alignhorizontalcenter.png cmd/sc_centerpara.png
#cmd/lc_alignright.png cmd/lc_rightpara.png
#cmd/sc_alignright.png cmd/sc_rightpara.png
#cmd/lc_alignblock.png cmd/lc_justifypara.png
#cmd/sc_alignblock.png cmd/sc_justifypara.png
# Colors (fontcolor is used in writer's formatting toolbar)
cmd/lc_fontcolor.png cmd/lc_color.png
cmd/sc_fontcolor.png cmd/sc_color.png
# Vertical Text Alignment (cellvert* is used in writer and align* is used in calc)
cmd/lc_cellverttop.png cmd/lc_aligntop.png
cmd/sc_cellverttop.png cmd/sc_aligntop.png
cmd/lc_cellvertcenter.png cmd/lc_alignverticalcenter.png
cmd/sc_cellvertcenter.png cmd/sc_alignverticalcenter.png
cmd/lc_cellvertbottom.png cmd/lc_alignbottom.png
cmd/sc_cellvertbottom.png cmd/sc_alignbottom.png
# Spellcheck
cmd/lc_spelldialog.png cmd/lc_spelling.png
cmd/sc_spelldialog.png cmd/sc_spelling.png
cmd/lc_spellingandgrammardialog.png cmd/lc_spelling.png
cmd/sc_spellingandgrammardialog.png cmd/sc_spelling.png
# Calc
cmd/lc_numberformatcurrency.png cmd/lc_insertcurrencyfield.png
cmd/sc_numberformatcurrency.png cmd/sc_insertcurrencyfield.png
cmd/lc_numberformatcurrencysimple.png cmd/lc_insertcurrencyfield.png
cmd/sc_numberformatcurrencysimple.png cmd/sc_insertcurrencyfield.png
cmd/lc_linestyle.png cmd/lc_borderdialog.png
cmd/sc_linestyle.png cmd/sc_borderdialog.png
# Date Icons
cmd/lc_adddatefield.png cmd/lc_datefield.png
cmd/lc_insertdatefield.png cmd/lc_datefield.png
cmd/lc_numberformatdate.png cmd/lc_datefield.png
cmd/sc_adddatefield.png cmd/sc_datefield.png
cmd/sc_insertdatefield.png cmd/sc_datefield.png
cmd/sc_numberformatdate.png cmd/sc_datefield.png
sc/res/date.png cmd/sc_datefield.png
# Find Toolbar
cmd/lc_scrolltonext.png cmd/lc_downsearch.png
cmd/sc_scrolltonext.png cmd/sc_downsearch.png
cmd/lc_scrolltoprevious.png cmd/lc_upsearch.png
cmd/sc_scrolltoprevious.png cmd/sc_upsearch.png
# paragraph line spacing drop down
cmd/lc_linespacing.png cmd/lc_spacepara15.png
cmd/sc_linespacing.png cmd/sc_spacepara15.png
# image icon duplicates
cmd/sc_graphicdialog.png cmd/sc_insertgraphic.png
# Impress
cmd/lc_insertavmedia.png cmd/lc_avmediaplayer.png
cmd/sc_insertavmedia.png cmd/sc_avmediaplayer.png
cmd/lc_insertmath.png cmd/lc_insertobjectstarmath.png
cmd/lc_arrowtoolbox.png cmd/lc_linearrowend.png
cmd/sc_arrowtoolbox.png cmd/sc_linearrowend.png
# Writer - Table toolbar
cmd/lc_tablesort.png cmd/lc_datasort.png
cmd/sc_tablesort.png cmd/sc_datasort.png
# Writer - Standard toolbar
cmd/lc_charmapcontrol.png cmd/lc_insertsymbol.png
cmd/sc_charmapcontrol.png cmd/sc_insertsymbol.png
# Draw - Line and Filling Toolbar
cmd/lc_advancedmode.png cmd/lc_toggleobjectrotatemode.png
cmd/sc_advancedmode.png cmd/sc_toggleobjectrotatemode.png
# calc insert page breaks
cmd/lc_insertrowbreak.png cmd/lc_insertpagebreak.png
cmd/sc_insertrowbreak.png cmd/sc_insertpagebreak.png
# calc autofilter
cmd/lc_datafilterautofilter.png cmd/lc_autofilter.png
cmd/sc_datafilterautofilter.png cmd/sc_autofilter.png
# calc fx function symbol
cmd/lc_functiondialog.png cmd/lc_insertformula.png
cmd/sc_functiondialog.png cmd/sc_insertformula.png
formula/res/fx.png cmd/sc_dbviewfunctions.png
# text background colour Impress/Draw
cmd/sc_charbackcolor.png cmd/sc_backcolor.png
cmd/lc_charbackcolor.png cmd/lc_backcolor.png
# simple save button
cmd/lc_savesimple.png cmd/lc_save.png
cmd/sc_savesimple.png cmd/sc_save.png
cmd/lc_underlinesimple.png cmd/lc_underline.png
cmd/sc_underlinesimple.png cmd/sc_underline.png
# anchor menu
cmd/lc_anchormenu.png cmd/lc_toggleanchortype.png
cmd/sc_anchormenu.png cmd/sc_toggleanchortype.png
# Mail merge
cmd/lc_mailmergewizard.png cmd/lc_dsbformletter.png
cmd/sc_mailmergewizard.png cmd/sc_dsbformletter.png
cmd/lc_mailmergefirstentry.png cmd/lc_firstrecord.png
cmd/sc_mailmergefirstentry.png cmd/sc_firstrecord.png
cmd/lc_mailmergelastentry.png cmd/lc_lastrecord.png
cmd/sc_mailmergelastentry.png cmd/sc_lastrecord.png
cmd/lc_mailmergenextentry.png cmd/lc_nextrecord.png
cmd/sc_mailmergenextentry.png cmd/sc_nextrecord.png
cmd/lc_mailmergepreventry.png cmd/lc_prevrecord.png
cmd/sc_mailmergepreventry.png cmd/sc_prevrecord.png
# Slide command aliases
cmd/lc_insertslide.png cmd/lc_insertpage.png
cmd/lc_duplicateslide.png cmd/lc_duplicatepage.png
cmd/lc_deleteslide.png cmd/lc_deletepage.png
cmd/lc_firstslide.png cmd/lc_firstpage.png
cmd/lc_lastslide.png cmd/lc_lastpage.png
cmd/lc_slidesetup.png cmd/lc_pagesetup.png
cmd/sc_insertslide.png cmd/sc_insertpage.png
cmd/sc_duplicateslide.png cmd/sc_duplicatepage.png
cmd/sc_deleteslide.png cmd/sc_deletepage.png
cmd/sc_firstslide.png cmd/sc_firstpage.png
cmd/sc_lastslide.png cmd/sc_lastpage.png
cmd/sc_slidesetup.png cmd/sc_pagesetup.png
cmd/lc_columnoperations.png cmd/lc_entirecolumn.png
cmd/sc_columnoperations.png cmd/sc_entirecolumn.png
cmd/lc_rowoperations.png cmd/lc_entirerow.png
cmd/sc_rowoperations.png cmd/sc_entirerow.png
cmd/lc_objectforwardone.png cmd/lc_forward.png
cmd/sc_objectforwardone.png cmd/sc_forward.png
cmd/lc_objectbackone.png cmd/lc_backward.png
cmd/sc_objectbackone.png cmd/sc_backward.png
# writer pdf and epub export
cmd/lc_exporttopdf.png cmd/lc_exportdirecttopdf.png
cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png
cmd/lc_exporttoepub.png cmd/lc_exportdirecttoepub.png
cmd/sc_exporttoepub.png cmd/sc_exportdirecttoepub.png
# writer formatting style toolbar
cmd/lc_bulletliststyle.png cmd/lc_defaultbullet.png
cmd/sc_bulletliststyle.png cmd/sc_defaultbullet.png
cmd/lc_numberliststyle.png cmd/lc_defaultnumbering.png
cmd/sc_numberliststyle.png cmd/sc_defaultnumbering.png
# view menu
cmd/lc_viewsidebarstyles.png cmd/lc_designerdialog.png
cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png
icon-themes/sifr_svg/links.txt deleted 100644 → 0
Dosyayı görüntüle @ b0dbd78d
# Navigator - Writer
sw/res/all_left.png cmd/sc_firstpage.png
sw/res/all_right.png cmd/sc_lastpage.png
sw/res/one_left.png cmd/sc_navigateback.png
sw/res/one_right.png cmd/sc_navigateforward.png
sw/res/styfamnu.png cmd/sc_defaultbullet.png
sw/res/nc20001.png cmd/sc_inserttable.png
sw/res/nc20002.png cmd/sc_text.png
sw/res/nc20003.png cmd/sc_insertgraphic.png
sw/res/nc20004.png cmd/sc_drawchart.png
sw/res/nc20005.png cmd/sc_insertbookmark.png
sw/res/nc20006.png cmd/sc_insertsection.png
sw/res/nc20007.png cmd/sc_inserthyperlink.png
sw/res/nc20008.png cmd/sc_insertreferencefield.png
sw/res/nc20009.png cmd/sc_insertindexesentry.png
sw/res/nc20010.png cmd/sc_insertannotation.png
sw/res/nc20011.png cmd/sc_insertdraw.png
sw/res/sc20171.png cmd/sc_downsearch.png
sw/res/sc20172.png cmd/sc_navigateback.png
sw/res/sc20173.png cmd/sc_navigateforward.png
sw/res/sc20174.png cmd/sc_upsearch.png
sw/res/sc20175.png cmd/sc_flowchartshapes.flowchart-merge.png
sw/res/sc20186.png cmd/sc_flowchartshapes.flowchart-extract.png
sw/res/sc20235.png cmd/sc_inserthyperlink.png
sw/res/sc20239.png cmd/sc_copy.png
sw/res/sc20249.png cmd/sc_navigator.png
sw/res/sf01.png cmd/sc_controlcodes.png
sw/res/sf02.png cmd/sc_bold.png
sw/res/sf04.png cmd/sc_adddirect.png
sw/res/sf05.png cmd/sc_defaultbullet.png
sw/res/sr20000.png cmd/sc_downsearch.png
sw/res/sr20001.png cmd/sc_upsearch.png
sw/res/sr20002.png cmd/sc_inserttable.png
sw/res/sr20003.png cmd/sc_text.png
sw/res/sr20004.png cmd/sc_adddirect.png
sw/res/sr20005.png cmd/sc_insertdraw.png
sw/res/sr20006.png cmd/sc_choosecontrols.png
sw/res/sr20007.png cmd/sc_insertsection.png
sw/res/sr20008.png cmd/sc_insertbookmark.png
sw/res/sr20009.png cmd/sc_insertgraphic.png
sw/res/sr20010.png cmd/sc_drawchart.png
sw/res/sr20015.png cmd/sc_insertannotation.png
sw/res/sr20016.png cmd/sc_searchdialog.png
sw/res/sr20013.png cmd/sc_insertfootnote.png
sw/res/sr20014.png sw/res/sc20183.png
sw/res/sr20017.png cmd/sc_insertindexesentry.png
# Navigator - Calc
sc/res/na05.png cmd/sc_upsearch.png
sc/res/na06.png cmd/sc_downsearch.png
sc/res/nc01.png cmd/sc_inserttable.png
sc/res/nc04.png cmd/sc_insertgraphic.png
sc/res/nc05.png cmd/sc_drawchart.png
sc/res/nc06.png cmd/sc_insertannotation.png
sc/res/nc08.png cmd/sc_insertdraw.png
sc/res/table.png cmd/sc_inserttable.png
# Thesaurus
cmd/lc_thesaurusdialog.png cmd/lc_thesaurus.png
cmd/sc_thesaurusdialog.png cmd/sc_thesaurus.png
# Print Preview Toolbar
cmd/lc_showsinglepage.png cmd/lc_adddirect.png
cmd/sc_showsinglepage.png cmd/sc_adddirect.png
cmd/lc_closepreview.png cmd/lc_exitsearch.png
cmd/sc_closepreview.png cmd/sc_exitsearch.png
# Horizontal Text Alignment (align* is in calc and *para is used in writer)
#cmd/lc_alignleft.png cmd/lc_leftpara.png
#cmd/sc_alignleft.png cmd/sc_leftpara.png
#cmd/lc_alignhorizontalcenter.png cmd/lc_centerpara.png
#cmd/sc_alignhorizontalcenter.png cmd/sc_centerpara.png
#cmd/lc_alignright.png cmd/lc_rightpara.png
#cmd/sc_alignright.png cmd/sc_rightpara.png
#cmd/lc_alignblock.png cmd/lc_justifypara.png
#cmd/sc_alignblock.png cmd/sc_justifypara.png
# Colors (fontcolor is used in writer's formatting toolbar)
cmd/lc_fontcolor.png cmd/lc_color.png
cmd/sc_fontcolor.png cmd/sc_color.png
# Vertical Text Alignment (cellvert* is used in writer and align* is used in calc)
cmd/lc_cellverttop.png cmd/lc_aligntop.png
cmd/sc_cellverttop.png cmd/sc_aligntop.png
cmd/lc_cellvertcenter.png cmd/lc_alignverticalcenter.png
cmd/sc_cellvertcenter.png cmd/sc_alignverticalcenter.png
cmd/lc_cellvertbottom.png cmd/lc_alignbottom.png
cmd/sc_cellvertbottom.png cmd/sc_alignbottom.png
# Spellcheck
cmd/lc_spelldialog.png cmd/lc_spelling.png
cmd/sc_spelldialog.png cmd/sc_spelling.png
cmd/lc_spellingandgrammardialog.png cmd/lc_spelling.png
cmd/sc_spellingandgrammardialog.png cmd/sc_spelling.png
# Calc
cmd/lc_numberformatcurrency.png cmd/lc_insertcurrencyfield.png
cmd/sc_numberformatcurrency.png cmd/sc_insertcurrencyfield.png
cmd/lc_numberformatcurrencysimple.png cmd/lc_insertcurrencyfield.png
cmd/sc_numberformatcurrencysimple.png cmd/sc_insertcurrencyfield.png
cmd/lc_linestyle.png cmd/lc_borderdialog.png
cmd/sc_linestyle.png cmd/sc_borderdialog.png
# Date Icons
cmd/lc_adddatefield.png cmd/lc_datefield.png
cmd/lc_insertdatefield.png cmd/lc_datefield.png
cmd/lc_numberformatdate.png cmd/lc_datefield.png
cmd/sc_adddatefield.png cmd/sc_datefield.png
cmd/sc_insertdatefield.png cmd/sc_datefield.png
cmd/sc_numberformatdate.png cmd/sc_datefield.png
sc/res/date.png cmd/sc_datefield.png
# Find Toolbar
cmd/lc_scrolltonext.png cmd/lc_downsearch.png
cmd/sc_scrolltonext.png cmd/sc_downsearch.png
cmd/lc_scrolltoprevious.png cmd/lc_upsearch.png
cmd/sc_scrolltoprevious.png cmd/sc_upsearch.png
# paragraph line spacing drop down
cmd/lc_linespacing.png cmd/lc_spacepara15.png
cmd/sc_linespacing.png cmd/sc_spacepara15.png
# image icon duplicates
cmd/sc_graphicdialog.png cmd/sc_insertgraphic.png
# Impress
cmd/lc_insertavmedia.png cmd/lc_avmediaplayer.png
cmd/sc_insertavmedia.png cmd/sc_avmediaplayer.png
cmd/lc_insertmath.png cmd/lc_insertobjectstarmath.png
cmd/lc_arrowtoolbox.png cmd/lc_linearrowend.png
cmd/sc_arrowtoolbox.png cmd/sc_linearrowend.png
# Writer - Table toolbar
cmd/lc_tablesort.png cmd/lc_datasort.png
cmd/sc_tablesort.png cmd/sc_datasort.png
# Writer - Standard toolbar
cmd/lc_charmapcontrol.png cmd/lc_insertsymbol.png
cmd/sc_charmapcontrol.png cmd/sc_insertsymbol.png
# Draw - Line and Filling Toolbar
cmd/lc_advancedmode.png cmd/lc_toggleobjectrotatemode.png
cmd/sc_advancedmode.png cmd/sc_toggleobjectrotatemode.png
# calc insert page breaks
cmd/lc_insertrowbreak.png cmd/lc_insertpagebreak.png
cmd/sc_insertrowbreak.png cmd/sc_insertpagebreak.png
# calc autofilter
cmd/lc_datafilterautofilter.png cmd/lc_autofilter.png
cmd/sc_datafilterautofilter.png cmd/sc_autofilter.png
# calc fx function symbol
cmd/lc_functiondialog.png cmd/lc_insertformula.png
cmd/sc_functiondialog.png cmd/sc_insertformula.png
formula/res/fx.png cmd/sc_dbviewfunctions.png
# text background colour Impress/Draw
cmd/sc_charbackcolor.png cmd/sc_backcolor.png
cmd/lc_charbackcolor.png cmd/lc_backcolor.png
# simple save button
cmd/lc_savesimple.png cmd/lc_save.png
cmd/sc_savesimple.png cmd/sc_save.png
cmd/lc_underlinesimple.png cmd/lc_underline.png
cmd/sc_underlinesimple.png cmd/sc_underline.png
# anchor menu
cmd/lc_anchormenu.png cmd/lc_toggleanchortype.png
cmd/sc_anchormenu.png cmd/sc_toggleanchortype.png
# Mail merge
cmd/lc_mailmergewizard.png cmd/lc_dsbformletter.png
cmd/sc_mailmergewizard.png cmd/sc_dsbformletter.png
cmd/lc_mailmergefirstentry.png cmd/lc_firstrecord.png
cmd/sc_mailmergefirstentry.png cmd/sc_firstrecord.png
cmd/lc_mailmergelastentry.png cmd/lc_lastrecord.png
cmd/sc_mailmergelastentry.png cmd/sc_lastrecord.png
cmd/lc_mailmergenextentry.png cmd/lc_nextrecord.png
cmd/sc_mailmergenextentry.png cmd/sc_nextrecord.png
cmd/lc_mailmergepreventry.png cmd/lc_prevrecord.png
cmd/sc_mailmergepreventry.png cmd/sc_prevrecord.png
# Slide command aliases
cmd/lc_insertslide.png cmd/lc_insertpage.png
cmd/lc_duplicateslide.png cmd/lc_duplicatepage.png
cmd/lc_deleteslide.png cmd/lc_deletepage.png
cmd/lc_firstslide.png cmd/lc_firstpage.png
cmd/lc_lastslide.png cmd/lc_lastpage.png
cmd/lc_slidesetup.png cmd/lc_pagesetup.png
cmd/sc_insertslide.png cmd/sc_insertpage.png
cmd/sc_duplicateslide.png cmd/sc_duplicatepage.png
cmd/sc_deleteslide.png cmd/sc_deletepage.png
cmd/sc_firstslide.png cmd/sc_firstpage.png
cmd/sc_lastslide.png cmd/sc_lastpage.png
cmd/sc_slidesetup.png cmd/sc_pagesetup.png
cmd/lc_columnoperations.png cmd/lc_entirecolumn.png
cmd/sc_columnoperations.png cmd/sc_entirecolumn.png
cmd/lc_rowoperations.png cmd/lc_entirerow.png
cmd/sc_rowoperations.png cmd/sc_entirerow.png
cmd/lc_objectforwardone.png cmd/lc_forward.png
cmd/sc_objectforwardone.png cmd/sc_forward.png
cmd/lc_objectbackone.png cmd/lc_backward.png
cmd/sc_objectbackone.png cmd/sc_backward.png
# writer pdf and epub export
cmd/lc_exporttopdf.png cmd/lc_exportdirecttopdf.png
cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png
cmd/lc_exporttoepub.png cmd/lc_exportdirecttoepub.png
cmd/sc_exporttoepub.png cmd/sc_exportdirecttoepub.png
# writer formatting style toolbar
cmd/lc_bulletliststyle.png cmd/lc_defaultbullet.png
cmd/sc_bulletliststyle.png cmd/sc_defaultbullet.png
cmd/lc_numberliststyle.png cmd/lc_defaultnumbering.png
cmd/sc_numberliststyle.png cmd/sc_defaultnumbering.png
# view menu
cmd/lc_viewsidebarstyles.png cmd/lc_designerdialog.png
cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png
postprocess/CustomTarget_images.mk
Dosyayı görüntüle @ 73fdc1e1
......@@ -14,6 +14,7 @@ packimages_DIR := $(call gb_CustomTarget_get_workdir,postprocess/images)
$(eval $(call gb_CustomTarget_register_targets,postprocess/images,\
$(foreach theme,$(WITH_THEMES),images_$(theme).zip) \
$(foreach theme,$(WITH_THEMES),$(theme)_links.txt) \
commandimagelist.ilst \
sourceimagelist.ilst \
sorted.lst \
......@@ -21,14 +22,28 @@ $(eval $(call gb_CustomTarget_register_targets,postprocess/images,\
$(packimages_DIR)/images.zip : DEFAULT_THEME := $(true)
$(packimages_DIR)/images_%.zip : DEFAULT_THEME :=
$(packimages_DIR)/images_tango.zip : INDUSTRIAL_FALLBACK := -c $(SRCDIR)/icon-themes/industrial
$(packimages_DIR)/images%.zip : INDUSTRIAL_FALLBACK :=
$(packimages_DIR)/%.zip : \
$(packimages_DIR)/%_links.txt :
@if test -f "$(SRCDIR)/icon-themes/$*/links.txt"; then \
cp "$(SRCDIR)/icon-themes/$*/links.txt" $@.tmp ; \
else \
THEME_FILE="$(SRCDIR)/icon-themes/$(subst _svg,,$*)/links.txt" ; \
if test -f "$${THEME_FILE}"; then \
sed 's/\.png/\.svg/g' "$${THEME_FILE}" > $@.tmp ; \
fi ; \
THEME_FILE="$(SRCDIR)/icon-themes/$(subst _dark,,$*)/links.txt" ; \
if test -f "$${THEME_FILE}"; then \
cp "$${THEME_FILE}" $@.tmp ; \
fi ; \
fi
$(call gb_Helper_replace_if_different_and_touch,$@.tmp,$@)
$(packimages_DIR)/images_%.zip : \
$(packimages_DIR)/sorted.lst \
$(packimages_DIR)/commandimagelist.ilst \
$(packimages_DIR)/sourceimagelist.ilst \
$(SRCDIR)/wizards/source/imagelists/imagelists.ilst \
$(packimages_DIR)/%_links.txt \
$(call gb_Helper_get_imagelists) \
| $(call gb_ExternalExecutable_get_dependencies,python)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
......@@ -37,10 +52,10 @@ $(packimages_DIR)/%.zip : \
$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/solenv/bin/pack_images.py \
$(if $(DEFAULT_THEME),\
-g $(packimages_DIR) -m $(packimages_DIR) -c $(packimages_DIR),\
-g $(SRCDIR)/icon-themes/$(subst images_,,$*) -m $(SRCDIR)/icon-themes/$(subst images_,,$*) -c $(SRCDIR)/icon-themes/$(subst images_,,$*) \
-g $(SRCDIR)/icon-themes/$* -m $(SRCDIR)/icon-themes/$* -c $(SRCDIR)/icon-themes/$* \
) \
$(INDUSTRIAL_FALLBACK) \
-l $${ILSTFILE} \
-L $(packimages_DIR)/$*_links.txt \
-s $< -o $@ \
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null) && \
rm -rf $${ILSTFILE})
......@@ -68,7 +83,9 @@ $(packimages_DIR)/sourceimagelist.ilst : \
$(SRCDIR)/sw/inc/bitmaps.hlst \
$(SRCDIR)/vcl/inc/bitmaps.hlst \
$(SRCDIR)/xmlsecurity/inc/bitmaps.hlst
grep res $^ | cut -d'"' -f2 | sed "s/^/%MODULE%\//" | sed "s/%MODULE%.res/%GLOBALRES%/g" > $@
grep res $^ | cut -d'"' -f2 | sed "s/^/%MODULE%\//" | sed "s/%MODULE%.res/%GLOBALRES%/g" > $@.png
sed 's/\.png/\.svg/g' $@.png > $@.svg
cat $@.png $@.svg > $@
# commandimagelist.ilst and sorted.lst are phony to rebuild everything each time
.PHONY : $(packimages_DIR)/commandimagelist.ilst $(packimages_DIR)/sorted.lst
......
solenv/bin/pack_images.py
Dosyayı görüntüle @ 73fdc1e1
......@@ -36,6 +36,10 @@ def main(args):
LOGGER.error("imagelist_file '%s' doesn't exists", args.imagelist_file)
sys.exit(2)
if args.links_file is not None and not os.path.exists(args.links_file):
LOGGER.error("link_file '%s' doesn't exists", args.links_file)
sys.exit(2)
out_path = os.path.dirname(args.output_file)
for path in (out_path, args.global_path, args.module_path):
if not os.path.exists(path):
......@@ -56,7 +60,6 @@ def main(args):
elif not os.access(path, os.X_OK):
LOGGER.error("Unable to search path %s", path)
sys.exit(2)
continue
custom_paths.append(path)
......@@ -65,16 +68,19 @@ def main(args):
custom_image_list = find_custom(custom_paths)
links = {}
read_links(links, ARGS.global_path)
for path in custom_paths:
read_links(links, path)
if args.links_file is not None:
read_links(links, args.links_file)
else:
read_links(links, os.path.join(ARGS.global_path, "links.txt"))
for path in custom_paths:
read_links(links, os.path.join(path, "links.txt"))
check_links(links)
zip_list = create_zip_list(global_image_list, module_image_list, custom_image_list,
args.global_path, args.module_path)
remove_links_from_zip_list(zip_list, links)
if check_rebuild(args.output_file, imagelist_filenames, custom_paths, zip_list):
if check_rebuild(args.output_file, imagelist_filenames, custom_paths, zip_list, args.links_file):
tmp_dir = copy_images(zip_list)
create_zip_archive(zip_list, links, tmp_dir, tmp_output_file, args.sort_file)
......@@ -89,7 +95,7 @@ def main(args):
LOGGER.info("No rebuild needed. %s is up to date.", args.output_file)
def check_rebuild(zip_file, imagelist_filenames, custom_paths, zip_list):
def check_rebuild(zip_file, imagelist_filenames, custom_paths, zip_list, links_file):
""" Check if a rebuild is needed.
:type zip_file: str
......@@ -104,6 +110,9 @@ def check_rebuild(zip_file, imagelist_filenames, custom_paths, zip_list):
:type zip_list: dict
:param zip_list: List of filenames to create the zip archive.
:type links_file: str
:param links_file: filename to read the links from
:rtype: bool
:return: True if rebuild is needed and False if not.
"""
......@@ -133,11 +142,15 @@ def check_rebuild(zip_file, imagelist_filenames, custom_paths, zip_list):
return True
if compare_modtime(zip_list):
return True
for path in custom_paths:
link_file = os.path.join(path, 'links.txt')
if os.path.exists(link_file):
if zip_file_stat.st_mtime < os.stat(link_file).st_mtime:
return True
if links_file is not None:
if zip_file_stat.st_mtime < os.stat(links_file).st_mtime:
return True
else:
for path in custom_paths:
link_file = os.path.join(path, 'links.txt')
if os.path.exists(link_file):
if zip_file_stat.st_mtime < os.stat(link_file).st_mtime:
return True
return False
......@@ -165,7 +178,7 @@ def replace_zip_file(src, dst):
try:
LOGGER.info("Copy archive '%s' to '%s'", src, dst)
shutil.copyfile(src, dst)
shutil.move(src, dst)
except (shutil.SameFileError, OSError) as e:
os.unlink(src)
LOGGER.error("Cannot copy file '%s' to %s: %s", src, dst, str(e))
......@@ -246,12 +259,15 @@ def create_zip_archive(zip_list, links, tmp_dir, tmp_zip_file, sort_file=None):
if links.keys():
LOGGER.info("Add file 'links.txt' to zip archive")
create_links_file(tmp_dir, links)
tmp_zip.write('links.txt')
tmp_zip.write('links.txt', compress_type=zipfile.ZIP_DEFLATED)
for link in ordered_zip_list:
LOGGER.info("Add file '%s' from path '%s' to zip archive", link, tmp_dir)
try:
tmp_zip.write(link)
if (link.endswith(".svg")):
tmp_zip.write(link, compress_type=zipfile.ZIP_DEFLATED)
else:
tmp_zip.write(link)
except OSError:
LOGGER.warning("Unable to add file '%s' to zip archive", link)
......@@ -402,17 +418,16 @@ def check_links(links):
sys.exit(1)
def read_links(links, path):
def read_links(links, filename):
""" Read links from file.
:type links: dict
:param links: Hash to store all links
:type path: str
:param path: Path to use
:type filename: str
:param filename: filename to read the links from
"""
filename = os.path.join(path, "links.txt")
LOGGER.info("Read links from file '%s'", filename)
if not os.path.isfile(filename):
LOGGER.info("No file to read")
......@@ -565,6 +580,9 @@ if __name__ == '__main__':
parser.add_argument('-l', '--imagelist-file', dest='imagelist_file',
action='store', required=True,
help='file containing list of image list file')
parser.add_argument('-L', '--links-file', dest='links_file',
action='store', required=False,
help='file containing linked images')
parser.add_argument('-s', '--sort-file', dest='sort_file',
action='store', required=True, default=None,
help='image sort order file')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment