diff --git a/desktopapp/build.gradle b/desktopapp/build.gradle index bc4a79af46..9fd15c040f 100644 --- a/desktopapp/build.gradle +++ b/desktopapp/build.gradle @@ -148,7 +148,7 @@ tasks.jpackage { // runtimeImage can alternatively be set to a downloaded and extracted JDK // Worked well when using IntelliJ IDEA SDKs (File > Project Structure > SDKs > + > Download JDK) runtimeImage = "/home/user/.jdks/openjdk-17.0.2" -// icon = "icons/icons.ico" // TODO + icon = "package/linux/icon.png" } windows { diff --git a/desktopapp/package/linux/icon.png b/desktopapp/package/linux/icon.png old mode 100644 new mode 100755 index 84b00ccbea..35a0cdc1b8 Binary files a/desktopapp/package/linux/icon.png and b/desktopapp/package/linux/icon.png differ diff --git a/desktopapp/package/macosx/Bisq 2-background.tiff b/desktopapp/package/macosx/Bisq 2-background.tiff index 9fb7dde469..f5096ce0fd 100644 Binary files a/desktopapp/package/macosx/Bisq 2-background.tiff and b/desktopapp/package/macosx/Bisq 2-background.tiff differ diff --git a/desktopapp/package/macosx/Bisq 2-dmg-setup.scpt b/desktopapp/package/macosx/Bisq 2-dmg-setup.scpt index 48dd3c0d20..737303f743 100644 --- a/desktopapp/package/macosx/Bisq 2-dmg-setup.scpt +++ b/desktopapp/package/macosx/Bisq 2-dmg-setup.scpt @@ -7,11 +7,12 @@ tell application "Finder" set pathbar visible of container window to false -- size of window should match size of background (1034x641) - set the bounds of container window to {400, 100, 1434, 741} + set the bounds of container window to {400, 100, 1434, 769} set theViewOptions to the icon view options of container window set arrangement of theViewOptions to not arranged set icon size of theViewOptions to 128 + -- tiffutil -cathidpicheck dmg.png dmg@2x.png -out "Bisq 2-background.tiff" to add retina support set background picture of theViewOptions to file ".background:background.tiff" -- Create alias for install location @@ -22,10 +23,10 @@ tell application "Finder" set theFilePath to POSIX Path of theFile if theFilePath is "/Bisq 2.app" -- Position application location - set position of item theFile of container window to {345, 343} + set position of item theFile of container window to {298, 332} else if theFilePath is "/Applications" -- Position install location - set position of item theFile of container window to {677, 343} + set position of item theFile of container window to {746, 332} else -- Move all other files far enough to be not visible if user has "show hidden files" option set set position of item theFile of container window to {1000, 0} diff --git a/desktopapp/package/macosx/Bisq 2-volume.icns b/desktopapp/package/macosx/Bisq 2-volume.icns index d60546972a..37a2f83894 100644 Binary files a/desktopapp/package/macosx/Bisq 2-volume.icns and b/desktopapp/package/macosx/Bisq 2-volume.icns differ diff --git a/desktopapp/package/macosx/Bisq 2.icns b/desktopapp/package/macosx/Bisq 2.icns index d60546972a..37a2f83894 100644 Binary files a/desktopapp/package/macosx/Bisq 2.icns and b/desktopapp/package/macosx/Bisq 2.icns differ diff --git a/desktopapp/package/macosx/Bisq 2.iconset/icon_1024x1024.png b/desktopapp/package/macosx/Bisq 2.iconset/icon_1024x1024.png new file mode 100755 index 0000000000..bdc3f1c615 Binary files /dev/null and b/desktopapp/package/macosx/Bisq 2.iconset/icon_1024x1024.png differ diff --git a/desktopapp/package/macosx/Bisq 2.iconset/icon_1024x1024@2x.png b/desktopapp/package/macosx/Bisq 2.iconset/icon_1024x1024@2x.png new file mode 100755 index 0000000000..0b59f264af Binary files /dev/null and b/desktopapp/package/macosx/Bisq 2.iconset/icon_1024x1024@2x.png differ diff --git a/desktopapp/package/macosx/Bisq 2.iconset/icon_128x128.png b/desktopapp/package/macosx/Bisq 2.iconset/icon_128x128.png old mode 100644 new mode 100755 index 8ce4f1a692..c59786a41b Binary files a/desktopapp/package/macosx/Bisq 2.iconset/icon_128x128.png and b/desktopapp/package/macosx/Bisq 2.iconset/icon_128x128.png differ diff --git a/desktopapp/package/macosx/Bisq 2.iconset/icon_128x128@2x.png b/desktopapp/package/macosx/Bisq 2.iconset/icon_128x128@2x.png old mode 100644 new mode 100755 index 14aa898df9..5a12bd2b24 Binary files a/desktopapp/package/macosx/Bisq 2.iconset/icon_128x128@2x.png and b/desktopapp/package/macosx/Bisq 2.iconset/icon_128x128@2x.png differ diff --git a/desktopapp/package/macosx/Bisq 2.iconset/icon_16x16.png b/desktopapp/package/macosx/Bisq 2.iconset/icon_16x16.png old mode 100644 new mode 100755 index ee1e2496ea..f0591c249f Binary files a/desktopapp/package/macosx/Bisq 2.iconset/icon_16x16.png and b/desktopapp/package/macosx/Bisq 2.iconset/icon_16x16.png differ diff --git a/desktopapp/package/macosx/Bisq 2.iconset/icon_16x16@2x.png b/desktopapp/package/macosx/Bisq 2.iconset/icon_16x16@2x.png old mode 100644 new mode 100755 index efb686497e..72367454b5 Binary files a/desktopapp/package/macosx/Bisq 2.iconset/icon_16x16@2x.png and b/desktopapp/package/macosx/Bisq 2.iconset/icon_16x16@2x.png differ diff --git a/desktopapp/package/macosx/Bisq 2.iconset/icon_256x256.png b/desktopapp/package/macosx/Bisq 2.iconset/icon_256x256.png old mode 100644 new mode 100755 index 0dfd20d60c..35a0cdc1b8 Binary files a/desktopapp/package/macosx/Bisq 2.iconset/icon_256x256.png and b/desktopapp/package/macosx/Bisq 2.iconset/icon_256x256.png differ diff --git a/desktopapp/package/macosx/Bisq 2.iconset/icon_256x256@2x.png b/desktopapp/package/macosx/Bisq 2.iconset/icon_256x256@2x.png old mode 100644 new mode 100755 index 5f18f50176..d4551200c9 Binary files a/desktopapp/package/macosx/Bisq 2.iconset/icon_256x256@2x.png and b/desktopapp/package/macosx/Bisq 2.iconset/icon_256x256@2x.png differ diff --git a/desktopapp/package/macosx/Bisq 2.iconset/icon_32x32.png b/desktopapp/package/macosx/Bisq 2.iconset/icon_32x32.png old mode 100644 new mode 100755 index a0f19e09f9..d1a801cc4b Binary files a/desktopapp/package/macosx/Bisq 2.iconset/icon_32x32.png and b/desktopapp/package/macosx/Bisq 2.iconset/icon_32x32.png differ diff --git a/desktopapp/package/macosx/Bisq 2.iconset/icon_32x32@2x.png b/desktopapp/package/macosx/Bisq 2.iconset/icon_32x32@2x.png old mode 100644 new mode 100755 index 581433e968..6491eef346 Binary files a/desktopapp/package/macosx/Bisq 2.iconset/icon_32x32@2x.png and b/desktopapp/package/macosx/Bisq 2.iconset/icon_32x32@2x.png differ diff --git a/desktopapp/package/macosx/Bisq 2.iconset/icon_512x512.png b/desktopapp/package/macosx/Bisq 2.iconset/icon_512x512.png old mode 100644 new mode 100755 index eb91e3623c..bfe2c890a2 Binary files a/desktopapp/package/macosx/Bisq 2.iconset/icon_512x512.png and b/desktopapp/package/macosx/Bisq 2.iconset/icon_512x512.png differ diff --git a/desktopapp/package/macosx/Bisq 2.iconset/icon_512x512@2x.png b/desktopapp/package/macosx/Bisq 2.iconset/icon_512x512@2x.png old mode 100644 new mode 100755 index 9a97499742..f94404d1a9 Binary files a/desktopapp/package/macosx/Bisq 2.iconset/icon_512x512@2x.png and b/desktopapp/package/macosx/Bisq 2.iconset/icon_512x512@2x.png differ diff --git a/desktopapp/package/macosx/Bisq 2.iconset/icon_512x512_full.png b/desktopapp/package/macosx/Bisq 2.iconset/icon_512x512_full.png new file mode 100755 index 0000000000..90bb1613a2 Binary files /dev/null and b/desktopapp/package/macosx/Bisq 2.iconset/icon_512x512_full.png differ diff --git a/desktopapp/package/macosx/Bisq 2.iconset/icon_512x512_full@2x.png b/desktopapp/package/macosx/Bisq 2.iconset/icon_512x512_full@2x.png new file mode 100755 index 0000000000..30883e5bbf Binary files /dev/null and b/desktopapp/package/macosx/Bisq 2.iconset/icon_512x512_full@2x.png differ diff --git a/desktopapp/package/macosx/Bisq 2.iconset/icon_64x64.png b/desktopapp/package/macosx/Bisq 2.iconset/icon_64x64.png old mode 100644 new mode 100755 index 8f84e615f7..1d67544337 Binary files a/desktopapp/package/macosx/Bisq 2.iconset/icon_64x64.png and b/desktopapp/package/macosx/Bisq 2.iconset/icon_64x64.png differ diff --git a/desktopapp/package/macosx/Bisq 2.iconset/icon_64x64@2x.png b/desktopapp/package/macosx/Bisq 2.iconset/icon_64x64@2x.png old mode 100644 new mode 100755 index 082f7c633d..c98560168e Binary files a/desktopapp/package/macosx/Bisq 2.iconset/icon_64x64@2x.png and b/desktopapp/package/macosx/Bisq 2.iconset/icon_64x64@2x.png differ diff --git a/desktopapp/package/windows/Bisq 2.ico b/desktopapp/package/windows/Bisq 2.ico index 4b6dda4951..a2c06802e7 100644 Binary files a/desktopapp/package/windows/Bisq 2.ico and b/desktopapp/package/windows/Bisq 2.ico differ diff --git a/desktopapp/package/windows/images/WixUIBannerBmp.bmp b/desktopapp/package/windows/images/WixUIBannerBmp.bmp index 8af4e9b770..d1faf8de05 100644 Binary files a/desktopapp/package/windows/images/WixUIBannerBmp.bmp and b/desktopapp/package/windows/images/WixUIBannerBmp.bmp differ diff --git a/desktopapp/package/windows/images/WixUIDialogBmp.bmp b/desktopapp/package/windows/images/WixUIDialogBmp.bmp index 0f3e140bb2..8dbb8192ac 100644 Binary files a/desktopapp/package/windows/images/WixUIDialogBmp.bmp and b/desktopapp/package/windows/images/WixUIDialogBmp.bmp differ