From da56ea89a181fef7a8e96eac90c9d70afedcd211 Mon Sep 17 00:00:00 2001 From: Aus-gez Date: Thu, 7 Dec 2023 00:09:39 +1100 Subject: [PATCH] Improved update dialogs, and clearer language. Replaced progress bar with a question. --- files/builds/stable-branch/bin/update.sh | 17 +++++------------ .../stable-branch/locale/en-US/locale-en.sh | 10 ++++++---- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/files/builds/stable-branch/bin/update.sh b/files/builds/stable-branch/bin/update.sh index bba9f79..bbaba0d 100644 --- a/files/builds/stable-branch/bin/update.sh +++ b/files/builds/stable-branch/bin/update.sh @@ -126,7 +126,7 @@ function UP_FUSION360_INSTALL_STOP_2 { # The user get a informationt that no newer version of Autodesk Fusion 360 was found! function UP_NO_UPDATE_INFO { - yad --title="$UP_TITLE" --text="$UP_NO_UPDATE_INFO_LABEL" --text-align=center + yad --image dialog-information --title="$UP_TITLE" --text="$UP_NO_UPDATE_INFO_LABEL" --text-align=center --button=gtk-ok:1 LAUNCHER_RUN_FUSION360 } @@ -134,7 +134,7 @@ function UP_NO_UPDATE_INFO { # The user will be informed that he is skipping the update! function UP_SKIP_INFO { - yad --title="$UP_TITLE" --text="$UP_SKIP_INFO_LABEL" --text-align=center + yad --image dialog-information --title="$UP_TITLE" --text="$UP_SKIP_INFO_LABEL" --text-align=center --button=gtk-ok:1 LAUNCHER_RUN_FUSION360 } @@ -142,7 +142,7 @@ function UP_SKIP_INFO { # The user get a informationt that there is no connection to the server! function UP_NO_CONNECTION_WARNING { - yad --title="$UP_TITLE" --text="$UP_NO_CONNECTION_WARNING_LABEL" --text-align=center + yad --image dialog-warning --title="$UP_TITLE" --text="$UP_NO_CONNECTION_WARNING_LABEL" --text-align=center --button=gtk-ok:1 LAUNCHER_RUN_FUSION360 } @@ -150,7 +150,7 @@ function UP_NO_CONNECTION_WARNING { # The user will be asked if he wants to update or not. function UP_QUESTION { - yad --title="$UP_TITLE" --text="$UP_QUESTION_LABEL" --text-align=center --button=gtk-cancel:0 --button=gtk-ok:1 + yad --image dialog-question --title="$UP_TITLE" --text="$UP_QUESTION_LABEL" --text-align=center --button=gtk-no:0 --button=gtk-yes:1 answer=$? @@ -166,15 +166,8 @@ function UP_QUESTION { # A progress bar is displayed here. function UP_PROGRESS { - UP_PROGRESS_MAIN () { - echo "30" ; sleep 5 - echo "50" ; sleep 1 - echo "UP_PROGRESS_LABEL_2" ; sleep 5 - echo "100" ; sleep 3 - echo "UP_PROGRESS_LABEL_3" ; sleep 1 - } - UP_PROGRESS_MAIN | yad --title="$UP_TITLE" --progress --progress-text "$UP_PROGRESS_LABEL_1" --percentage=0 --button=gtk-cancel:0 --button=gtk-ok:1 + yad --image dialog-question --title="$UP_TITLE" --text "$UP_WANT_TO_CHECK_FOR_UPDATES" --text-align=center --button=gtk-no:0 --button=gtk-yes:1 ret=$? diff --git a/files/builds/stable-branch/locale/en-US/locale-en.sh b/files/builds/stable-branch/locale/en-US/locale-en.sh index 381a1c6..9de9819 100644 --- a/files/builds/stable-branch/locale/en-US/locale-en.sh +++ b/files/builds/stable-branch/locale/en-US/locale-en.sh @@ -129,16 +129,18 @@ SP_COMPLETED_CHECK_LABEL="Run Autodesk Fusion 360" UP_TITLE="Autodesk Fusion 360 for Linux - Launcher" UP_NO_UPDATE_INFO_LABEL="No newer version was found, so your Autodesk fusion 360 is up to date!" -UP_SKIP_INFO_LABEL="The update was skipped! Please update your Autodesk Fusion 360 version soon!" +UP_SKIP_INFO_LABEL="The update was skipped! Please consider checking for updates next time." UP_SKIP_UPDATE_QUESTION_LABEL="Are you sure you want to skip searching for an Autodesk Fusion 360 update?" UP_QUESTION_LABEL="A new version has been released! Do you want to update now?" UP_NO_CONNECTION_WARNING_LABEL="The connection to the server could not be established! Checking for new updates has been skipped! Please check your internet connection!" -UP_PROGRESS_LABEL_1="Connecting to the server ..." -UP_PROGRESS_LABEL_2="# Check all files .." -UP_PROGRESS_LABEL_3="# All files are checked!" +UP_WANT_TO_CHECK_FOR_UPDATES="Would you like to check for updates to Fusion360 before launching?" + +# UP_PROGRESS_LABEL_1="Connecting to the server ..." +# UP_PROGRESS_LABEL_2="# Check all files .." +# UP_PROGRESS_LABEL_3="# All files are checked!" UP_INSTALL_UPDATE_PROGRESS_LABEL="Autodesk Fusion 360 will be updated to a newer version ..." ###############################################################################################################################################################