Skip to content

Commit 192aac2

Browse files
committed
Removed Next button on Red Hat login page
1 parent 29f1abb commit 192aac2

1 file changed

Lines changed: 37 additions & 6 deletions

File tree

windows/developer_platform_installer.iss

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ BackSolid=yes
3232
DisableWelcomePage=yes
3333
DisableDirPage=no
3434
DisableReadyPage=no
35+
ExtraDiskSpaceRequired=1048576
3536

3637
[Files]
3738

@@ -54,7 +55,7 @@ type
5455
5556
var
5657
// Page IDs
57-
AuthPageID, ComponentPageID, DownloadPageID, GetStartedPageID : Integer;
58+
AuthPageID, ComponentPageID, DownloadPageID, GetStartedPageID, InstallPageID : Integer;
5859
5960
AuthLabel: TNewStaticText;
6061
@@ -102,8 +103,8 @@ begin
102103
// Display the 'authentication successful' message
103104
AuthLabel.Visible := IsAuthenticated;
104105
105-
// Enable the 'Next' button
106-
Wizardform.NextButton.Enabled := IsAuthenticated;
106+
// Simulate a click of the Next button
107+
WizardForm.NextButton.OnClick(nil);
107108
end;
108109
109110
procedure ForgotLabelOnClick(Sender: TObject);
@@ -559,6 +560,17 @@ begin
559560
Result := IDPForm.Page.ID;
560561
end;
561562
563+
procedure CustomWpInstallingPage;
564+
begin
565+
InstallPageID := CreateCustomPage(wpReady, '', '');
566+
567+
568+
// Render the page
569+
570+
InstallPage.Surface.Show;
571+
InstallPage.Surface.Update;
572+
end;
573+
562574
procedure SelectBreadcrumb(Index: Integer);
563575
var
564576
I: Integer;
@@ -596,7 +608,7 @@ begin
596608
if (CurPageID = AuthPageID) then
597609
begin
598610
SelectBreadcrumb(1);
599-
WizardForm.NextButton.Enabled := IsAuthenticated;
611+
WizardForm.NextButton.Visible := False;
600612
end else if (CurPageID = ComponentPageID) then
601613
begin
602614
SelectBreadcrumb(2);
@@ -610,6 +622,23 @@ begin
610622
WizardForm.NextButton.Visible := False;
611623
WizardForm.BackButton.Visible := False;
612624
end;
625+
626+
if (CurPageID = wpInstalling) then
627+
begin
628+
CustomWpInstallingPage();
629+
end;
630+
end;
631+
632+
procedure CurStepChanged(CurStep: TSetupStep);
633+
var
634+
ErrorCode: Integer;
635+
begin
636+
if CurStep = ssInstall then
637+
begin
638+
ShellExec('', 'msiexec', ExpandConstant('/i {tmp}\zulu1.8.0_51-8.8.0.3-win64.msi /passive /norestart /log {app}\cache\zulu_install_log.txt'),
639+
'', SW_SHOW, ewNoWait, ErrorCode);
640+
end;
641+
613642
end;
614643
615644
procedure CreateBreadcrumbLabel(Index: Integer; Caption: String);
@@ -707,12 +736,14 @@ begin
707736
idpSetOption('DetailsButton', '0');
708737
709738
idpSetOption('Referer', 'http://www.azulsystems.com/products/zulu/downloads');
710-
idpAddFile('http://cdn.azulsystems.com/zulu/2015-07-8.8-bin/zulu1.8.0_51-8.8.0.3-win64.msi', 'Zulu OpenJDK');
739+
idpAddFile('http://cdn.azulsystems.com/zulu/2015-07-8.8-bin/zulu1.8.0_51-8.8.0.3-win64.msi', ExpandConstant('{tmp}\zulu1.8.0_51-8.8.0.3-win64.msi'));
711740
712741
//idpAddFile('http://download.virtualbox.org/virtualbox/5.0.2/VirtualBox-5.0.2-102096-Win.exe', 'VirtualBox');
713742
//idpAddFile('https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.4.msi', 'Vagrant');
714743
715-
//idpDownloadAfter(wpWelcome);
744+
idpDownloadAfter(ComponentPageID);
745+
746+
716747
717748
DownloadPageID := createDownloadForm(ComponentPageID);
718749

0 commit comments

Comments
 (0)