From: Ben Soares Date: Fri, 4 Dec 2020 00:56:40 +0000 (+0000) Subject: JAL-3594 Release images and channel properties X-Git-Tag: Develop-2_11_2_0-d20201215~12^2~13 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=eb4225509a3a82a8418eb93e2c8ebc8465cc97e1;p=jalview.git JAL-3594 Release images and channel properties --- diff --git a/utils/channels/develop/channel_gradle.properties b/utils/channels/develop/channel_gradle.properties index 3a4c78e..1be0ada 100644 --- a/utils/channels/develop/channel_gradle.properties +++ b/utils/channels/develop/channel_gradle.properties @@ -23,8 +23,6 @@ getdown_alt_java8_min_version = 01080000 getdown_alt_java8_max_version = 01089999 getdown_alt_java11_min_version = 11000000 getdown_alt_java11_max_version = -#getdown_alt_java11_txt_multi_java_location = [windows-amd64] /getdown/jre/windows-jre11.jar,[linux-amd64] /getdown/jre/linux-jre11.jar,[mac os x] /getdown/jre/macos-jre11.jar -install4j_utils_dir = utils/install4j install4j_images_dir = utils/channels/develop/images install4j_mac_icons_file = jalview_develop_logo.icns install4j_windows_icons_file = jalview_develop_logo.ico diff --git a/utils/channels/develop/getdown/resource/jalview_develop_getdown_background.png b/utils/channels/develop/getdown/resource/jalview_develop_getdown_background.png deleted file mode 100644 index d6eb276..0000000 Binary files a/utils/channels/develop/getdown/resource/jalview_develop_getdown_background.png and /dev/null differ diff --git a/utils/channels/develop/getdown/resource/jalview_develop_getdown_background_error.png b/utils/channels/develop/getdown/resource/jalview_develop_getdown_background_error.png deleted file mode 100644 index 3001f46..0000000 Binary files a/utils/channels/develop/getdown/resource/jalview_develop_getdown_background_error.png and /dev/null differ diff --git a/utils/channels/develop/getdown/resource/jalview_develop_getdown_background_initialising.png b/utils/channels/develop/getdown/resource/jalview_develop_getdown_background_initialising.png deleted file mode 100644 index b264ee5..0000000 Binary files a/utils/channels/develop/getdown/resource/jalview_develop_getdown_background_initialising.png and /dev/null differ diff --git a/utils/channels/develop/getdown/resource/jalview_develop_getdown_progress_bar.png b/utils/channels/develop/getdown/resource/jalview_develop_getdown_progress_bar.png deleted file mode 100644 index 3b1cfe1..0000000 Binary files a/utils/channels/develop/getdown/resource/jalview_develop_getdown_progress_bar.png and /dev/null differ diff --git a/utils/channels/develop/getdown/resource/jalview_develop_logo.png b/utils/channels/develop/getdown/resource/jalview_develop_logo.png deleted file mode 100644 index 9a6a135..0000000 Binary files a/utils/channels/develop/getdown/resource/jalview_develop_logo.png and /dev/null differ diff --git a/utils/channels/develop/install4j/jalview_develop_logo.icns b/utils/channels/develop/install4j/jalview_develop_logo.icns deleted file mode 100644 index ceab689..0000000 Binary files a/utils/channels/develop/install4j/jalview_develop_logo.icns and /dev/null differ diff --git a/utils/channels/develop/install4j/jalview_develop_logo.ico b/utils/channels/develop/install4j/jalview_develop_logo.ico deleted file mode 100644 index 76e6dd6..0000000 Binary files a/utils/channels/develop/install4j/jalview_develop_logo.ico and /dev/null differ diff --git a/utils/channels/develop/install4j/jalview_develop_logo.png b/utils/channels/develop/install4j/jalview_develop_logo.png deleted file mode 100644 index 9a6a135..0000000 Binary files a/utils/channels/develop/install4j/jalview_develop_logo.png and /dev/null differ diff --git a/utils/channels/develop/resources/channel_properties b/utils/channels/develop/resources/channel_properties index a634bb6..d487bbf 100644 --- a/utils/channels/develop/resources/channel_properties +++ b/utils/channels/develop/resources/channel_properties @@ -1,4 +1,11 @@ -app_name=Jalview Develop -about_logo=Jalview_Develop_Logo.png -taskbar_icon=JalviewLogo_Huge.png -default_channel_appbase=https://www.jalview.org/getdown/release/11 +channel.app_name=Jalview +channel.banner=images/jalview_banner.png +channel.logo.512=images/jalview_logo-512.png +channel.logo.256=images/jalview_logo-256.png +channel.logo.128=images/jalview_logo-128.png +channel.logo.64=images/jalview_logo-64.png +channel.logo.48=images/jalview_logo-48.png +channel.logo.32=images/jalview_logo-32.png +channel.logo.16=images/jalview_logo-16.png +channel.rotatable_logo.48=images/rotatable_jalview_logo-48.png +channel.default_appbase=https://www.jalview.org/getdown/develop/11 diff --git a/utils/channels/develop/resources/images/UoD_banner.png b/utils/channels/develop/resources/images/UoD_banner.png new file mode 100644 index 0000000..2aff7e2 Binary files /dev/null and b/utils/channels/develop/resources/images/UoD_banner.png differ diff --git a/utils/channels/develop/resources/images/jalview_develop_banner.png b/utils/channels/develop/resources/images/jalview_develop_banner.png new file mode 100644 index 0000000..9f1d244 Binary files /dev/null and b/utils/channels/develop/resources/images/jalview_develop_banner.png differ diff --git a/utils/channels/develop/resources/images/rotatable_jalview_develop_logo-48.png b/utils/channels/develop/resources/images/rotatable_jalview_develop_logo-48.png new file mode 100644 index 0000000..f8d0a1f Binary files /dev/null and b/utils/channels/develop/resources/images/rotatable_jalview_develop_logo-48.png differ diff --git a/utils/channels/release/channel_gradle.properties b/utils/channels/release/channel_gradle.properties new file mode 100644 index 0000000..b175be4 --- /dev/null +++ b/utils/channels/release/channel_gradle.properties @@ -0,0 +1,17 @@ +# These properties will be read into the build.gradle REPLACING any properties with the same name in gradle.properties +# BEFORE local_properties is read +# The purpose of this is to change cosmetic/themed items, and use the channel specific channels_properties file in Jalview +getdown_images_dir = utils/channels/release/images +getdown_background_image = jalview_getdown_background.png +getdown_instant_background_image = jalview_getdown_background_initialising.png +getdown_error_background = jalview_getdown_background_error.png +getdown_progress_image = jalview_getdown_progress_bar.png +getdown_mac_dock_icon = jalview_logo.icns +getdown_icon = jalview_logo.png +getdown_txt_allow_offline = true +getdown_txt_max_concurrent_downloads = 10 +getdown_txt_ui.install_error = https://www.jalview.org/faq/getdownerror +install4j_images_dir = utils/channels/release/images +install4j_mac_icons_file = jalview_logo.icns +install4j_windows_icons_file = jalview_logo.ico +install4j_png_icon_file = jalview_logo.png diff --git a/utils/getdown/jalview_logo_background_getdown-640x480.png b/utils/channels/release/images/jalview_getdown_background.png similarity index 100% rename from utils/getdown/jalview_logo_background_getdown-640x480.png rename to utils/channels/release/images/jalview_getdown_background.png diff --git a/utils/getdown/jalview_logo_background_getdown_error-640x480.png b/utils/channels/release/images/jalview_getdown_background_error.png similarity index 100% rename from utils/getdown/jalview_logo_background_getdown_error-640x480.png rename to utils/channels/release/images/jalview_getdown_background_error.png diff --git a/utils/getdown/jalview_logo_background_getdown_instant-640x480.png b/utils/channels/release/images/jalview_getdown_background_initialising.png similarity index 100% rename from utils/getdown/jalview_logo_background_getdown_instant-640x480.png rename to utils/channels/release/images/jalview_getdown_background_initialising.png diff --git a/utils/getdown/jalview_logo_background_getdown-progress.png b/utils/channels/release/images/jalview_getdown_progress_bar.png similarity index 100% rename from utils/getdown/jalview_logo_background_getdown-progress.png rename to utils/channels/release/images/jalview_getdown_progress_bar.png diff --git a/utils/channels/release/images/jalview_logo.icns b/utils/channels/release/images/jalview_logo.icns new file mode 100644 index 0000000..7f03345 Binary files /dev/null and b/utils/channels/release/images/jalview_logo.icns differ diff --git a/utils/channels/release/images/jalview_logo.ico b/utils/channels/release/images/jalview_logo.ico new file mode 100644 index 0000000..1fe7f0f Binary files /dev/null and b/utils/channels/release/images/jalview_logo.ico differ diff --git a/utils/channels/release/images/jalview_logo-512.png b/utils/channels/release/images/jalview_logo.png similarity index 100% rename from utils/channels/release/images/jalview_logo-512.png rename to utils/channels/release/images/jalview_logo.png diff --git a/utils/channels/release/channel_properties b/utils/channels/release/resources/channel_properties similarity index 100% rename from utils/channels/release/channel_properties rename to utils/channels/release/resources/channel_properties diff --git a/utils/channels/release/resources/images/UoD_banner.png b/utils/channels/release/resources/images/UoD_banner.png new file mode 100644 index 0000000..2aff7e2 Binary files /dev/null and b/utils/channels/release/resources/images/UoD_banner.png differ diff --git a/utils/channels/release/images/jalview_banner.png b/utils/channels/release/resources/images/jalview_banner.png similarity index 100% rename from utils/channels/release/images/jalview_banner.png rename to utils/channels/release/resources/images/jalview_banner.png diff --git a/utils/channels/release/images/jalview_logo-128.png b/utils/channels/release/resources/images/jalview_logo-128.png similarity index 100% rename from utils/channels/release/images/jalview_logo-128.png rename to utils/channels/release/resources/images/jalview_logo-128.png diff --git a/utils/channels/release/images/jalview_logo-16.png b/utils/channels/release/resources/images/jalview_logo-16.png similarity index 100% rename from utils/channels/release/images/jalview_logo-16.png rename to utils/channels/release/resources/images/jalview_logo-16.png diff --git a/utils/channels/release/images/jalview_logo-256.png b/utils/channels/release/resources/images/jalview_logo-256.png similarity index 100% rename from utils/channels/release/images/jalview_logo-256.png rename to utils/channels/release/resources/images/jalview_logo-256.png diff --git a/utils/channels/release/images/jalview_logo-32.png b/utils/channels/release/resources/images/jalview_logo-32.png similarity index 100% rename from utils/channels/release/images/jalview_logo-32.png rename to utils/channels/release/resources/images/jalview_logo-32.png diff --git a/utils/channels/release/images/jalview_logo-48.png b/utils/channels/release/resources/images/jalview_logo-48.png similarity index 100% rename from utils/channels/release/images/jalview_logo-48.png rename to utils/channels/release/resources/images/jalview_logo-48.png diff --git a/utils/channels/release/temp/jalview_logo-512.png b/utils/channels/release/resources/images/jalview_logo-512.png similarity index 100% rename from utils/channels/release/temp/jalview_logo-512.png rename to utils/channels/release/resources/images/jalview_logo-512.png diff --git a/utils/channels/release/images/jalview_logo-64.png b/utils/channels/release/resources/images/jalview_logo-64.png similarity index 100% rename from utils/channels/release/images/jalview_logo-64.png rename to utils/channels/release/resources/images/jalview_logo-64.png diff --git a/utils/channels/release/resources/images/rotatable_jalview_logo-48.png b/utils/channels/release/resources/images/rotatable_jalview_logo-48.png new file mode 100644 index 0000000..5fec791 Binary files /dev/null and b/utils/channels/release/resources/images/rotatable_jalview_logo-48.png differ diff --git a/utils/channels/release/temp/jalview_logo-128.png b/utils/channels/release/temp/jalview_logo-128.png deleted file mode 100644 index 63fa253..0000000 Binary files a/utils/channels/release/temp/jalview_logo-128.png and /dev/null differ diff --git a/utils/channels/release/temp/jalview_logo-16.png b/utils/channels/release/temp/jalview_logo-16.png deleted file mode 100644 index 9a1adfb..0000000 Binary files a/utils/channels/release/temp/jalview_logo-16.png and /dev/null differ diff --git a/utils/channels/release/temp/jalview_logo-256.png b/utils/channels/release/temp/jalview_logo-256.png deleted file mode 100644 index 6963612..0000000 Binary files a/utils/channels/release/temp/jalview_logo-256.png and /dev/null differ diff --git a/utils/channels/release/temp/jalview_logo-32.png b/utils/channels/release/temp/jalview_logo-32.png deleted file mode 100644 index 7af5791..0000000 Binary files a/utils/channels/release/temp/jalview_logo-32.png and /dev/null differ diff --git a/utils/channels/release/temp/jalview_logo-48.png b/utils/channels/release/temp/jalview_logo-48.png deleted file mode 100644 index 297e6cc..0000000 Binary files a/utils/channels/release/temp/jalview_logo-48.png and /dev/null differ diff --git a/utils/channels/release/temp/jalview_logo-64.png b/utils/channels/release/temp/jalview_logo-64.png deleted file mode 100644 index 2505ae9..0000000 Binary files a/utils/channels/release/temp/jalview_logo-64.png and /dev/null differ diff --git a/utils/getdown/Jalview-Logo.png b/utils/getdown/Jalview-Logo.png deleted file mode 100644 index 340f8e5..0000000 Binary files a/utils/getdown/Jalview-Logo.png and /dev/null differ diff --git a/utils/getdown/jalview_logo_background_fade-640x480.xcf b/utils/getdown/jalview_getdown_background.xcf similarity index 100% rename from utils/getdown/jalview_logo_background_fade-640x480.xcf rename to utils/getdown/jalview_getdown_background.xcf diff --git a/utils/getdown/jalview_logo_background_getdown-progress3.xcf b/utils/getdown/jalview_getdown_progress_bar.xcf similarity index 100% rename from utils/getdown/jalview_logo_background_getdown-progress3.xcf rename to utils/getdown/jalview_getdown_progress_bar.xcf diff --git a/utils/getdown/jalview_logo_background_getdown-progress-TEST2.png b/utils/getdown/jalview_logo_background_getdown-progress-TEST2.png deleted file mode 100644 index 1a9bf34..0000000 Binary files a/utils/getdown/jalview_logo_background_getdown-progress-TEST2.png and /dev/null differ diff --git a/utils/getdown/jalview_logo_background_getdown-progress1.png b/utils/getdown/jalview_logo_background_getdown-progress1.png deleted file mode 100644 index 804063a..0000000 Binary files a/utils/getdown/jalview_logo_background_getdown-progress1.png and /dev/null differ diff --git a/utils/getdown/jalview_logo_background_getdown-progress2.png b/utils/getdown/jalview_logo_background_getdown-progress2.png deleted file mode 100644 index fb87750..0000000 Binary files a/utils/getdown/jalview_logo_background_getdown-progress2.png and /dev/null differ diff --git a/utils/getdown/jalview_logo_background_getdown-progress3-0.png b/utils/getdown/jalview_logo_background_getdown-progress3-0.png deleted file mode 100644 index cb1475c..0000000 Binary files a/utils/getdown/jalview_logo_background_getdown-progress3-0.png and /dev/null differ diff --git a/utils/getdown/jalview_logo_background_getdown-progress3-1.png b/utils/getdown/jalview_logo_background_getdown-progress3-1.png deleted file mode 100644 index 71066e8..0000000 Binary files a/utils/getdown/jalview_logo_background_getdown-progress3-1.png and /dev/null differ diff --git a/utils/getdown/jalview_logo_background_getdown-progress4.png b/utils/getdown/jalview_logo_background_getdown-progress4.png deleted file mode 100644 index bc7e125..0000000 Binary files a/utils/getdown/jalview_logo_background_getdown-progress4.png and /dev/null differ diff --git a/utils/getdown/jalview_logos.icns b/utils/getdown/jalview_logos.icns deleted file mode 100644 index 6c2ee9a..0000000 Binary files a/utils/getdown/jalview_logos.icns and /dev/null differ diff --git a/utils/install4j/README_convert_PNG_to_ICNS_and_ICO b/utils/install4j/README_convert_PNG_to_ICNS_and_ICO index 3d2dbf4..b50eb1a 100644 --- a/utils/install4j/README_convert_PNG_to_ICNS_and_ICO +++ b/utils/install4j/README_convert_PNG_to_ICNS_and_ICO @@ -20,3 +20,12 @@ It is then up to the OS to display the correct one in different circumstances. This script uses the utilities convert (ImageMagick) and png2icns (icnsutils) which should be installed and in the path. Note that for some reason ICNS files should not contain a 64x64 pixel version of a logo, so the script removes this as png2icns complains if it finds one! + +### Rotatable icon with white background + +This icon is used by the web services progress window, with the rotating Jalview logo. +It requires some small margin of white pixels around the logo to enable antialiasing around the edge of the logo. +You can make one form a 48x48 transparent logo with +``` +convert jalview_logo-48.png -gravity center -background white -extent 60x60 rotatable_jalview_logo-48.png +```