The WizardImageBackColor [Setup] section directive is now deprecated and ignored. Any unused space around the wizard image is now filled with the standard window color (usually white). #180.

This commit is contained in:
Martijn Laan 2015-10-13 15:21:51 +02:00
parent c7b5160a41
commit ee1e25f0e7
7 changed files with 8 additions and 16 deletions

View File

@ -4213,14 +4213,7 @@ begin
else
Invalid;
end;
ssWizardImageBackColor: begin
try
SetupHeader.WizardImageBackColor := StringToColor(Value);
except
Invalid;
end;
end;
ssWizardSmallImageBackColor: begin
ssWizardImageBackColor, ssWizardSmallImageBackColor: begin
WarningsList.Add(Format(SCompilerEntryObsolete, ['Setup', KeyName]));
end;
ssWizardImageStretch: begin
@ -8325,7 +8318,6 @@ begin
SetupHeader.CreateUninstallRegKey := 'yes';
SetupHeader.Uninstallable := 'yes';
BackSolid := False;
SetupHeader.WizardImageBackColor := $400000;
WizardImageFile := 'compiler:WIZMODERNIMAGE.BMP';
WizardSmallImageFile := 'compiler:WIZMODERNSMALLIMAGE.BMP';
DefaultDialogFontName := 'Tahoma';

View File

@ -99,7 +99,7 @@ type
NumRegistryEntries, NumInstallDeleteEntries, NumUninstallDeleteEntries,
NumRunEntries, NumUninstallRunEntries: Integer;
MinVersion, OnlyBelowVersion: TSetupVersionData;
BackColor, BackColor2, WizardImageBackColor: Longint;
BackColor, BackColor2: Longint;
WizardImageAlphaFormat: (afIgnored, afDefined, afPremultiplied); // Must be same as Graphics.TAlphaFormat
PasswordHash: TSHA1Digest;
PasswordSalt: TSetupSalt;

Binary file not shown.

View File

@ -67,6 +67,7 @@ object WizardForm: TWizardForm
Top = 0
Width = 164
Height = 314
BackColor = clWindow
end
object WelcomeLabel2: TNewStaticText
Left = 176
@ -555,6 +556,7 @@ object WizardForm: TWizardForm
Height = 21
Min = 0
Max = 100
Style = npbstNormal
end
end
object InfoAfterPage: TNewNotebookPage
@ -628,6 +630,7 @@ object WizardForm: TWizardForm
Top = 0
Width = 164
Height = 314
BackColor = clWindow
end
object RunList: TNewCheckListBox
Left = 176

View File

@ -746,11 +746,9 @@ begin
BackButton.Left := X;
{ Initialize images }
WizardBitmapImage.BackColor := SetupHeader.WizardImageBackColor;
WizardBitmapImage.Bitmap := WizardImage;
WizardBitmapImage.Center := True;
WizardBitmapImage.Stretch := (shWizardImageStretch in SetupHeader.Options);
WizardBitmapImage2.BackColor := SetupHeader.WizardImageBackColor;
WizardBitmapImage2.Bitmap := WizardImage;
WizardBitmapImage2.Center := True;
WizardBitmapImage2.Stretch := (shWizardImageStretch in SetupHeader.Options);

View File

@ -1033,7 +1033,6 @@ DefaultGroupName=My Program
<li><link topic="setup_windowresizable">WindowResizable</link></li>
<li><link topic="setup_windowvisible">WindowVisible</link></li>
<li><link topic="setup_wizardimagealphaformat">WizardImageAlphaFormat</link></li>
<li><link topic="setup_wizardimagebackcolor">WizardImageBackColor</link></li>
<li><link topic="setup_wizardimagefile">WizardImageFile</link></li>
<li><link topic="setup_wizardimagestretch">WizardImageStretch</link></li>
<li><link topic="setup_wizardsmallimagefile">WizardSmallImageFile</link></li>
@ -1051,6 +1050,7 @@ DefaultGroupName=My Program
<li><link topic="setup_uninstalliconfile">UninstallIconFile</link></li>
<li><link topic="setup_uninstalliconname">UninstallIconName</link></li>
<li><link topic="setup_uninstallstyle">UninstallStyle</link></li>
<li><link topic="setup_wizardimagebackcolor">WizardImageBackColor</link></li>
<li><link topic="setup_wizardsmallimagebackcolor">WizardSmallImageBackColor</link></li>
<li><link topic="setup_wizardstyle">WizardStyle</link></li>
</ul>
@ -4485,10 +4485,8 @@ DiskSliceSize=1457664
</setuptopic>
<setuptopic directive="WizardImageBackColor">
<setupvalid>A value in the form of <tt>$<i>bbggrr</i></tt>, where <tt>rr</tt>, <tt>gg</tt>, and <tt>bb</tt> specify the two-digit intensities (in hexadecimal) for red, green, and blue respectively. Or it may be one of the following predefined color names: clBlack, clMaroon, clGreen, clOlive, clNavy, clPurple, clTeal, clGray, clSilver, clRed, clLime, clYellow, clBlue, clFuchsia, clAqua, clWhite.</setupvalid>
<setupdefault><tt>$400000</tt></setupdefault>
<body>
<p>This directive specifies the background color used to fill any unused space around the wizard bitmap (which is specified by <link topic="setup_wizardimagefile">WizardImageFile</link>). There can only be unused space if <link topic="setup_wizardimagestretch">WizardImageStretch</link> is set to <tt>no</tt>.</p>
<p><i>Obsolete in 5.5.7.</i> This directive formerly specified the background color used to fill any unused space around the wizard bitmap when <link topic="setup_wizardimagestretch">WizardImageStretch</link> was set to <tt>no</tt>. Now any unused space is filled with the standard window color (usually white). If you wish to create a colored border around the image, do so by modifying the bitmap itself.</p>
</body>
</setuptopic>

View File

@ -30,6 +30,7 @@ For conditions of distribution and use, see <a href="http://www.jrsoftware.org/f
<ul>
<li><b>Change in default behavior:</b> As recommended by Microsoft's desktop applications guideline, <tt>DisableWelcomePage</tt> now defaults to <tt>yes</tt>. Additionally <tt>DisableDirPage</tt> and <tt>DisableProgramGroupPage</tt> now default to <tt>auto</tt>. The defaults in all previous versions were <tt>no</tt>.</li>
<li>The Compiler IDE's New Script Wizard now offers to create a shortcut to the main executable in the common Start Menu Programs folder instead of creating a new Start Menu folder especially for the application. This option is enabled by default and is recommended by Microsoft unless you install a suite of applications rather than a single application.</li>
<li>The <tt>WizardImageBackColor</tt> [Setup] section directive is now deprecated and ignored. Any unused space around the wizard image is now filled with the standard window color (usually white).</li>
<li>[Setup] section directive <tt>CloseApplications</tt> can now be set to <tt>force</tt>. If it is, Setup will force close when closing applications. Use with care since this may cause the user to lose unsaved work.</li>
<li>Added new command line parameters supported by Setup: /FORCECLOSEAPPLICATIONS and /NOFORCECLOSEAPPLICATIONS. These can be used to override the <tt>CloseApplications</tt> directive.</li>
<li>The <tt>Attribs</tt> parameter of a [Files] or [Dir] entry may now also include <tt>notcontentindexed</tt> to specify that the file or directory is not to be indexed by the content indexing service.</li>