Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch the "Next" button's label to "Install" on the last wizard page before installation #104

Merged
merged 2 commits into from
Mar 25, 2016
Merged

Switch the "Next" button's label to "Install" on the last wizard page before installation #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
320ef32
installer: introduce a --skip-files option for debugging
dscho Mar 21, 2016
3437da8
installer: change the "Next" label to "Install" just before installing
dscho Mar 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions installer/install.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ var
ProcessesPage:TWizardPage;
ProcessesListBox:TListBox;
ProcessesRefresh,ContinueButton:TButton;
PageIDBeforeInstall:Integer;
#ifdef DEBUG_WIZARD_PAGE
DebugWizardPage:Integer;
#endif
Expand Down Expand Up @@ -1112,6 +1113,8 @@ begin
// This button is only used by the uninstaller.
ContinueButton:=NIL;

PageIDBeforeInstall:=ExtraOptionsPage.ID;

#ifdef DEBUG_WIZARD_PAGE
DebugWizardPage:={#DEBUG_WIZARD_PAGE}.ID;
#endif
Expand Down Expand Up @@ -1147,9 +1150,14 @@ begin
// This will be checked later again when the user clicks "Next".
WizardForm.DirEdit.Text:=ExpandConstant('{userpf}\{#APP_NAME}');
end;
end else if CurPageID=PageIDBeforeInstall then begin
RefreshProcessList(NIL);
if GetArrayLength(Processes)=0 then
WizardForm.NextButton.Caption:=SetupMessage(msgButtonInstall);
end else if (ProcessesPage<>NIL) and (CurPageID=ProcessesPage.ID) then begin
// Show the "Refresh" button only on the processes page.
ProcessesRefresh.Show;
WizardForm.NextButton.Caption:=SetupMessage(msgButtonInstall);
end else begin
ProcessesRefresh.Hide;
end;
Expand Down Expand Up @@ -1407,6 +1415,8 @@ begin

// Load the built-ins from a text file.
FileName:=AppDir+'\{#MINGW_BITNESS}\{#APP_BUILTINS}';
if not FileExists(FileName) then
Exit; // testing...
if LoadStringsFromFile(FileName,BuiltIns) then begin
Count:=GetArrayLength(BuiltIns)-1;

Expand Down
3 changes: 3 additions & 0 deletions installer/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ do
-f|--force)
force=t
;;
--skip-files)
skip_files=t
;;
--debug-wizard-page=*)
test_installer=t
inno_defines="$(printf "%s\n%s\n%s" "$inno_defines" \
Expand Down