From d50db8c31e09462ef215880f156764d843e69648 Mon Sep 17 00:00:00 2001
From: Ben Soares <b.soares@dundee.ac.uk>
Date: Wed, 5 Jun 2024 01:28:20 +0100
Subject: [PATCH] JAL-4421 Configuration for positioning icons in DMG

---
 utils/channels/default/channel_gradle.properties   |    1 +
 .../images/jalview_default_dmg_DS_Store.json       |   20 ++++++++++++++++++++
 .../images/jalview_develop_dmg_DS_Store.json       |    9 +++++++++
 .../release/images/jalview_dmg_DS_Store.json       |    7 ++++---
 .../images/jalview_test-release_dmg_DS_Store.json  |    2 +-
 5 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 utils/channels/default/images/jalview_default_dmg_DS_Store.json
 create mode 100644 utils/channels/develop-SUFFIX/images/jalview_develop_dmg_DS_Store.json

diff --git a/utils/channels/default/channel_gradle.properties b/utils/channels/default/channel_gradle.properties
index 0f13784..2b698ba 100644
--- a/utils/channels/default/channel_gradle.properties
+++ b/utils/channels/default/channel_gradle.properties
@@ -19,6 +19,7 @@ install4j_png_icon_file = jalview_logo.png
 install4j_background = jalview_logo_background_fade-640x480.png
 install4j_dmg_background = jalview_default_dmg_background-72dpi.png
 install4j_dmg_ds_store = jalview_default_dmg_DS_Store
+install4j_dmg_ds_store_json = jalview_default_dmg_DS_Store.json
 
 getdown_background_image_text_font = utils/fonts/Roboto.ttf
 getdown_background_image_text_colour = #b4b4b4
diff --git a/utils/channels/default/images/jalview_default_dmg_DS_Store.json b/utils/channels/default/images/jalview_default_dmg_DS_Store.json
new file mode 100644
index 0000000..01ea7dc
--- /dev/null
+++ b/utils/channels/default/images/jalview_default_dmg_DS_Store.json
@@ -0,0 +1,20 @@
+{
+  "files": [
+    {
+      "name": " ",
+      "xpos": 170,
+      "ypos": 30
+    }
+  ],
+  "app": {
+    "xpos": 0,
+    "ypos": 30
+  },
+  "icvp": {
+    "gridSpacing": 90,
+    "iconSize": 48.0,
+    "textSize": 12.0,
+    "gridOffsetX": 0.0,
+    "gridOffsetY": 0.0
+  }
+}
diff --git a/utils/channels/develop-SUFFIX/images/jalview_develop_dmg_DS_Store.json b/utils/channels/develop-SUFFIX/images/jalview_develop_dmg_DS_Store.json
new file mode 100644
index 0000000..c7698a8
--- /dev/null
+++ b/utils/channels/develop-SUFFIX/images/jalview_develop_dmg_DS_Store.json
@@ -0,0 +1,9 @@
+{
+  "files": [
+    {
+      "name": " ",
+      "xpos": 290,
+      "ypos": 52
+    }
+  ]
+}
diff --git a/utils/channels/release/images/jalview_dmg_DS_Store.json b/utils/channels/release/images/jalview_dmg_DS_Store.json
index 5c1b506..aa76531 100644
--- a/utils/channels/release/images/jalview_dmg_DS_Store.json
+++ b/utils/channels/release/images/jalview_dmg_DS_Store.json
@@ -11,8 +11,8 @@
       "ypos": 124
     }
   ],
-  "_comment": "bwsp and icvp are not being used yet",
-  "bwsp": {
+  "_comment": "bwsp and icvp ARE now being used",
+  "NOTbwsp": {
     "ShowStatusBar": false,
     "SidebarWidthTenElevenOrLater": 160,
     "ShowToolbar": false,
@@ -22,12 +22,13 @@
     "ShowSidebar": false,
     "ShowPathbar": false
   },
-  "icvp": {
+  "NOTicvp": {
     "backgroundColorBlue": 1.0,
     "backgroundColorGreen": 1.0,
     "backgroundColorRed": 1.0,
     "labelOnBottom": true,
     "gridSpacing": 100,
+    "iconSize": 48.0,
     "textSize": 12.0,
     "backgroundType": 2,
     "gridOffsetX": 0.0,
diff --git a/utils/channels/test-release/images/jalview_test-release_dmg_DS_Store.json b/utils/channels/test-release/images/jalview_test-release_dmg_DS_Store.json
index 2944791..fd1346e 100644
--- a/utils/channels/test-release/images/jalview_test-release_dmg_DS_Store.json
+++ b/utils/channels/test-release/images/jalview_test-release_dmg_DS_Store.json
@@ -10,5 +10,5 @@
       "xpos": 332,
       "ypos": 124
     }
-  ],
+  ]
 }
-- 
1.7.10.2