Add association with mimetype and also add icons

5 files changed, 59 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ea293ff40967..856f9ece39a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,21 @@
 pkgbase = chitubox-free-bin
 	pkgdesc = All-in-one SLA/DLP/LCD Slicer
 	pkgver = 1.9.4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.chitubox.com/download.html
 	arch = x86_64
 	license = Commercial
 	makedepends = xdg-user-dirs
+	makedepends = icoutils
 	noextract = CHITUBOX_V1.9.4.tar.gz
 	options = !strip
 	source = local://CHITUBOX_V1.9.4.tar.gz
 	source = local://chitubox-free.desktop
 	source = local://launcher
+	source = local://chitubox-free.xml
 	sha256sums = c3131af2c0409759b8659f0e0b9a023bf65698245a9073051be5ff7082748e9b
-	sha256sums = fdd0c1595cfa7ef97ae850b83de328db55150d76f42e6c472167bcc80f87ea47
-	sha256sums = 02fb0cfac1a04d8cc71345a6cf4921c92abcbfdd09e010604a1bc891657a2894
+	sha256sums = 4cb392165bce42884c99c6d94d01ccb164c4efc6c6c8554f6817eba3f2c680e5
+	sha256sums = 1144e0420568f0745aa6392d42c0fe0f496d18fb26e28c636bae45615180ec4e
+	sha256sums = ba5fd615e18e2239796ac69891266165b88488c05f33013f4d41646a225f64e2
 
 pkgname = chitubox-free-bin
diff --git a/PKGBUILD b/PKGBUILD
index e625f02ea142..4269bfe6caf3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,24 @@
-# Maintainer: Brian Li <brian14708@gmail.com>
-# Maintainer: Denys Zariaiev <denys.zariaiev@gmail.com>
+# Maintainer: Martin Rys <rys.pw/contact>
+
+# Previous maintainers:
+#   Brian Li <brian14708@gmail.com>
+#   Denys Zariaiev <denys.zariaiev@gmail.com>
 
 pkgname=chitubox-free-bin
 pkgver=1.9.4
 
-pkgrel=2
+pkgrel=3
 pkgdesc="All-in-one SLA/DLP/LCD Slicer"
 
-makedepends=('xdg-user-dirs')
+makedepends=(
+	'xdg-user-dirs'
+	'icoutils')
 
 url="https://www.chitubox.com/download.html"
 arch=("x86_64")
 license=("Commercial")
 
-DOWNLOADS_DIR=`xdg-user-dir DOWNLOAD`
+DOWNLOADS_DIR=$(xdg-user-dir DOWNLOAD)
 ARCHIVE_NAME="CHITUBOX_V${pkgver}.tar.gz"
 DIR_NAME="CHITUBOX V${pkgver}"
 
@@ -31,15 +36,17 @@ fi
 options=(!strip)
 
 source=(
-    "local://$ARCHIVE_NAME"
-    "local://chitubox-free.desktop"
-    "local://launcher"
+	"local://$ARCHIVE_NAME"
+	"local://chitubox-free.desktop"
+	"local://launcher"
+	"local://chitubox-free.xml"
 )
 
 sha256sums=(
-    "c3131af2c0409759b8659f0e0b9a023bf65698245a9073051be5ff7082748e9b"
-    "fdd0c1595cfa7ef97ae850b83de328db55150d76f42e6c472167bcc80f87ea47"
-    "02fb0cfac1a04d8cc71345a6cf4921c92abcbfdd09e010604a1bc891657a2894"
+	'c3131af2c0409759b8659f0e0b9a023bf65698245a9073051be5ff7082748e9b'
+	'4cb392165bce42884c99c6d94d01ccb164c4efc6c6c8554f6817eba3f2c680e5'
+	'1144e0420568f0745aa6392d42c0fe0f496d18fb26e28c636bae45615180ec4e'
+	'ba5fd615e18e2239796ac69891266165b88488c05f33013f4d41646a225f64e2'
 )
 
 noextract=("$ARCHIVE_NAME")
@@ -47,18 +54,31 @@ noextract=("$ARCHIVE_NAME")
 prepare() {
   mkdir "$DIR_NAME"
   bsdtar -x -C "$DIR_NAME" -f "${ARCHIVE_NAME}"
+	# Extract the included Windows ICO file into PNGs for each size
+	icotool --extract "${DIR_NAME}/resource/ico/freeIcon.ico" --output "${DIR_NAME}/.."
 }
 
 package()
 {
-    # binary data
-    install -d "$pkgdir"/opt
-    mv "${srcdir}/$DIR_NAME" "${pkgdir}/opt/chitubox-free"
+	# binary data
+	install -d "$pkgdir"/opt
+	mv "${srcdir}/$DIR_NAME" "${pkgdir}/opt/chitubox-free"
+
+	# launcher
+	install -d "$pkgdir"/usr/bin
+	install -Dm755 launcher "$pkgdir"/usr/bin/chitubox-free
+
+	# desktop file
+	install -Dm644 chitubox-free.desktop "$pkgdir"/usr/share/applications/chitubox-free.desktop
 
-    # launcher
-    install -d "$pkgdir"/usr/bin
-    install -Dm755 launcher "$pkgdir"/usr/bin/chitubox-free
+	# icons
+	install -Dm644 freeIcon_4_16x16x8.png    "$pkgdir"/usr/share/icons/hicolor/16x16/apps/chitubox-free.png
+	install -Dm644 freeIcon_3_24x24x8.png    "$pkgdir"/usr/share/icons/hicolor/24x24/apps/chitubox-free.png
+	install -Dm644 freeIcon_2_32x32x8.png    "$pkgdir"/usr/share/icons/hicolor/32x32/apps/chitubox-free.png
+	install -Dm644 freeIcon_1_48x48x8.png    "$pkgdir"/usr/share/icons/hicolor/48x48/apps/chitubox-free.png
+	install -Dm644 freeIcon_6_64x64x32.png   "$pkgdir"/usr/share/icons/hicolor/64x64/apps/chitubox-free.png
+	install -Dm644 freeIcon_5_128x128x32.png "$pkgdir"/usr/share/icons/hicolor/128x128/apps/chitubox-free.png
 
-    # desktop file
-    install -Dm644 chitubox-free.desktop "$pkgdir"/usr/share/applications/chitubox-free.desktop
+	# mime
+	install -Dm644 chitubox-free.xml "$pkgdir"/usr/share/mime/packages/chitubox-free.xml
 }
diff --git a/chitubox-free.desktop b/chitubox-free.desktop
index 539a69186d76..25925a951e03 100644
--- a/chitubox-free.desktop
+++ b/chitubox-free.desktop
@@ -1,6 +1,9 @@
 [Desktop Entry]
 Type=Application
 Name=ChiTuBox Free
+GenericName=3D Printer Slicer
 Comment=All-in-one SLA/DLP/LCD Slicer
-Exec=chitubox-free
+Exec=chitubox-free %f
+Icon=chitubox-free
 Categories=Graphics;Utility;
+MimeType=model/chitubox;
diff --git a/chitubox-free.xml b/chitubox-free.xml
new file mode 100644
index 000000000000..e6ea1d300345
--- /dev/null
+++ b/chitubox-free.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+  <mime-type type="model/chitubox">
+    <comment>Chitubox Sliced 3D model</comment>
+    <glob pattern="*.chitubox"/>
+    <acronym>CHITUBOX</acronym>
+    <icon name="chitubox-free"/>
+  </mime-type>
+</mime-info>
diff --git a/launcher b/launcher
index 95ba1d9e0e33..71899d6483ae 100644
--- a/launcher
+++ b/launcher
@@ -1,3 +1,3 @@
 #!/bin/sh
 export LD_LIBRARY_PATH=/opt/chitubox-free/lib
-exec /opt/chitubox-free/CHITUBOX
+exec /opt/chitubox-free/CHITUBOX "${1}"