Fix logo issues (sqlitebrowser#2184)

no2101 · Apr 20, 2020 · e985a01 · e985a01
1 parent ad39882
commit e985a01
Show file tree

Hide file tree

Showing 15 changed files with 633 additions and 149 deletions.
diff --git a/images/logo.png b/images/logo.png
diff --git a/images/logo.svg b/images/logo.svg
diff --git a/images/sqlitebrowser.svg b/images/sqlitebrowser.svg
diff --git a/installer/macos/export_icons_set.sh b/installer/macos/export_icons_set.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env sh
+
+# This script depends on Inkscape being installed
+
+logo='../../images/logo.svg'
+iconset='macapp.iconset'
+
+mkdir "$iconset"
+
+for size in '16' '32' '128' '256' '512'; do
+	retina_size=$(($size * 2))
+
+	inkscape "$logo" --without-gui --export-width "$size" --export-file="$iconset/icon_${size}x${size}.png"
+	inkscape "$logo" --without-gui --export-width "$retina_size" --export-file="$iconset/icon_${size}x${size}@2x.png"
+done
+
+iconutil --convert icns "$iconset"
+rm -r "$iconset"
diff --git a/installer/macos/macapp.icns b/installer/macos/macapp.icns
diff --git a/installer/windows/background.bmp b/installer/windows/background.bmp
diff --git a/installer/windows/banner.bmp b/installer/windows/banner.bmp
diff --git a/installer/windows/resources/background.xcf b/installer/windows/resources/background.xcf
diff --git a/installer/windows/resources/banner.xcf b/installer/windows/resources/banner.xcf
diff --git a/installer/windows/resources/icon.png b/installer/windows/resources/icon.png
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -20,7 +20,7 @@
           confinement:            strict  # use "strict" to enforce system access only via declared interfaces
 
           grade:                  devel
-          icon:                   images/sqlitebrowser.svg
+          icon:                   images/logo.svg
           type:                   app
 
           apps:

diff --git a/src/icons/sqlitebrowser.png b/src/icons/sqlitebrowser.png
diff --git a/src/iconwin.ico b/src/iconwin.ico
diff --git a/src/macapp.icns b/src/macapp.icns
diff --git a/src/tools/create_windows_icon.sh b/src/tools/create_windows_icon.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
-# This script depends on imagemagick being installed
+# This script depends on ImageMagick being installed
 
 for imgsize in 16 32 64 128
 do