From 99a99ce71b8b5ed049107d6cf5c1115431e12d55 Mon Sep 17 00:00:00 2001 From: Cain Kilgore Date: Mon, 4 Sep 2017 21:14:26 +0100 Subject: [PATCH 1/7] WL 21513 - Update text in the "How to Quit The Sandbox" Prompt --- cmake/templates/NSIS.template.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index de79b49a74..8e05372f8f 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -964,7 +964,7 @@ SectionEnd ; the process is running, ask the user to close it MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \ - "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it and click Retry to continue." \ + "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it in the system tray and click Retry to continue." \ /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0 ; If the user decided to cancel, stop the current installer/uninstaller From e9f666d970488c1e755a31751144d88b90940177 Mon Sep 17 00:00:00 2001 From: Cain Kilgore Date: Wed, 6 Sep 2017 02:06:10 +0100 Subject: [PATCH 2/7] Made the system tray message specific to Sandbox only --- cmake/templates/NSIS.template.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index 8e05372f8f..cae2107521 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -963,9 +963,18 @@ SectionEnd ${If} $R0 == 0 ; the process is running, ask the user to close it + + ${If} $displayName == "Sandbox" MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \ "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it in the system tray and click Retry to continue." \ /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0 + ${EndIf} + + ${If} $displayName == "Interface" + MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \ + "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it and click Retry to continue." \ + /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0 + ${EndIf} ; If the user decided to cancel, stop the current installer/uninstaller Abort From 4d0df705a9a008176c91aecab19271c8141f80c2 Mon Sep 17 00:00:00 2001 From: Cain Kilgore Date: Wed, 6 Sep 2017 11:46:57 +0100 Subject: [PATCH 3/7] Forgot some {}'s --- cmake/templates/NSIS.template.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index cae2107521..86d52438c1 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -964,13 +964,13 @@ SectionEnd ; the process is running, ask the user to close it - ${If} $displayName == "Sandbox" + ${If} ${displayName} == "Sandbox" MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \ "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it in the system tray and click Retry to continue." \ /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0 ${EndIf} - ${If} $displayName == "Interface" + ${If} ${displayName} == "Interface" MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \ "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it and click Retry to continue." \ /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0 From 14e5cf31f220db9f0e04566f341d04cbd4bef6ac Mon Sep 17 00:00:00 2001 From: Cain Kilgore Date: Wed, 6 Sep 2017 12:42:17 +0100 Subject: [PATCH 4/7] Apparently I didn't need 'em --- cmake/templates/NSIS.template.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index 86d52438c1..cae2107521 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -964,13 +964,13 @@ SectionEnd ; the process is running, ask the user to close it - ${If} ${displayName} == "Sandbox" + ${If} $displayName == "Sandbox" MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \ "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it in the system tray and click Retry to continue." \ /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0 ${EndIf} - ${If} ${displayName} == "Interface" + ${If} $displayName == "Interface" MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \ "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it and click Retry to continue." \ /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0 From 2a6b5235426289bbd3c84219fc0f79fdf4e8e39e Mon Sep 17 00:00:00 2001 From: Cain Kilgore Date: Wed, 6 Sep 2017 13:09:43 +0100 Subject: [PATCH 5/7] Again --- cmake/templates/NSIS.template.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index cae2107521..a68659f254 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -964,13 +964,13 @@ SectionEnd ; the process is running, ask the user to close it - ${If} $displayName == "Sandbox" + ${If} "${displayName}" == "Sandbox" MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \ "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it in the system tray and click Retry to continue." \ /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0 ${EndIf} - ${If} $displayName == "Interface" + ${If} "${displayName}" == "Interface" MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \ "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it and click Retry to continue." \ /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0 From d429bd0b01b585b076470e1e090c7e5abb10103a Mon Sep 17 00:00:00 2001 From: Cain Kilgore Date: Wed, 6 Sep 2017 13:42:13 +0100 Subject: [PATCH 6/7] Changed the Interface text to say 'Task bar' instead of 'system tray' --- cmake/templates/NSIS.template.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index a68659f254..668270b9d3 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -972,7 +972,7 @@ SectionEnd ${If} "${displayName}" == "Interface" MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \ - "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it and click Retry to continue." \ + "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it in the task bar and click Retry to continue." \ /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0 ${EndIf} From 84f37b9663041a1e3b717c1c160fa07790ff4b56 Mon Sep 17 00:00:00 2001 From: Cain Kilgore Date: Thu, 7 Sep 2017 18:53:05 +0100 Subject: [PATCH 7/7] Changed string name --- cmake/templates/NSIS.template.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index 668270b9d3..e76a2d51fd 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -964,13 +964,13 @@ SectionEnd ; the process is running, ask the user to close it - ${If} "${displayName}" == "Sandbox" + ${If} "${displayName}" == "@CONSOLE_DISPLAY_NAME@" MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \ "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it in the system tray and click Retry to continue." \ /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0 ${EndIf} - ${If} "${displayName}" == "Interface" + ${If} "${displayName}" == "@INTERFACE_DISPLAY_NAME@" MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \ "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it in the task bar and click Retry to continue." \ /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0