From d66415919afb2067ee1b575461bfd77a191a98f0 Mon Sep 17 00:00:00 2001 From: tweenk Date: Tue, 17 Mar 2009 21:34:38 +0000 Subject: [PATCH] "Align nodes" icons fixed --- share/icons/hicolor/scalable/Makefile.am | 2 +- .../hicolor/scalable/actions/Makefile.am | 5 +- ...al-nodes.svg => align-horizontal-node.svg} | 0 ...ical-nodes.svg => align-vertical-node.svg} | 0 .../hicolor/scalable/actions/color-remove.svg | 72 ------------------- share/icons/hicolor/update-makefiles.sh | 15 ++++ 6 files changed, 18 insertions(+), 76 deletions(-) rename share/icons/hicolor/scalable/actions/{align-horizontal-nodes.svg => align-horizontal-node.svg} (100%) rename share/icons/hicolor/scalable/actions/{align-vertical-nodes.svg => align-vertical-node.svg} (100%) delete mode 100644 share/icons/hicolor/scalable/actions/color-remove.svg diff --git a/share/icons/hicolor/scalable/Makefile.am b/share/icons/hicolor/scalable/Makefile.am index 9628ba147..3b78f064b 100644 --- a/share/icons/hicolor/scalable/Makefile.am +++ b/share/icons/hicolor/scalable/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = actions places status +SUBDIRS = actions places status size = scalable hicolorthemedir = $(datadir)/icons/hicolor diff --git a/share/icons/hicolor/scalable/actions/Makefile.am b/share/icons/hicolor/scalable/actions/Makefile.am index 43a957afc..3eac06cdf 100644 --- a/share/icons/hicolor/scalable/actions/Makefile.am +++ b/share/icons/hicolor/scalable/actions/Makefile.am @@ -12,14 +12,14 @@ icons_DATA = \ align-horizontal-center.svg \ align-horizontal-left.svg \ align-horizontal-left-to-anchor.svg \ - align-horizontal-nodes.svg \ + align-horizontal-node.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-node.svg \ align-vertical-top.svg \ align-vertical-top-to-anchor.svg \ bitmap-trace.svg \ @@ -27,7 +27,6 @@ icons_DATA = \ color-gradient.svg \ color-management.svg \ color-picker.svg \ - color-remove.svg \ distribute-graph-directed.svg \ distribute-graph.svg \ distribute-horizontal-baseline.svg \ diff --git a/share/icons/hicolor/scalable/actions/align-horizontal-nodes.svg b/share/icons/hicolor/scalable/actions/align-horizontal-node.svg similarity index 100% rename from share/icons/hicolor/scalable/actions/align-horizontal-nodes.svg rename to share/icons/hicolor/scalable/actions/align-horizontal-node.svg diff --git a/share/icons/hicolor/scalable/actions/align-vertical-nodes.svg b/share/icons/hicolor/scalable/actions/align-vertical-node.svg similarity index 100% rename from share/icons/hicolor/scalable/actions/align-vertical-nodes.svg rename to share/icons/hicolor/scalable/actions/align-vertical-node.svg diff --git a/share/icons/hicolor/scalable/actions/color-remove.svg b/share/icons/hicolor/scalable/actions/color-remove.svg deleted file mode 100644 index 5bbae66d6..000000000 --- a/share/icons/hicolor/scalable/actions/color-remove.svg +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/share/icons/hicolor/update-makefiles.sh b/share/icons/hicolor/update-makefiles.sh index 50f7f966a..e9f6a3ee4 100755 --- a/share/icons/hicolor/update-makefiles.sh +++ b/share/icons/hicolor/update-makefiles.sh @@ -11,6 +11,8 @@ IFS=$'\0' for dir_size in *; do if test -d $dir_size; then +SUBDIRS='' + for dir in $dir_size/*; do if test -d $dir; then ICONS_DATA=$(find $dir \( -name '*.svg' -o -name '*.png' \) -printf '\t%f \\\n' \ @@ -32,9 +34,22 @@ icons_DATA = \ '$ICONS_DATA' EXTRA_DIST = $(icons_DATA)' > $dir/Makefile.am +SUBDIRS="$SUBDIRS $CONTEXT" fi done +if test $dir_size = 'scalable'; then EXTENSION='svg'; else EXTENSION='png'; fi + +echo \ +'SUBDIRS = '$SUBDIRS' + +size = '$dir_size' +hicolorthemedir = $(datadir)/icons/hicolor +inkscapeicondir = $(hicolorthemedir)/$(size)/apps + +inkscapeicon_DATA = inkscape.'$EXTENSION' +EXTRA_DIST = $(inkscapeicon_DATA)' > $dir_size/Makefile.am + fi done -- 2.30.2