Skip to content

Commit

Permalink
Move icons to hicolor/scalable/actions
Browse files Browse the repository at this point in the history
In accordance to the Free Desktop Icon theme spec (0.11).
https://specifications.freedesktop.org/icon-theme-spec/0.11/index.html
  • Loading branch information
amolenaar committed Apr 12, 2020
1 parent 18044de commit 9224f2c
Show file tree
Hide file tree
Showing 51 changed files with 8 additions and 7 deletions.
11 changes: 6 additions & 5 deletions gaphor/ui/icons/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,21 +51,22 @@ ICONS=diagram \
extension \
property

ICON_FILES=$(patsubst %,gaphor-%-symbolic.svg,$(ICONS))
ICON_THEME=hicolor/scalable/actions

ICON_FILES=$(patsubst %,$(ICON_THEME)/gaphor-%-symbolic.svg,$(ICONS))
INKSCAPE=flatpak run org.inkscape.Inkscape

all: verify $(ICON_FILES)

verify: stensil.svg
@for icon in $(ICONS); do grep -q "id=\"$$icon\"" $< || { echo "ERROR: No layer named $$icon"; exit 1; }; done

gaphor-%-symbolic.svg: stensil.svg
$(ICON_THEME)/gaphor-%-symbolic.svg: stensil.svg
$(INKSCAPE) -z --export-id=$* --export-id-only \
--export-plain-svg=.$@ $<
--export-plain-svg=.$*.svg $<
$(INKSCAPE) --verb EditSelectAll --verb SelectionUnGroup \
--verb=EditSelectAll --verb StrokeToPath \
--verb FileSave --verb FileQuit .$@
$(INKSCAPE) --export-plain-svg=$@ .$@ && rm .$@
--verb FileSave --verb FileQuit .$*.svg
$(INKSCAPE) --export-plain-svg=$@ .$*.svg && rm .$*.svg

.PHONY: all verify
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
4 changes: 2 additions & 2 deletions win-installer/gaphor.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from PyInstaller.utils.hooks import copy_metadata


block_cipher = None

a = Analysis(['gaphor-script.py'],
Expand All @@ -12,7 +12,7 @@ a = Analysis(['gaphor-script.py'],
('../gaphor/ui/*.glade', 'gaphor/ui'),
('../gaphor/services/helpservice/*.png', 'gaphor/services/helpservice'),
('../gaphor/services/helpservice/*.glade', 'gaphor/services/helpservice'),
('../gaphor/ui/icons/*.svg', 'gaphor/ui/icons'),
('../gaphor/ui/icons/hicolor/scalable/actions/*.svg', 'gaphor/ui/icons/hicolor/scalable/actions'),
('../LICENSE.txt', 'gaphor'),
('../gaphor/locale/*', 'gaphor/locale')
]+copy_metadata('gaphor')+copy_metadata('gaphas'),
Expand Down

0 comments on commit 9224f2c

Please sign in to comment.