Include rendered icons in repo; remove logo build

.gitlab-ci.yml

@@ -45,23 +45,6 @@ build:
       - dist/*
     expire_in: 7 days
 
-build_logo:
-  image: ubuntu:20.04
-  stage: test
-  before_script:
-    - export DEBIAN_FRONTEND=noninteractive
-    - apt update && apt install -y inkscape make wget unzip
-    - wget 'https://github.com/be5invis/Iosevka/releases/download/v2.3.3/01-iosevka-2.3.3.zip'
-    - unzip -d iosevka 01-iosevka-2.3.3.zip
-    - mkdir -p ~/.fonts && cp -r iosevka/* ~/.fonts && fc-cache -f
-  script:
-    - cd docs/logo
-    - make
-  artifacts:
-    paths:
-      - docs/logo
-      - sublime-music.desktop
-
 build_flatpak:
   image: registry.gitlab.com/sumner/sublime-music/flatpak-build:latest
   stage: build

CONTRIBUTING.rst

@@ -112,7 +112,6 @@ application to PyPi. A brief description of each of the stages is as follows:
 
 ``build``
     * Builds the Python dist tar file
-    * Compiles the logo to multiple different sizes
     * Builds the flatpak.
 
 ``deploy``

README.rst

@@ -1,4 +1,4 @@
-.. image:: https://gitlab.com/sumner/sublime-music/-/raw/master/docs/logo/logo.png
+.. image:: https://gitlab.com/sumner/sublime-music/-/raw/master/logo/logo.png
    :alt: Sublime Music Logo
 
 Sublime Music is a GTK3

docs/index.rst

@@ -1,4 +1,4 @@
-.. image:: ./logo/logo.png
+.. image:: ../logo/logo.png
    :width: 800px
    :alt: Sublime Music logo
 

docs/logo/Makefile

@@ -1,14 +0,0 @@
-RAW_DIMENS=16 22 24 32 36 48 64 72 96 128 192 512 1024
-DIMENS=$(join $(RAW_DIMENS:%=%x), $(RAW_DIMENS))
-PNGFILES=$(patsubst %, build/%.png, $(DIMENS))
-
-all: $(PNGFILES)
-
-builddir:
-	mkdir -p build
-
-build/%.png: icon.svg | builddir
-	inkscape -z -e $@ -w $(*F) $<
-
-clean:
-	rm -rf build

flatpak/com.sumnerevans.SublimeMusic.json

@@ -42,22 +42,22 @@
       "name": "icons",
       "buildsystem": "simple",
       "build-commands": [
-        "install -Dm644 16x16.png /app/share/icons/hicolor/16x16/apps/sublime-music.png",
-        "install -Dm644 22x22.png /app/share/icons/hicolor/22x22/apps/sublime-music.png",
-        "install -Dm644 32x32.png /app/share/icons/hicolor/32x32/apps/sublime-music.png",
-        "install -Dm644 36x36.png /app/share/icons/hicolor/36x36/apps/sublime-music.png",
-        "install -Dm644 48x48.png /app/share/icons/hicolor/48x48/apps/sublime-music.png",
-        "install -Dm644 64x64.png /app/share/icons/hicolor/64x64/apps/sublime-music.png",
-        "install -Dm644 72x72.png /app/share/icons/hicolor/72x72/apps/sublime-music.png",
-        "install -Dm644 96x96.png /app/share/icons/hicolor/96x96/apps/sublime-music.png",
-        "install -Dm644 128x128.png /app/share/icons/hicolor/128x128/apps/sublime-music.png",
-        "install -Dm644 192x192.png /app/share/icons/hicolor/192x192/apps/sublime-music.png",
-        "install -Dm644 512x512.png /app/share/icons/hicolor/512x512/apps/sublime-music.png"
+        "install -Dm644 16.png /app/share/icons/hicolor/16x16/apps/sublime-music.png",
+        "install -Dm644 22.png /app/share/icons/hicolor/22x22/apps/sublime-music.png",
+        "install -Dm644 32.png /app/share/icons/hicolor/32x32/apps/sublime-music.png",
+        "install -Dm644 36.png /app/share/icons/hicolor/36x36/apps/sublime-music.png",
+        "install -Dm644 48.png /app/share/icons/hicolor/48x48/apps/sublime-music.png",
+        "install -Dm644 64.png /app/share/icons/hicolor/64x64/apps/sublime-music.png",
+        "install -Dm644 72.png /app/share/icons/hicolor/72x72/apps/sublime-music.png",
+        "install -Dm644 96.png /app/share/icons/hicolor/96x96/apps/sublime-music.png",
+        "install -Dm644 128.png /app/share/icons/hicolor/128x128/apps/sublime-music.png",
+        "install -Dm644 192.png /app/share/icons/hicolor/192x192/apps/sublime-music.png",
+        "install -Dm644 512.png /app/share/icons/hicolor/512x512/apps/sublime-music.png"
       ],
       "sources": [
         {
           "type": "dir",
-          "path": "../docs/logo/build"
+          "path": "../logo/rendered"
         }
       ]
     },

logo/Makefile

@@ -0,0 +1,13 @@
+DIMENS=16 22 24 32 36 48 64 72 96 128 192 512 1024
+PNGFILES=$(patsubst %, rendered/%.png, $(DIMENS))
+
+all: $(PNGFILES)
+
+rendereddir:
+	mkdir -p rendered
+
+rendered/%.png: icon.svg | rendereddir
+	inkscape --export-filename=$@ -w $(*F) $<
+
+clean:
+	rm -rf rendered

logo/icon.svg

@@ -7,17 +7,17 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="287.20221"
-   inkscape:export-xdpi="287.20221"
-   inkscape:export-filename="/home/sumner/projects/sublime-music/docs/logo/icon.png"
-   height="190.5"
-   width="190.5"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="icon.svg"
-   version="1.1"
-   viewBox="0 0 190.5 190.49999"
+   id="Layer_1"
    data-name="Layer 1"
-   id="Layer_1">
+   viewBox="0 0 190.5 190.49999"
+   version="1.1"
+   sodipodi:docname="icon.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   width="190.5"
+   height="190.5"
+   inkscape:export-filename="/home/sumner/projects/sublime-music/logo/icon.png"
+   inkscape:export-xdpi="287.20221"
+   inkscape:export-ydpi="287.20221">
   <metadata
      id="metadata37">
     <rdf:RDF>
@@ -31,30 +31,30 @@
     </rdf:RDF>
   </metadata>
   <sodipodi:namedview
-     inkscape:document-rotation="0"
-     fit-margin-bottom="11.61"
-     fit-margin-right="5"
-     fit-margin-left="5"
-     fit-margin-top="11.61"
-     inkscape:current-layer="Layer_1"
-     inkscape:window-maximized="0"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
-     inkscape:cy="52.632917"
-     inkscape:cx="29.754442"
-     inkscape:zoom="3.776"
-     showgrid="false"
-     id="namedview35"
-     inkscape:window-height="1440"
-     inkscape:window-width="2560"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     pagecolor="#ffffff" />
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1196"
+     inkscape:window-height="926"
+     id="namedview35"
+     showgrid="false"
+     inkscape:zoom="3.776"
+     inkscape:cx="-37.909753"
+     inkscape:cy="52.632917"
+     inkscape:window-x="2560"
+     inkscape:window-y="992"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1"
+     fit-margin-top="11.61"
+     fit-margin-left="5"
+     fit-margin-right="5"
+     fit-margin-bottom="11.61"
+     inkscape:document-rotation="0" />
   <defs
      id="defs4">
     <style
@@ -63,11 +63,11 @@
   <title
      id="title6">Logo 1</title>
   <path
-     inkscape:connector-curvature="0"
-     inkscape:export-ydpi="160"
-     inkscape:export-xdpi="160"
-     style="fill:#ff6801;fill-opacity:1"
-     id="path8"
+     class="cls-1"
      d="M 124.85,11.61 H 65 A 53.74,53.74 0 0 0 11.26,65.34 v 59.81 A 53.74,53.74 0 0 0 65,178.89 h 59.85 a 53.73,53.73 0 0 0 53.73,-53.74 V 65.34 A 53.73,53.73 0 0 0 124.85,11.61 Z M 73.76,70.36 a 11.75,11.75 0 0 0 1,4.92 c 7.59,16.61 62.77,8.37 61.8,45.33 -1.1,39.94 -59,40.88 -80.65,23 C 51.26,145.17 5,168.25 5,168.25 c 0,0 62.85,-41.44 62.7,-41.15 12.89,8.8 46.06,15.41 48.42,-6.92 -1.79,-20.37 -52.13,-12.2 -61.36,-39.81 q -0.15,-0.42 -0.27,-0.84 l -0.09,-0.3 q -0.19,-0.69 -0.36,-1.41 v 0 a 31.34,31.34 0 0 1 -0.72,-7.86 c 1.1,-39.94 59,-40.88 80.65,-23 4.65,-1.57 51.53,-24.13 51.53,-24.13 0,0 -63.47,40.93 -63.32,40.64 C 109.25,54.63 74.9,47.94 73.72,70.36 Z m 46.47,5.78 a 5.09,5.09 0 1 1 -5.31,-4.87 5.11,5.11 0 0 1 5.27,4.87 z m -12.55,-3.83 a 5.1,5.1 0 1 1 -5.32,-4.87 5.1,5.1 0 0 1 5.28,4.87 z M 95.12,68.48 a 5.1,5.1 0 1 1 -5.31,-4.87 5.1,5.1 0 0 1 5.27,4.87 z m -24.16,47.46 a 5.1,5.1 0 1 1 5.36,4.83 5.1,5.1 0 0 1 -5.4,-4.83 z m 12.59,3.71 a 5.1,5.1 0 1 1 5.36,4.83 5.1,5.1 0 0 1 -5.4,-4.83 z m 12.59,3.71 a 5.1,5.1 0 1 1 5.36,4.83 5.11,5.11 0 0 1 -5.4,-4.83 z"
-     class="cls-1" />
+     id="path8"
+     style="fill:#ff6801;fill-opacity:1"
+     inkscape:export-xdpi="160"
+     inkscape:export-ydpi="160"
+     inkscape:connector-curvature="0" />
 </svg>