Skip to content

Commit

Permalink
Merge pull request #305 from ripcurlx/adapt-macos-build-to-design
Browse files Browse the repository at this point in the history
Adapt builds to new design
  • Loading branch information
chimp1984 authored May 10, 2022
2 parents 4ca8747 + 42632bc commit 0fd7608
Show file tree
Hide file tree
Showing 25 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion desktopapp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Binary file modified desktopapp/package/linux/icon.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktopapp/package/macosx/Bisq 2-background.tiff
Binary file not shown.
7 changes: 4 additions & 3 deletions desktopapp/package/macosx/Bisq 2-dmg-setup.scpt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}
Expand Down
Binary file modified desktopapp/package/macosx/Bisq 2-volume.icns
Binary file not shown.
Binary file modified desktopapp/package/macosx/Bisq 2.icns
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktopapp/package/macosx/Bisq 2.iconset/icon_128x128.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktopapp/package/macosx/Bisq 2.iconset/icon_128x128@2x.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktopapp/package/macosx/Bisq 2.iconset/icon_16x16.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktopapp/package/macosx/Bisq 2.iconset/icon_16x16@2x.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktopapp/package/macosx/Bisq 2.iconset/icon_256x256.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktopapp/package/macosx/Bisq 2.iconset/icon_256x256@2x.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktopapp/package/macosx/Bisq 2.iconset/icon_32x32.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktopapp/package/macosx/Bisq 2.iconset/icon_32x32@2x.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktopapp/package/macosx/Bisq 2.iconset/icon_512x512.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktopapp/package/macosx/Bisq 2.iconset/icon_512x512@2x.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktopapp/package/macosx/Bisq 2.iconset/icon_64x64.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktopapp/package/macosx/Bisq 2.iconset/icon_64x64@2x.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktopapp/package/windows/Bisq 2.ico
Binary file not shown.
Binary file modified desktopapp/package/windows/images/WixUIBannerBmp.bmp
Binary file not shown.
Binary file modified desktopapp/package/windows/images/WixUIDialogBmp.bmp
Binary file not shown.

0 comments on commit 0fd7608

Please sign in to comment.