Commit 78d57435 authored by Tim Peters's avatar Tim Peters

More installer bitmap repair.

parent 59449583
...@@ -10,6 +10,10 @@ DefaultGroupName=Zope <<VERSION>> ...@@ -10,6 +10,10 @@ DefaultGroupName=Zope <<VERSION>>
OutputBaseFilename=Zope-<<VERSION>>-win32 OutputBaseFilename=Zope-<<VERSION>>-win32
WizardImageFile=<<MAKEFILEDIR>>\etc\zlogo_left.bmp WizardImageFile=<<MAKEFILEDIR>>\etc\zlogo_left.bmp
WizardSmallImageFile=<<MAKEFILEDIR>>\etc\zlogo_top.bmp WizardSmallImageFile=<<MAKEFILEDIR>>\etc\zlogo_top.bmp
; Starting w/ Inno 4.1.3, Inno decided to stretch the .bmp files in various
; ways. Hard to know why, but it looks terrible on my pretty vanilla box.
; Luckily, 4.1.3 also added WizardImageStretch to turn that off.
WizardImageStretch=no
SolidCompression=yes SolidCompression=yes
SourceDir=. SourceDir=.
...@@ -69,7 +73,7 @@ var ...@@ -69,7 +73,7 @@ var
PasswordChars : array of char; PasswordChars : array of char;
DataDirValues: array of String; DataDirValues: array of String;
Password : string; Password : string;
DataDir : String; DataDir : String;
...@@ -87,7 +91,7 @@ begin ...@@ -87,7 +91,7 @@ begin
{ set up data dir data structures } { set up data dir data structures }
SetArrayLength(DataDirValues, 1); SetArrayLength(DataDirValues, 1);
DataDir := ''; DataDir := '';
Result := True; Result := True;
end; end;
...@@ -106,9 +110,9 @@ begin ...@@ -106,9 +110,9 @@ begin
if DataDirValues[0] <> '' then DataDirValues[0]:= ''; if DataDirValues[0] <> '' then DataDirValues[0]:= '';
{ Ask for a dir until the user has approved one or clicked Back or Cancel } { Ask for a dir until the user has approved one or clicked Back or Cancel }
Next:= InputDir(False, DataDirValues[0], DataDir); Next:= InputDir(False, DataDirValues[0], DataDir);
if Next and FileOrDirExists(DataDir) then DirOk := False; if Next and FileOrDirExists(DataDir) then DirOk := False;
while Next and not DirOk do begin while Next and not DirOk do begin
...@@ -133,7 +137,7 @@ begin ...@@ -133,7 +137,7 @@ begin
ScriptDlgPageSetSubCaption1('Specify administrator password'); ScriptDlgPageSetSubCaption1('Specify administrator password');
ScriptDlgPageSetSubCaption2('The login name for your Zope administrator account is "admin". When you first connect to the Zope management interface, you will need to login using the "admin" username and the password you specify below.'); ScriptDlgPageSetSubCaption2('The login name for your Zope administrator account is "admin". When you first connect to the Zope management interface, you will need to login using the "admin" username and the password you specify below.');
Next := InputQueryArrayEx(PasswordPrompts, PasswordChars, PasswordValues); Next := InputQueryArrayEx(PasswordPrompts, PasswordChars, PasswordValues);
while Next and (PasswordValues[0] = '') do begin while Next and (PasswordValues[0] = '') do begin
MsgBox('You must enter an administrator password', mbError, MB_OK) MsgBox('You must enter an administrator password', mbError, MB_OK)
Next := InputQueryArrayEx(PasswordPrompts, PasswordChars, PasswordValues); Next := InputQueryArrayEx(PasswordPrompts, PasswordChars, PasswordValues);
...@@ -172,7 +176,7 @@ begin ...@@ -172,7 +176,7 @@ begin
if ( (not BackClicked and (CurPage = wpSelectTasks)) or (BackClicked and (CurPage = wpReady)) ) if ( (not BackClicked and (CurPage = wpSelectTasks)) or (BackClicked and (CurPage = wpReady)) )
and DoInstanceHome() then begin and DoInstanceHome() then begin
if not BackClicked then CurSubPage:=0 else CurSubPage:=1; if not BackClicked then CurSubPage:=0 else CurSubPage:=1;
ScriptDlgPageOpen(); ScriptDlgPageOpen();
ScriptDlgPageSetCaption('Instance Setup'); ScriptDlgPageSetCaption('Instance Setup');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment