From 0fffc2575fbeae5405f06711b42539e64d8f7ed1 Mon Sep 17 00:00:00 2001 From: AbhaySingh004 Date: Sun, 5 Feb 2023 15:30:51 +0530 Subject: [PATCH 1/6] Builder-installer.iss modified to show install button in wizard form instead of next button --- contrib/windows/build-installer.iss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/windows/build-installer.iss b/contrib/windows/build-installer.iss index 4f5f0259d2f2c..8a6505526e9b0 100644 --- a/contrib/windows/build-installer.iss +++ b/contrib/windows/build-installer.iss @@ -147,6 +147,12 @@ end; procedure CurPageChanged(CurPageID: Integer); begin + ; Fixing bug in git Issue #48521 + if CurPageID = wpSelectProgramGroup then + WizardForm.NextButton.Caption := SetupMessage(msgButtonInstall) + else + WizardForm.NextButton.Caption := SetupMessage(msgButtonNext); + case CurPageID of wpWelcome: WizardForm.Color := WizardForm.WelcomePage.Color; wpFinished: WizardForm.Color := WizardForm.FinishedPage.Color; From 6ea92b45ddc04be453312a3e7e57c8e4be84fd74 Mon Sep 17 00:00:00 2001 From: AbhaySingh004 Date: Sun, 5 Feb 2023 18:37:30 +0530 Subject: [PATCH 2/6] build-installer.iss modified the comments --- contrib/windows/build-installer.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/windows/build-installer.iss b/contrib/windows/build-installer.iss index 8a6505526e9b0..67ba4d7bcb3ef 100644 --- a/contrib/windows/build-installer.iss +++ b/contrib/windows/build-installer.iss @@ -147,7 +147,7 @@ end; procedure CurPageChanged(CurPageID: Integer); begin - ; Fixing bug in git Issue #48521 + ; change button text from "next" to "install" when ReadyPage is disabled. if CurPageID = wpSelectProgramGroup then WizardForm.NextButton.Caption := SetupMessage(msgButtonInstall) else From 253e825ff1b2c318796e1c23640d868f22f3972c Mon Sep 17 00:00:00 2001 From: AbhaySingh004 <74596419+AbhaySingh004@users.noreply.github.com> Date: Sun, 5 Feb 2023 19:56:41 +0530 Subject: [PATCH 3/6] Update contrib/windows/build-installer.iss Co-authored-by: woclass --- contrib/windows/build-installer.iss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/windows/build-installer.iss b/contrib/windows/build-installer.iss index 67ba4d7bcb3ef..9f4f06747bba0 100644 --- a/contrib/windows/build-installer.iss +++ b/contrib/windows/build-installer.iss @@ -156,6 +156,8 @@ begin case CurPageID of wpWelcome: WizardForm.Color := WizardForm.WelcomePage.Color; wpFinished: WizardForm.Color := WizardForm.FinishedPage.Color; + // change button text from "next" to "install" when ReadyPage is disabled. + wpSelectTasks: WizardForm.NextButton.Caption := SetupMessage(msgButtonInstall); else WizardForm.Color := WizardForm.InnerPage.Color; end; From 4cfa0fc927620954b78a25134c1a23484c377b3b Mon Sep 17 00:00:00 2001 From: AbhaySingh004 Date: Sun, 5 Feb 2023 20:12:46 +0530 Subject: [PATCH 4/6] build-installer.iss modified overiding the finish page bug removed --- contrib/windows/build-installer.iss | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/contrib/windows/build-installer.iss b/contrib/windows/build-installer.iss index 67ba4d7bcb3ef..345100cf8c0b4 100644 --- a/contrib/windows/build-installer.iss +++ b/contrib/windows/build-installer.iss @@ -145,17 +145,15 @@ begin end; end; + procedure CurPageChanged(CurPageID: Integer); begin - ; change button text from "next" to "install" when ReadyPage is disabled. - if CurPageID = wpSelectProgramGroup then - WizardForm.NextButton.Caption := SetupMessage(msgButtonInstall) - else - WizardForm.NextButton.Caption := SetupMessage(msgButtonNext); - case CurPageID of wpWelcome: WizardForm.Color := WizardForm.WelcomePage.Color; wpFinished: WizardForm.Color := WizardForm.FinishedPage.Color; + + ; change button text from "next" to "install" when ReadyPage is disabled. + wpSelectTasks: WizardForm.NextButton.Caption := SetupMessage(msgButtonInstall); else WizardForm.Color := WizardForm.InnerPage.Color; end; From a62d7bbf2112f6afed6ca25bea89f5379cdba2ee Mon Sep 17 00:00:00 2001 From: AbhaySingh004 Date: Sun, 5 Feb 2023 20:55:08 +0530 Subject: [PATCH 5/6] modified builder-installer.iss with removing if-else block --- contrib/windows/build-installer.iss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/windows/build-installer.iss b/contrib/windows/build-installer.iss index 345100cf8c0b4..e99d8c72f65ac 100644 --- a/contrib/windows/build-installer.iss +++ b/contrib/windows/build-installer.iss @@ -151,8 +151,8 @@ begin case CurPageID of wpWelcome: WizardForm.Color := WizardForm.WelcomePage.Color; wpFinished: WizardForm.Color := WizardForm.FinishedPage.Color; - - ; change button text from "next" to "install" when ReadyPage is disabled. + + ;change button text from "next" to "install" when ReadyPage is disabled. wpSelectTasks: WizardForm.NextButton.Caption := SetupMessage(msgButtonInstall); else WizardForm.Color := WizardForm.InnerPage.Color; From bba0a1e5d25b73a31b87f7bd308a7484e167d4e1 Mon Sep 17 00:00:00 2001 From: AbhaySingh004 Date: Mon, 6 Feb 2023 20:55:08 +0530 Subject: [PATCH 6/6] modified builder-installer.iss correcting the comment with right syntax --- contrib/windows/build-installer.iss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/windows/build-installer.iss b/contrib/windows/build-installer.iss index e99d8c72f65ac..a63cf853d4373 100644 --- a/contrib/windows/build-installer.iss +++ b/contrib/windows/build-installer.iss @@ -145,14 +145,13 @@ begin end; end; - procedure CurPageChanged(CurPageID: Integer); begin case CurPageID of wpWelcome: WizardForm.Color := WizardForm.WelcomePage.Color; wpFinished: WizardForm.Color := WizardForm.FinishedPage.Color; - ;change button text from "next" to "install" when ReadyPage is disabled. + //change button text from "next" to "install" when ReadyPage is disabled. wpSelectTasks: WizardForm.NextButton.Caption := SetupMessage(msgButtonInstall); else WizardForm.Color := WizardForm.InnerPage.Color;