diff --git a/resources/argonode.svg b/resources/argonode.svg index 8e9a28e..01f46ab 100644 --- a/resources/argonode.svg +++ b/resources/argonode.svg @@ -27,9 +27,9 @@ inkscape:deskcolor="#d1d1d1" inkscape:document-units="mm" inkscape:clip-to-page="false" - inkscape:zoom="0.44673501" - inkscape:cx="443.21577" - inkscape:cy="249.58868" + inkscape:zoom="0.52383534" + inkscape:cx="272.03205" + inkscape:cy="333.11995" inkscape:window-width="1470" inkscape:window-height="890" inkscape:window-x="0" @@ -45,32 +45,32 @@ + width="194.96918" + height="194.43169" + x="2.5203834" + y="2.9819231" + rx="60.325001" + ry="60.325001" /> argo + x="22.05061" + y="162.24162">argo diff --git a/resources/icon.icns b/resources/icon.icns index a1fb85c..e6c021a 100644 Binary files a/resources/icon.icns and b/resources/icon.icns differ diff --git a/resources/icon.iconset/icon_128x128.png b/resources/icon.iconset/icon_128x128.png index 788730b..76791fd 100644 Binary files a/resources/icon.iconset/icon_128x128.png and b/resources/icon.iconset/icon_128x128.png differ diff --git a/resources/icon.iconset/icon_128x128@2x.png b/resources/icon.iconset/icon_128x128@2x.png index 266d633..cb007ee 100644 Binary files a/resources/icon.iconset/icon_128x128@2x.png and b/resources/icon.iconset/icon_128x128@2x.png differ diff --git a/resources/icon.iconset/icon_16x16.png b/resources/icon.iconset/icon_16x16.png index a4cc662..255afdd 100644 Binary files a/resources/icon.iconset/icon_16x16.png and b/resources/icon.iconset/icon_16x16.png differ diff --git a/resources/icon.iconset/icon_16x16@2x.png b/resources/icon.iconset/icon_16x16@2x.png index 6a427a2..d33fab2 100644 Binary files a/resources/icon.iconset/icon_16x16@2x.png and b/resources/icon.iconset/icon_16x16@2x.png differ diff --git a/resources/icon.iconset/icon_256x256.png b/resources/icon.iconset/icon_256x256.png index 266d633..cb007ee 100644 Binary files a/resources/icon.iconset/icon_256x256.png and b/resources/icon.iconset/icon_256x256.png differ diff --git a/resources/icon.iconset/icon_256x256@2x.png b/resources/icon.iconset/icon_256x256@2x.png index ae3eb44..ab599a9 100644 Binary files a/resources/icon.iconset/icon_256x256@2x.png and b/resources/icon.iconset/icon_256x256@2x.png differ diff --git a/resources/icon.iconset/icon_32x32.png b/resources/icon.iconset/icon_32x32.png index 6a427a2..d33fab2 100644 Binary files a/resources/icon.iconset/icon_32x32.png and b/resources/icon.iconset/icon_32x32.png differ diff --git a/resources/icon.iconset/icon_32x32@2x.png b/resources/icon.iconset/icon_32x32@2x.png index fc20dd4..a140d95 100644 Binary files a/resources/icon.iconset/icon_32x32@2x.png and b/resources/icon.iconset/icon_32x32@2x.png differ diff --git a/resources/icon.iconset/icon_512x512.png b/resources/icon.iconset/icon_512x512.png index ae3eb44..ab599a9 100644 Binary files a/resources/icon.iconset/icon_512x512.png and b/resources/icon.iconset/icon_512x512.png differ diff --git a/resources/icon.iconset/icon_512x512@2x.png b/resources/icon.iconset/icon_512x512@2x.png new file mode 100644 index 0000000..f6984f6 Binary files /dev/null and b/resources/icon.iconset/icon_512x512@2x.png differ diff --git a/resources/icon.iconset/icon_64x64.png b/resources/icon.iconset/icon_64x64.png deleted file mode 100644 index fc20dd4..0000000 Binary files a/resources/icon.iconset/icon_64x64.png and /dev/null differ diff --git a/resources/icon.iconset/icon_64x64@2x.png b/resources/icon.iconset/icon_64x64@2x.png deleted file mode 100644 index 788730b..0000000 Binary files a/resources/icon.iconset/icon_64x64@2x.png and /dev/null differ diff --git a/resources/icon.png b/resources/icon.png index 7940ed2..f6984f6 100644 Binary files a/resources/icon.png and b/resources/icon.png differ diff --git a/scripts/build-mac.sh b/scripts/build-mac.sh index c6f92ff..dea4a2e 100755 --- a/scripts/build-mac.sh +++ b/scripts/build-mac.sh @@ -53,23 +53,7 @@ $PYTHON -m PyInstaller \ --collect-all scipy \ --collect-all skimage \ --collect-all webview \ - --icon resources/icon.icns 2>/dev/null || \ -$PYTHON -m PyInstaller \ - desktop.py \ - --noconfirm \ - --clean \ - --name argonode \ - --windowed \ - $MODE \ - --distpath desktop-dist \ - --workpath desktop-build \ - --specpath desktop-build \ - --add-data "${FRONTEND_DIST}:frontend/dist" \ - --add-data "${DEMO_DIR}:demo" \ - --collect-all matplotlib \ - --collect-all scipy \ - --collect-all skimage \ - --collect-all webview + --icon ../resources/icon.icns APP_BUNDLE="desktop-dist/argonode.app"