From: Ben Soares Date: Fri, 18 Sep 2020 11:09:36 +0000 (+0100) Subject: JAL-3594 Different icon/getdown styling when launching jalview built with -PCHANNEL... X-Git-Tag: Develop-2_11_2_0-d20201215~12^2~16 X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=d7368218039692c3cb2ab5c1a83388f98b89c821 JAL-3594 Different icon/getdown styling when launching jalview built with -PCHANNEL=DEVELOP --- diff --git a/.gitignore b/.gitignore index 7ca0f00..cd56818 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,5 @@ TESTNG /jalviewjsTest.html /site1 /site2 +/resources/.build_properties +/resources/channel_properties diff --git a/build.gradle b/build.gradle index c3e89e5..f9d2974 100644 --- a/build.gradle +++ b/build.gradle @@ -174,11 +174,17 @@ ext { buildDist = true // the following values might be overridden by the CHANNEL switch + channelPropertiesFile = string("${channel_properties_dir}/release_properties") getdownChannelName = CHANNEL.toLowerCase() getdownDir = string("${getdownChannelName}/${JAVA_VERSION}") getdownAppBase = string("${getdown_channel_base}/${getdownDir}") getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher}") getdownAppDistDir = getdown_app_dir_alt + buildProperties = string("${resourceDir}/${build_properties_file}") + getdownImagesDir = getdown_images_dir + getdownBgColour = "FFFFFF" + getdownFgColour = "000000" + getdownLightFgColour = "000066" reportRsyncCommand = false jvlChannelName = CHANNEL.toLowerCase() install4jSuffix = CHANNEL.substring(0, 1).toUpperCase() + CHANNEL.substring(1).toLowerCase(); // BUILD -> Build @@ -187,6 +193,9 @@ ext { install4jInstallerName = "${jalview_name} Non-Release Installer" install4jExecutableName = jalview_name.replaceAll("[^\\w]+", "_").toLowerCase() install4jExtraScheme = "jalviewx" + install4jMacIconsFile = string("${install4j_utils_dir}/${install4j_mac_icons_file}") + install4jWindowsIconsFile = string("${install4j_utils_dir}/${install4j_windows_icons_file}") + install4jPngIconFile = string("${install4j_utils_dir}/${install4j_png_icon_file}") switch (CHANNEL) { case "BUILD": @@ -1204,7 +1213,12 @@ task copyResources(type: Copy) { inputs.dir(inputDir) outputs.dir(outputDir) } - +task copyChannelProperties(type: Copy) { + def propsFile = file(channelPropertiesFile) + rename(propsFile.getName(), "channel_properties") + from channelPropertiesFile + into resourceDir +} task createBuildProperties(type: WriteProperties) { dependsOn copyResources @@ -1243,7 +1257,6 @@ task buildIndices(type: JavaExec) { outputs.file("${workingDir}/JavaHelpSearch/TMAP") } - task prepare { dependsOn copyResources dependsOn copyDocs @@ -1467,6 +1480,17 @@ task getdownWebsite() { if (getdownAltMultiJavaLocation != null && getdownAltMultiJavaLocation.length() > 0) { props.put("getdown_txt_multi_java_location", getdownAltMultiJavaLocation) } + if (getdownImagesDir != null && file(getdownImagesDir).exists()) { + props.put("getdown_txt_ui.background_image", "${getdownImagesDir}/${getdown_background_image}") + props.put("getdown_txt_ui.instant_background_image", "${getdownImagesDir}/${getdown_instant_background_image}") + props.put("getdown_txt_ui.error_background", "${getdownImagesDir}/${getdown_error_background}") + props.put("getdown_txt_ui.progress_image", "${getdownImagesDir}/${getdown_progress_image}") + props.put("getdown_txt_ui.icon", "${getdownImagesDir}/${getdown_icon}") + props.put("getdown_txt_ui.mac_dock_icon", "${getdownImagesDir}/${getdown_mac_dock_icon}") + props.put("getdown_txt_ui.background", getdownBgColour) + props.put("getdown_txt_ui.progress_text", getdownFgColour) + props.put("getdown_txt_ui.status_text", getdownLightFgColour) + } props.put("getdown_txt_title", jalview_name) props.put("getdown_txt_ui.name", install4jApplicationName) @@ -1851,6 +1875,10 @@ task installers(type: com.install4j.gradle.Install4jTask) { 'UNIX_APPLICATION_FOLDER': install4jUnixApplicationFolder, 'EXECUTABLE_NAME': install4jExecutableName, 'EXTRA_SCHEME': install4jExtraScheme, + 'MAC_ICONS_FILE': install4jMacIconsFile, + 'WINDOWS_ICONS_FILE': install4jWindowsIconsFile, + 'PNG_ICON_FILE': install4jPngIconFile, + ] //println("INSTALL4J VARIABLES:") diff --git a/gradle.properties b/gradle.properties index 75d2c46..d681630 100644 --- a/gradle.properties +++ b/gradle.properties @@ -69,11 +69,17 @@ getdown_launcher_new = getdown-launcher-new.jar getdown_core = getdown/lib/getdown-core.jar getdown_build_properties = build_properties getdown_launch_jvl_name = channel_launch +getdown_images_dir = utils/getdown +getdown_background_image = jalview_logo_background_getdown-640x480.png +getdown_instant_background_image = jalview_logo_background_getdown_instant-640x480.png +getdown_error_background = jalview_logo_background_getdown_error-640x480.png +getdown_progress_image = jalview_logo_background_getdown-progress.png +getdown_mac_dock_icon = jalview_logos.icns +getdown_icon = Jalview-Logo.png getdown_txt_allow_offline = true getdown_txt_max_concurrent_downloads = 10 -# now got better defaults when not set +# now got better (dynamic) defaults when jvmmem* not set #getdown_txt_jalview.jvmmempc = 90 -# now got better defaults when not set #getdown_txt_jalview.jvmmemmax = 32G getdown_txt_multi_jvmarg = -Dgetdownappdir=%APPDIR% getdown_txt_strict_comments = true @@ -84,19 +90,12 @@ getdown_txt_ui.display_appbase = true getdown_txt_ui.display_version = true getdown_txt_ui.min_show_seconds = 6 getdown_txt_ui.background = FFFFFF -getdown_txt_ui.background_image = utils/getdown/jalview_logo_background_getdown-640x480.png -getdown_txt_ui.instant_background_image = utils/getdown/jalview_logo_background_getdown_instant-640x480.png -getdown_txt_ui.error_background = utils/getdown/jalview_logo_background_getdown_error-640x480.png -getdown_txt_ui.progress_image = utils/getdown/jalview_logo_background_getdown-progress.png -getdown_txt_ui.icon = resources/images/JalviewLogo_Huge.png getdown_txt_ui.progress = 20, 440, 600, 22 getdown_txt_ui.progress_bar = AAAAFF getdown_txt_ui.progress_text = 000000 getdown_txt_ui.status = 20, 380, 600, 58 getdown_txt_ui.status_text = 000066 -#getdown_txt_ui.text_shadow = FFFFFF getdown_txt_ui.install_error = https://www.jalview.org/faq/getdownerror -getdown_txt_ui.mac_dock_icon = resources/images/jalview_logos.ico getdown_alt_java8_min_version = 01080000 getdown_alt_java8_max_version = 01089999 getdown_alt_java11_min_version = 11000000 @@ -112,6 +111,8 @@ j11modules = com.sun.istack.runtime,com.sun.xml.bind,com.sun.xml.fastinfoset,com flexmark_css = utils/doc/github.css +channel_properties_dir = utils/channels + install4j_home_dir = ~/buildtools/install4j8 install4j_copyright_message = ... install4j_bundle_id = org.jalview.jalview-desktop @@ -125,6 +126,9 @@ install4j_media_types = windows,macosArchive,unixArchive,unixInstaller install4j_faster = false install4j_application_categories = Science;Biology;Java; install4j_release_win_application_id = 6595-2347-1923-0725 +install4j_mac_icons_file = jalview_logos.icns +install4j_windows_icons_file = jalview_logos.ico +install4j_png_icon_file = Jalview-Logo.png OSX_KEYSTORE = OSX_KEYPASS = diff --git a/resources/images/JalviewDevelopLogo_Huge.png b/resources/images/JalviewDevelopLogo_Huge.png new file mode 100644 index 0000000..7c15561 Binary files /dev/null and b/resources/images/JalviewDevelopLogo_Huge.png differ diff --git a/resources/images/Jalview_Develop_Logo.png b/resources/images/Jalview_Develop_Logo.png new file mode 100644 index 0000000..0fbe361 Binary files /dev/null and b/resources/images/Jalview_Develop_Logo.png differ diff --git a/resources/images/Jalview_Logo.png b/resources/images/Jalview_Logo.png index 06429d9..8e35408 100644 Binary files a/resources/images/Jalview_Logo.png and b/resources/images/Jalview_Logo.png differ diff --git a/utils/channels/develop_properties b/utils/channels/develop_properties new file mode 100644 index 0000000..a634bb6 --- /dev/null +++ b/utils/channels/develop_properties @@ -0,0 +1,4 @@ +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 diff --git a/utils/channels/release_properties b/utils/channels/release_properties new file mode 100644 index 0000000..de94c3f --- /dev/null +++ b/utils/channels/release_properties @@ -0,0 +1,4 @@ +app_name=Jalview +about_logo=images/Jalview_Logo.png +taskbar_icon=images/JalviewLogo_Huge.png +default_channel_appbase=https://www.jalview.org/getdown/release/1.8 diff --git a/utils/getdown/Jalview-Logo.png b/utils/getdown/Jalview-Logo.png new file mode 100644 index 0000000..340f8e5 Binary files /dev/null and b/utils/getdown/Jalview-Logo.png differ diff --git a/utils/getdown/develop/Jalview-Logo.png b/utils/getdown/develop/Jalview-Logo.png new file mode 100644 index 0000000..7c15561 Binary files /dev/null and b/utils/getdown/develop/Jalview-Logo.png differ diff --git a/utils/getdown/develop/jalview_logo_background_blur-640x480.xcf b/utils/getdown/develop/jalview_logo_background_blur-640x480.xcf new file mode 100644 index 0000000..50296ca Binary files /dev/null and b/utils/getdown/develop/jalview_logo_background_blur-640x480.xcf differ diff --git a/utils/getdown/develop/jalview_logo_background_getdown-640x480.png b/utils/getdown/develop/jalview_logo_background_getdown-640x480.png new file mode 100644 index 0000000..2714eb0 Binary files /dev/null and b/utils/getdown/develop/jalview_logo_background_getdown-640x480.png differ diff --git a/utils/getdown/develop/jalview_logo_background_getdown-progress.png b/utils/getdown/develop/jalview_logo_background_getdown-progress.png new file mode 100644 index 0000000..05ac4a8 Binary files /dev/null and b/utils/getdown/develop/jalview_logo_background_getdown-progress.png differ diff --git a/utils/getdown/develop/jalview_logo_background_getdown-progress3.xcf b/utils/getdown/develop/jalview_logo_background_getdown-progress3.xcf new file mode 100644 index 0000000..d0223c5 Binary files /dev/null and b/utils/getdown/develop/jalview_logo_background_getdown-progress3.xcf differ diff --git a/utils/getdown/develop/jalview_logo_background_getdown_error-640x480.png b/utils/getdown/develop/jalview_logo_background_getdown_error-640x480.png new file mode 100644 index 0000000..969f94c Binary files /dev/null and b/utils/getdown/develop/jalview_logo_background_getdown_error-640x480.png differ diff --git a/utils/getdown/develop/jalview_logo_background_getdown_instant-640x480.png b/utils/getdown/develop/jalview_logo_background_getdown_instant-640x480.png new file mode 100644 index 0000000..43018f9 Binary files /dev/null and b/utils/getdown/develop/jalview_logo_background_getdown_instant-640x480.png differ diff --git a/utils/getdown/develop/jalview_logos.icns b/utils/getdown/develop/jalview_logos.icns new file mode 100644 index 0000000..af93cdd Binary files /dev/null and b/utils/getdown/develop/jalview_logos.icns differ diff --git a/resources/images/jalview_logos.icns b/utils/getdown/jalview_logos.icns similarity index 100% rename from resources/images/jalview_logos.icns rename to utils/getdown/jalview_logos.icns diff --git a/utils/install4j/Jalview-Logo.png b/utils/install4j/Jalview-Logo.png new file mode 100644 index 0000000..340f8e5 Binary files /dev/null and b/utils/install4j/Jalview-Logo.png differ diff --git a/utils/install4j/develop/Jalview-Logo.png b/utils/install4j/develop/Jalview-Logo.png new file mode 100644 index 0000000..7c15561 Binary files /dev/null and b/utils/install4j/develop/Jalview-Logo.png differ diff --git a/utils/install4j/develop/cmds b/utils/install4j/develop/cmds new file mode 100644 index 0000000..01136ad --- /dev/null +++ b/utils/install4j/develop/cmds @@ -0,0 +1,3 @@ +convert jalview_logos_16x16x32.png jalview_logos_32x32x32.png jalview_logos_128x128x32.png jalview_logos_256x256x32.png jalview_logos_512x512x32.png ./jalview_logos.ico + +png2icns ./jalview_logos.icns jalview_logos_16x16x32.png jalview_logos_32x32x32.png jalview_logos_128x128x32.png jalview_logos_256x256x32.png jalview_logos_512x512x3 diff --git a/utils/install4j/develop/jalview_develop_512x512x32.xcf b/utils/install4j/develop/jalview_develop_512x512x32.xcf new file mode 100644 index 0000000..ac39dd7 Binary files /dev/null and b/utils/install4j/develop/jalview_develop_512x512x32.xcf differ diff --git a/utils/install4j/develop/jalview_develop_dark/jalview_develop_dark_512x512x32.xcf b/utils/install4j/develop/jalview_develop_dark/jalview_develop_dark_512x512x32.xcf new file mode 100644 index 0000000..7f24401 Binary files /dev/null and b/utils/install4j/develop/jalview_develop_dark/jalview_develop_dark_512x512x32.xcf differ diff --git a/utils/install4j/develop/jalview_develop_dark/jalview_logos.icns b/utils/install4j/develop/jalview_develop_dark/jalview_logos.icns new file mode 100644 index 0000000..263cb2b Binary files /dev/null and b/utils/install4j/develop/jalview_develop_dark/jalview_logos.icns differ diff --git a/utils/install4j/develop/jalview_develop_dark/jalview_logos.ico b/utils/install4j/develop/jalview_develop_dark/jalview_logos.ico new file mode 100644 index 0000000..3e6f73b Binary files /dev/null and b/utils/install4j/develop/jalview_develop_dark/jalview_logos.ico differ diff --git a/utils/install4j/develop/jalview_develop_dark/jalview_logos_128x128x32.png b/utils/install4j/develop/jalview_develop_dark/jalview_logos_128x128x32.png new file mode 100644 index 0000000..325542c Binary files /dev/null and b/utils/install4j/develop/jalview_develop_dark/jalview_logos_128x128x32.png differ diff --git a/utils/install4j/develop/jalview_develop_dark/jalview_logos_16x16x32.png b/utils/install4j/develop/jalview_develop_dark/jalview_logos_16x16x32.png new file mode 100644 index 0000000..e725f74 Binary files /dev/null and b/utils/install4j/develop/jalview_develop_dark/jalview_logos_16x16x32.png differ diff --git a/utils/install4j/develop/jalview_develop_dark/jalview_logos_256x256x32.png b/utils/install4j/develop/jalview_develop_dark/jalview_logos_256x256x32.png new file mode 100644 index 0000000..ab04763 Binary files /dev/null and b/utils/install4j/develop/jalview_develop_dark/jalview_logos_256x256x32.png differ diff --git a/utils/install4j/develop/jalview_develop_dark/jalview_logos_32x32x32.png b/utils/install4j/develop/jalview_develop_dark/jalview_logos_32x32x32.png new file mode 100644 index 0000000..f332111 Binary files /dev/null and b/utils/install4j/develop/jalview_develop_dark/jalview_logos_32x32x32.png differ diff --git a/utils/install4j/develop/jalview_develop_dark/jalview_logos_512x512x32.png b/utils/install4j/develop/jalview_develop_dark/jalview_logos_512x512x32.png new file mode 100644 index 0000000..6ead08d Binary files /dev/null and b/utils/install4j/develop/jalview_develop_dark/jalview_logos_512x512x32.png differ diff --git a/utils/install4j/develop/jalview_develop_dark2/Jalview-Logo-no_circle.png b/utils/install4j/develop/jalview_develop_dark2/Jalview-Logo-no_circle.png new file mode 100644 index 0000000..f5428ad Binary files /dev/null and b/utils/install4j/develop/jalview_develop_dark2/Jalview-Logo-no_circle.png differ diff --git a/utils/install4j/develop/jalview_develop_dark2/jalview_develop_dark2_512x512x32.xcf b/utils/install4j/develop/jalview_develop_dark2/jalview_develop_dark2_512x512x32.xcf new file mode 100644 index 0000000..92c56a7 Binary files /dev/null and b/utils/install4j/develop/jalview_develop_dark2/jalview_develop_dark2_512x512x32.xcf differ diff --git a/utils/install4j/develop/jalview_develop_dark2/jalview_logos.icns b/utils/install4j/develop/jalview_develop_dark2/jalview_logos.icns new file mode 100644 index 0000000..af93cdd Binary files /dev/null and b/utils/install4j/develop/jalview_develop_dark2/jalview_logos.icns differ diff --git a/utils/install4j/develop/jalview_develop_dark2/jalview_logos.ico b/utils/install4j/develop/jalview_develop_dark2/jalview_logos.ico new file mode 100644 index 0000000..6f75b2a Binary files /dev/null and b/utils/install4j/develop/jalview_develop_dark2/jalview_logos.ico differ diff --git a/utils/install4j/develop/jalview_develop_dark2/jalview_logos_128x128x32.png b/utils/install4j/develop/jalview_develop_dark2/jalview_logos_128x128x32.png new file mode 100644 index 0000000..6c69d18 Binary files /dev/null and b/utils/install4j/develop/jalview_develop_dark2/jalview_logos_128x128x32.png differ diff --git a/utils/install4j/develop/jalview_develop_dark2/jalview_logos_16x16x32.png b/utils/install4j/develop/jalview_develop_dark2/jalview_logos_16x16x32.png new file mode 100644 index 0000000..0a06545 Binary files /dev/null and b/utils/install4j/develop/jalview_develop_dark2/jalview_logos_16x16x32.png differ diff --git a/utils/install4j/develop/jalview_develop_dark2/jalview_logos_256x256x32.png b/utils/install4j/develop/jalview_develop_dark2/jalview_logos_256x256x32.png new file mode 100644 index 0000000..6f2c947 Binary files /dev/null and b/utils/install4j/develop/jalview_develop_dark2/jalview_logos_256x256x32.png differ diff --git a/utils/install4j/develop/jalview_develop_dark2/jalview_logos_32x32x32.png b/utils/install4j/develop/jalview_develop_dark2/jalview_logos_32x32x32.png new file mode 100644 index 0000000..cb92993 Binary files /dev/null and b/utils/install4j/develop/jalview_develop_dark2/jalview_logos_32x32x32.png differ diff --git a/utils/install4j/develop/jalview_develop_dark2/jalview_logos_512x512x32.png b/utils/install4j/develop/jalview_develop_dark2/jalview_logos_512x512x32.png new file mode 100644 index 0000000..7c15561 Binary files /dev/null and b/utils/install4j/develop/jalview_develop_dark2/jalview_logos_512x512x32.png differ diff --git a/utils/install4j/develop/jalview_logos.icns b/utils/install4j/develop/jalview_logos.icns new file mode 100644 index 0000000..af93cdd Binary files /dev/null and b/utils/install4j/develop/jalview_logos.icns differ diff --git a/utils/install4j/develop/jalview_logos.ico b/utils/install4j/develop/jalview_logos.ico new file mode 100644 index 0000000..6f75b2a Binary files /dev/null and b/utils/install4j/develop/jalview_logos.ico differ diff --git a/utils/install4j/install4j8_template.install4j b/utils/install4j/install4j8_template.install4j index d540935..6de9b08 100644 --- a/utils/install4j/install4j8_template.install4j +++ b/utils/install4j/install4j8_template.install4j @@ -48,6 +48,9 @@ + + + @@ -117,8 +120,8 @@ - - + + @@ -140,13 +143,13 @@ ${compiler:file("${compiler:INFO_PLIST_FILE_ASSOCIATIONS_FILE}")} - + - + @@ -515,13 +518,13 @@ return console.askOkCancel(message, true); - ${compiler:JALVIEW_DIR}/resources/images/jalview_logos.ico + ${compiler:JALVIEW_DIR}/${compiler:WINDOWS_ICONS_FILE} ${compiler:JALVIEW_NAME} - ${compiler:JALVIEW_DIR}/resources/images/JalviewLogo_Huge.png + ${compiler:JALVIEW_DIR}/${compiler:PNG_ICON_FILE} @@ -539,12 +542,12 @@ return console.askOkCancel(message, true); ${compiler:JALVIEW_APPLICATION_NAME} - ${compiler:JALVIEW_DIR}/resources/images/JalviewLogo_Huge.png + ${compiler:JALVIEW_DIR}/${compiler:PNG_ICON_FILE} - ${compiler:JALVIEW_DIR}/resources/images/jalview_logos.ico + ${compiler:JALVIEW_DIR}/${compiler:WINDOWS_ICONS_FILE} diff --git a/utils/install4j/jalview_logos.icns b/utils/install4j/jalview_logos.icns new file mode 100644 index 0000000..6c2ee9a Binary files /dev/null and b/utils/install4j/jalview_logos.icns differ diff --git a/resources/images/jalview_logos.ico b/utils/install4j/jalview_logos.ico similarity index 100% rename from resources/images/jalview_logos.ico rename to utils/install4j/jalview_logos.ico