From fcc4a83b786b9885bada9dc8ba0d689d924fb00f Mon Sep 17 00:00:00 2001 From: tweenk Date: Sat, 14 Feb 2009 01:04:09 +0000 Subject: [PATCH] Add 2 missing icons; Change align and distribute icon naming to be more consistent; add Makefile.am generation script for the hicolor directory --- share/icons/hicolor/Makefile.am | 1 + .../hicolor/scalable/actions/Makefile.am | 37 ++++---- ...ntal.svg => align-horizontal-baseline.svg} | 0 ...zontal.svg => align-horizontal-center.svg} | 0 ...vg => align-horizontal-left-to-anchor.svg} | 0 ...ign-left.svg => align-horizontal-left.svg} | 0 ...izontal.svg => align-horizontal-nodes.svg} | 0 ...g => align-horizontal-right-to-anchor.svg} | 0 ...n-right.svg => align-horizontal-right.svg} | 0 ...rtical.svg => align-vertical-baseline.svg} | 0 ...vg => align-vertical-bottom-to-anchor.svg} | 0 ...n-bottom.svg => align-vertical-bottom.svg} | 0 ...vertical.svg => align-vertical-center.svg} | 0 ...-vertical.svg => align-vertical-nodes.svg} | 0 ...r.svg => align-vertical-top-to-anchor.svg} | 0 .../{align-top.svg => align-vertical-top.svg} | 0 .../scalable/actions/show-node-handles.svg | 88 +++++++++++++++++++ .../scalable/actions/show-path-outline.svg | 81 +++++++++++++++++ .../icons/hicolor/scalable/places/Makefile.am | 10 +-- .../icons/hicolor/scalable/status/Makefile.am | 12 +-- share/icons/hicolor/update-makefiles.sh | 41 +++++++++ 21 files changed, 237 insertions(+), 33 deletions(-) rename share/icons/hicolor/scalable/actions/{text-align-baseline-horizontal.svg => align-horizontal-baseline.svg} (100%) rename share/icons/hicolor/scalable/actions/{align-center-horizontal.svg => align-horizontal-center.svg} (100%) rename share/icons/hicolor/scalable/actions/{align-left-to-anchor.svg => align-horizontal-left-to-anchor.svg} (100%) rename share/icons/hicolor/scalable/actions/{align-left.svg => align-horizontal-left.svg} (100%) rename share/icons/hicolor/scalable/actions/{node-align-horizontal.svg => align-horizontal-nodes.svg} (100%) rename share/icons/hicolor/scalable/actions/{align-right-to-anchor.svg => align-horizontal-right-to-anchor.svg} (100%) rename share/icons/hicolor/scalable/actions/{align-right.svg => align-horizontal-right.svg} (100%) rename share/icons/hicolor/scalable/actions/{text-align-baseline-vertical.svg => align-vertical-baseline.svg} (100%) rename share/icons/hicolor/scalable/actions/{align-bottom-to-anchor.svg => align-vertical-bottom-to-anchor.svg} (100%) rename share/icons/hicolor/scalable/actions/{align-bottom.svg => align-vertical-bottom.svg} (100%) rename share/icons/hicolor/scalable/actions/{align-center-vertical.svg => align-vertical-center.svg} (100%) rename share/icons/hicolor/scalable/actions/{node-align-vertical.svg => align-vertical-nodes.svg} (100%) rename share/icons/hicolor/scalable/actions/{align-top-to-anchor.svg => align-vertical-top-to-anchor.svg} (100%) rename share/icons/hicolor/scalable/actions/{align-top.svg => align-vertical-top.svg} (100%) create mode 100644 share/icons/hicolor/scalable/actions/show-node-handles.svg create mode 100644 share/icons/hicolor/scalable/actions/show-path-outline.svg create mode 100755 share/icons/hicolor/update-makefiles.sh diff --git a/share/icons/hicolor/Makefile.am b/share/icons/hicolor/Makefile.am index 79eec6c9b..4d135e17f 100644 --- a/share/icons/hicolor/Makefile.am +++ b/share/icons/hicolor/Makefile.am @@ -1 +1,2 @@ SUBDIRS = scalable +EXTRA_DIST = update-makefiles.sh diff --git a/share/icons/hicolor/scalable/actions/Makefile.am b/share/icons/hicolor/scalable/actions/Makefile.am index eb04aff9c..5be4e82d0 100644 --- a/share/icons/hicolor/scalable/actions/Makefile.am +++ b/share/icons/hicolor/scalable/actions/Makefile.am @@ -4,21 +4,24 @@ context = actions iconsdir = $(themedir)/$(size)/$(context) -# To update this list, run: -# find . -name '*.svg' -and -not -name '*.svn*' -printf '\t%P \\\n' | sort | zenity --text-info -# and paste the contents of the dialog box here +# Auto-generated by update-makefiles.sh +# Re-run the script to update. icons_DATA = \ - align-bottom.svg \ - align-bottom-to-anchor.svg \ - align-center-horizontal.svg \ - align-center-vertical.svg \ - align-left.svg \ - align-left-to-anchor.svg \ - align-right.svg \ - align-right-to-anchor.svg \ - align-top.svg \ - align-top-to-anchor.svg \ + align-horizontal-baseline.svg \ + align-horizontal-center.svg \ + align-horizontal-left.svg \ + align-horizontal-left-to-anchor.svg \ + align-horizontal-nodes.svg \ + align-horizontal-right.svg \ + align-horizontal-right-to-anchor.svg \ + align-vertical-baseline.svg \ + align-vertical-bottom.svg \ + align-vertical-bottom-to-anchor.svg \ + align-vertical-center.svg \ + align-vertical-nodes.svg \ + align-vertical-top.svg \ + align-vertical-top-to-anchor.svg \ bitmap-trace.svg \ color-fill.svg \ color-gradient.svg \ @@ -92,8 +95,6 @@ icons_DATA = \ layer-rename.svg \ layer-top.svg \ node-add.svg \ - node-align-horizontal.svg \ - node-align-vertical.svg \ node-break.svg \ node-delete-segment.svg \ node-delete.svg \ @@ -150,9 +151,9 @@ icons_DATA = \ show-dialogs.svg \ show-grid.svg \ show-guides.svg \ + show-node-handles.svg \ + show-path-outline.svg \ stroke-to-path.svg \ - text-align-baseline-horizontal.svg \ - text-align-baseline-vertical.svg \ text-convert-to-regular.svg \ text-distribute-baseline-horizontal.svg \ text-distribute-baseline-vertical.svg \ @@ -190,6 +191,6 @@ icons_DATA = \ zoom-original.svg \ zoom-out.svg \ zoom-previous.svg \ - zoom.svg + zoom.svg EXTRA_DIST = $(icons_DATA) diff --git a/share/icons/hicolor/scalable/actions/text-align-baseline-horizontal.svg b/share/icons/hicolor/scalable/actions/align-horizontal-baseline.svg similarity index 100% rename from share/icons/hicolor/scalable/actions/text-align-baseline-horizontal.svg rename to share/icons/hicolor/scalable/actions/align-horizontal-baseline.svg diff --git a/share/icons/hicolor/scalable/actions/align-center-horizontal.svg b/share/icons/hicolor/scalable/actions/align-horizontal-center.svg similarity index 100% rename from share/icons/hicolor/scalable/actions/align-center-horizontal.svg rename to share/icons/hicolor/scalable/actions/align-horizontal-center.svg diff --git a/share/icons/hicolor/scalable/actions/align-left-to-anchor.svg b/share/icons/hicolor/scalable/actions/align-horizontal-left-to-anchor.svg similarity index 100% rename from share/icons/hicolor/scalable/actions/align-left-to-anchor.svg rename to share/icons/hicolor/scalable/actions/align-horizontal-left-to-anchor.svg diff --git a/share/icons/hicolor/scalable/actions/align-left.svg b/share/icons/hicolor/scalable/actions/align-horizontal-left.svg similarity index 100% rename from share/icons/hicolor/scalable/actions/align-left.svg rename to share/icons/hicolor/scalable/actions/align-horizontal-left.svg diff --git a/share/icons/hicolor/scalable/actions/node-align-horizontal.svg b/share/icons/hicolor/scalable/actions/align-horizontal-nodes.svg similarity index 100% rename from share/icons/hicolor/scalable/actions/node-align-horizontal.svg rename to share/icons/hicolor/scalable/actions/align-horizontal-nodes.svg diff --git a/share/icons/hicolor/scalable/actions/align-right-to-anchor.svg b/share/icons/hicolor/scalable/actions/align-horizontal-right-to-anchor.svg similarity index 100% rename from share/icons/hicolor/scalable/actions/align-right-to-anchor.svg rename to share/icons/hicolor/scalable/actions/align-horizontal-right-to-anchor.svg diff --git a/share/icons/hicolor/scalable/actions/align-right.svg b/share/icons/hicolor/scalable/actions/align-horizontal-right.svg similarity index 100% rename from share/icons/hicolor/scalable/actions/align-right.svg rename to share/icons/hicolor/scalable/actions/align-horizontal-right.svg diff --git a/share/icons/hicolor/scalable/actions/text-align-baseline-vertical.svg b/share/icons/hicolor/scalable/actions/align-vertical-baseline.svg similarity index 100% rename from share/icons/hicolor/scalable/actions/text-align-baseline-vertical.svg rename to share/icons/hicolor/scalable/actions/align-vertical-baseline.svg diff --git a/share/icons/hicolor/scalable/actions/align-bottom-to-anchor.svg b/share/icons/hicolor/scalable/actions/align-vertical-bottom-to-anchor.svg similarity index 100% rename from share/icons/hicolor/scalable/actions/align-bottom-to-anchor.svg rename to share/icons/hicolor/scalable/actions/align-vertical-bottom-to-anchor.svg diff --git a/share/icons/hicolor/scalable/actions/align-bottom.svg b/share/icons/hicolor/scalable/actions/align-vertical-bottom.svg similarity index 100% rename from share/icons/hicolor/scalable/actions/align-bottom.svg rename to share/icons/hicolor/scalable/actions/align-vertical-bottom.svg diff --git a/share/icons/hicolor/scalable/actions/align-center-vertical.svg b/share/icons/hicolor/scalable/actions/align-vertical-center.svg similarity index 100% rename from share/icons/hicolor/scalable/actions/align-center-vertical.svg rename to share/icons/hicolor/scalable/actions/align-vertical-center.svg diff --git a/share/icons/hicolor/scalable/actions/node-align-vertical.svg b/share/icons/hicolor/scalable/actions/align-vertical-nodes.svg similarity index 100% rename from share/icons/hicolor/scalable/actions/node-align-vertical.svg rename to share/icons/hicolor/scalable/actions/align-vertical-nodes.svg diff --git a/share/icons/hicolor/scalable/actions/align-top-to-anchor.svg b/share/icons/hicolor/scalable/actions/align-vertical-top-to-anchor.svg similarity index 100% rename from share/icons/hicolor/scalable/actions/align-top-to-anchor.svg rename to share/icons/hicolor/scalable/actions/align-vertical-top-to-anchor.svg diff --git a/share/icons/hicolor/scalable/actions/align-top.svg b/share/icons/hicolor/scalable/actions/align-vertical-top.svg similarity index 100% rename from share/icons/hicolor/scalable/actions/align-top.svg rename to share/icons/hicolor/scalable/actions/align-vertical-top.svg diff --git a/share/icons/hicolor/scalable/actions/show-node-handles.svg b/share/icons/hicolor/scalable/actions/show-node-handles.svg new file mode 100644 index 000000000..d799fdaec --- /dev/null +++ b/share/icons/hicolor/scalable/actions/show-node-handles.svg @@ -0,0 +1,88 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/share/icons/hicolor/scalable/actions/show-path-outline.svg b/share/icons/hicolor/scalable/actions/show-path-outline.svg new file mode 100644 index 000000000..8c29612b9 --- /dev/null +++ b/share/icons/hicolor/scalable/actions/show-path-outline.svg @@ -0,0 +1,81 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/share/icons/hicolor/scalable/places/Makefile.am b/share/icons/hicolor/scalable/places/Makefile.am index b6e964f9c..c55665b2d 100644 --- a/share/icons/hicolor/scalable/places/Makefile.am +++ b/share/icons/hicolor/scalable/places/Makefile.am @@ -4,12 +4,8 @@ context = places iconsdir = $(themedir)/$(size)/$(context) -# To update this list, run: -# find . -name '*.svg' -and -not -name '*.svn*' -printf '\t%P \\\n' | sort | zenity --text-info -# and paste the contents of the dialog box here -# -# To vacuum defs in all documents, simply execute -# inkscape --vacuum-defs * +# Auto-generated by update-makefiles.sh +# Re-run the script to update. icons_DATA = \ dialog-align-and-distribute.svg \ @@ -28,6 +24,6 @@ icons_DATA = \ dialog-xml-editor.svg \ grid-axonometric.svg \ grid-rectangular.svg \ - guides.svg + guides.svg EXTRA_DIST = $(icons_DATA) diff --git a/share/icons/hicolor/scalable/status/Makefile.am b/share/icons/hicolor/scalable/status/Makefile.am index fe794bf5e..36c7ecea1 100644 --- a/share/icons/hicolor/scalable/status/Makefile.am +++ b/share/icons/hicolor/scalable/status/Makefile.am @@ -4,12 +4,8 @@ context = status iconsdir = $(themedir)/$(size)/$(context) -# To update this list, run: -# find . -name '*.svg' -and -not -name '*.svn*' -printf '\t%P \\\n' | sort | zenity --text-info -# and paste the contents of the dialog box here -# -# To vacuum defs in all documents, simply execute -# inkscape --vacuum-defs * +# Auto-generated by update-makefiles.sh +# Re-run the script to update. icons_DATA = \ connector-avoid.svg \ @@ -40,8 +36,8 @@ icons_DATA = \ object-unlocked.svg \ object-visible.svg \ path-mode-bezier.svg \ - path-mode-polyline.svg \ path-mode-polyline-paraxial.svg \ + path-mode-polyline.svg \ path-mode-spiro.svg \ perspective-parallel.svg \ snap-bounding-box-center.svg \ @@ -71,6 +67,6 @@ icons_DATA = \ transform-affect-gradient.svg \ transform-affect-pattern.svg \ transform-affect-rounded-corners.svg \ - transform-affect-stroke.svg + transform-affect-stroke.svg EXTRA_DIST = $(icons_DATA) diff --git a/share/icons/hicolor/update-makefiles.sh b/share/icons/hicolor/update-makefiles.sh new file mode 100755 index 000000000..b802df053 --- /dev/null +++ b/share/icons/hicolor/update-makefiles.sh @@ -0,0 +1,41 @@ +#!/bin/bash +# update-makefiles.sh +# (c) 2009 Krzysztof Kosiński +# Licensed under GNU GPL; see the file COPYING for details +# +# This script regenerates the makefiles for the subdirectories of hicolor. + +OLD_IFS=$IFS +IFS=$'\0' + +for dir_size in *; do +if test -d $dir_size; then + +for dir in $dir_size/*; do +if test -d $dir; then + ICONS_DATA=$(find $dir -name '*.svg' -and -not -name '*.svn*' -printf '\t%f \\\n' \ + | sort \ + | sed -e '$s|\\||') +SIZE=$(echo $dir_size | sed -e 's|x.*||') +CONTEXT=$(echo $dir | sed -e 's|^.*/||') +echo \ +'themedir = $(pkgdatadir)/icons/hicolor +size = '$SIZE' +context = '$CONTEXT' + +iconsdir = $(themedir)/$(size)/$(context) + +# Auto-generated by update-makefiles.sh +# Re-run the script to update. + +icons_DATA = \ +'$ICONS_DATA' + +EXTRA_DIST = $(icons_DATA)' > $dir/Makefile.am + fi +done + +fi +done + +IFS=$OLD_IFS -- 2.30.2