Kaynağa Gözat

Rename WizModernImage to WizClassicImage. The compiler still accepts the old name but it recommend to change or remove the directive.

Martijn Laan 4 yıl önce
ebeveyn
işleme
123a7fc6a2

+ 2 - 2
Examples/CodeClasses.iss

@@ -19,7 +19,7 @@ PrivilegesRequired=lowest
 ;DialogFontSize=12
 
 [Files]
-Source: compiler:WizModernSmallImage.bmp; Flags: dontcopy
+Source: compiler:WizClassicSmallImage.bmp; Flags: dontcopy
 
 [Code]
 procedure ButtonOnClick(Sender: TObject);
@@ -313,7 +313,7 @@ begin
 
   Page := CreateCustomPage(Page.ID, 'Custom wizard page controls', 'TBitmapImage');
 
-  BitmapFileName := ExpandConstant('{tmp}\WizModernSmallImage.bmp');
+  BitmapFileName := ExpandConstant('{tmp}\WizClassicSmallImage.bmp');
   ExtractTemporaryFile(ExtractFileName(BitmapFileName));
 
   BitmapImage := TBitmapImage.Create(Page);

+ 0 - 0
Files/WizModernImage-IS.bmp → Files/WizClassicImage-IS.bmp


+ 0 - 0
Files/WizModernImage.bmp → Files/WizClassicImage.bmp


+ 0 - 0
Files/WizModernSmallImage-IS.bmp → Files/WizClassicSmallImage-IS.bmp


+ 0 - 0
Files/WizModernSmallImage.bmp → Files/WizClassicSmallImage.bmp


+ 2 - 2
ISHelp/isetup.xml

@@ -4825,7 +4825,7 @@ DiskSliceSize=1457664
 <tr><td>250%</td><td>410x797</td></tr>
 </table>
 <p>If this directive is not specified or is blank, built-in wizard images supporting multiple DPI settings will be used.</p>
-<p>To use the old default wizard images set this directive to <tt>compiler:WIZMODERNIMAGE.BMP</tt>.</p>
+<p>To use the old default wizard images set this directive to <tt>compiler:WizClassicImage.bmp</tt>.</p>
 <example><pre>WizardImageFile=myimage.bmp,myimage2.bmp</pre></example>
 <p><b>See also:</b><br/>
 <link topic="setup_wizardsmallimagefile">WizardSmallImageFile</link><br/>
@@ -4850,7 +4850,7 @@ DiskSliceSize=1457664
 <tr><td>250%</td><td>138x140</td></tr>
 </table>
 <p>If this directive is not specified or is blank, built-in wizard images supporting multiple DPI settings will be used.</p>
-<p>To use the old default wizard images set this directive to <tt>compiler:WIZMODERNSMALLIMAGE.BMP</tt>.</p>
+<p>To use the old default wizard images set this directive to <tt>compiler:WizClassicSmallImage.bmp</tt>.</p>
 <example><pre>WizardSmallImageFile=mysmallimage.bmp,mysmallimage2.bmp</pre></example>
 <p><b>See also:</b><br/>
 <link topic="setup_wizardimagefile">WizardImageFile</link><br/>

+ 4 - 3
Projects/CompMsgs.pas

@@ -2,7 +2,7 @@ unit CompMsgs;
 
 {
   Inno Setup
-  Copyright (C) 1997-2020 Jordan Russell
+  Copyright (C) 1997-2021 Jordan Russell
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
 
@@ -202,6 +202,7 @@ const
   SCompilerOutputBaseFileNameSetup = 'Setting the [Setup] section directive "OutputBaseFileName" to "setup" is not recommended: all executables named "setup.exe" are shimmed by Windows application compatibility to load additional DLLs, such as version.dll.' + ' These DLLs are loaded unsafely by Windows and can be hijacked. Use a different name, for example "mysetup".';
   SCompilerRemoveManifestDllHijackProtection = 'Setting the [Setup] section directive "MinVersion" below %s is not recommended: Windows Vista doesn''t support some of Setup''s security measures against potential DLL preloading attacks so these have been' + ' removed by the compiler making your installer less secure on all versions of Windows.';
   SCompilerDidntRemoveManifestDllHijackProtection = 'Setup will not run on Windows Vista: MinVersion must be below %s.';
+  SCompilerWizImageRenamed = 'Wizard image "%s" has been renamed. Use "%s" instead or consider removing the directive to use modern built-in wizard images.';
 
   { Signing }
   SCompilerSignatureNeeded = 'Signed uninstaller mode is enabled. Using ' +
@@ -217,9 +218,9 @@ const
     SNewLine2 + '%s' + SNewLine2 + 'differ unexpectedly from the original ' +
     'file';
   SCompilerNoSetupLdrSignError = 'The SignTool and SignedUninstaller directives may not be set when UseSetupLdr is set to "no"';
-  SCompilerSignToolFileNameSequenceNotFound = 'Unable to run Sign Tool %s: $f sequence is missing.'; 
+  SCompilerSignToolFileNameSequenceNotFound = 'Unable to run Sign Tool %s: $f sequence is missing.';
   SCompilerSignToolCreateProcessFailed = 'Failed to execute Sign Tool command.' +
-    SNewLine2 + 'Error %d: %s'; 
+    SNewLine2 + 'Error %d: %s';
   SCompilerSignToolNonZeroExitCode = 'Sign Tool command failed with exit code 0x%x';
   SCompilerSignToolSucceededButNoSignature = 'The Sign Tool command returned an ' +
     'exit code of 0, but the file does not have a digital signature';

+ 12 - 4
Projects/Compile.pas

@@ -8720,15 +8720,23 @@ begin
     { Read wizard image }
     LineNumber := SetupDirectiveLines[ssWizardImageFile];
     AddStatus(Format(SCompilerStatusReadingFile, ['WizardImageFile']));
-    if WizardImageFile <> '' then
+    if WizardImageFile <> '' then begin
+      if SameText(WizardImageFile, 'compiler:WizModernImage.bmp') then begin
+        WarningsList.Add(Format(SCompilerWizImageRenamed, [WizardImageFile, 'compiler:WizClassicImage.bmp']));
+        WizardImageFile := 'compiler:WizClassicImage.bmp';
+      end;
       WizardImages := CreateMemoryStreamsFromFiles('WizardImageFile', WizardImageFile)
-    else
+    end else
       WizardImages := CreateMemoryStreamsFromResources(['WizardImage'], ['100', '150']);
     LineNumber := SetupDirectiveLines[ssWizardSmallImageFile];
     AddStatus(Format(SCompilerStatusReadingFile, ['WizardSmallImageFile']));
-    if WizardSmallImageFile <> '' then
+    if WizardSmallImageFile <> '' then begin
+      if SameText(WizardSmallImageFile, 'compiler:WizModernSmallImage.bmp') then begin
+        WarningsList.Add(Format(SCompilerWizImageRenamed, [WizardSmallImageFile, 'compiler:WizClassicSmallImage.bmp']));
+        WizardSmallImageFile := 'compiler:WizClassicSmallImage.bmp';
+      end;
       WizardSmallImages := CreateMemoryStreamsFromFiles('WizardSmallImage', WizardSmallImageFile)
-    else
+    end else
       WizardSmallImages := CreateMemoryStreamsFromResources(['WizardSmallImage'], ['100', '125', '150', '175', '200', '225', '250']);
     LineNumber := 0;
 

+ 9 - 4
setup.iss

@@ -106,6 +106,11 @@ Type: files; Name: "{app}\Examples\IsDonateAndMail.iss"
 Type: files; Name: "{app}\Examples\IsDonate.bmp"
 Type: files; Name: "{app}\Examples\IsMail.bmp"
 Type: files; Name: "{app}\Examples\IsPortable.iss"
+; Removed old/renamed wizard images
+Type: files; Name: "{app}\WizModernImage.bmp"
+Type: files; Name: "{app}\WizModernImage-IS.bmp"
+Type: files; Name: "{app}\WizModernSmallImage.bmp"
+Type: files; Name: "{app}\WizModernSmallImage-IS.bmp"
 
 [Files]
 Source: "license.txt"; DestDir: "{app}"; Flags: ignoreversion touch
@@ -125,10 +130,10 @@ Source: "files\SetupLdr.e32"; DestDir: "{app}"; Flags: ignoreversion touch
 Source: "files\Default.isl"; DestDir: "{app}"; Flags: ignoreversion touch
 Source: "files\Languages\*.isl"; DestDir: "{app}\Languages"; Flags: ignoreversion touch
 Source: "files\SetupClassicIcon.ico"; DestDir: "{app}"; Flags: ignoreversion touch
-Source: "files\WizModernImage.bmp"; DestDir: "{app}"; Flags: ignoreversion touch
-Source: "files\WizModernImage-IS.bmp"; DestDir: "{app}"; Flags: ignoreversion touch
-Source: "files\WizModernSmallImage.bmp"; DestDir: "{app}"; Flags: ignoreversion touch
-Source: "files\WizModernSmallImage-IS.bmp"; DestDir: "{app}"; Flags: ignoreversion touch
+Source: "files\WizClassicImage.bmp"; DestDir: "{app}"; Flags: ignoreversion touch
+Source: "files\WizClassicImage-IS.bmp"; DestDir: "{app}"; Flags: ignoreversion touch
+Source: "files\WizClassicSmallImage.bmp"; DestDir: "{app}"; Flags: ignoreversion touch
+Source: "files\WizClassicSmallImage-IS.bmp"; DestDir: "{app}"; Flags: ignoreversion touch
 Source: "files\iszlib.dll"; DestDir: "{app}"; Flags: ignoreversion signonce touch
 Source: "files\isunzlib.dll"; DestDir: "{app}"; Flags: ignoreversion signonce touch
 Source: "files\isbzip.dll"; DestDir: "{app}"; Flags: ignoreversion signonce touch

+ 1 - 1
whatsnew.htm

@@ -43,7 +43,7 @@ For conditions of distribution and use, see <a href="https://jrsoftware.org/file
 <ul>
   <li>Updated all Compiler IDE's toolbar icons and the wizard images used by the Compiler IDE's New Script Wizard wizard.</li>
   <li>Updated the default application icon used by Setup and Uninstall if [Setup] section directive <tt>SetupIconFile</tt> is not set. To use the old icon again set <tt>SetupIconFile</tt> to <tt>compiler:SetupClassicIcon.ico</tt>.</li>
-  <li>[Setup] section directives <tt>WizardImageFile</tt> and <tt>WizardSmallImageFile</tt> now default to a blank value which makes Setup use new built-in wizard images.  To use the old wizard images again set <tt>WizardImageFile</tt> and <tt>WizardSmallImageFile</tt> to <tt>compiler:WizModernImage.bmp</tt> and <tt>compiler:WizModernSmallImage.bmp</tt> respectively.</li>
+  <li>[Setup] section directives <tt>WizardImageFile</tt> and <tt>WizardSmallImageFile</tt> now default to a blank value which makes Setup use new built-in wizard images.  To use the old wizard images again set <tt>WizardImageFile</tt> and <tt>WizardSmallImageFile</tt> to <tt>compiler:WizClassicImage.bmp</tt> and <tt>compiler:WizClassicSmallImage.bmp</tt> respectively.</li>
   <li>Updated Uninstall's default small wizard image if [Setup] section directive <tt>SetupIconFile</tt> is not set. Before it would use Setup's default application icon in this case.</li>
   <li>Updated the folder, group, and stop icons used by Setup's <i>Select Destination Location</i>, <i>Select Start Menu Folder</i>, and <i>Preparing to Install</i> wizard pages.</li>
   <li>Updated the disk icon used by Setup's <i>Setup Needs the Next Disk</i> form.</li>