Browse Source

Actually, make previous the new default outside the wizard as well. #168.

Martijn Laan 10 years ago
parent
commit
8cd53350e0
3 changed files with 8 additions and 9 deletions
  1. 4 5
      Projects/CompWizard.pas
  2. 3 3
      Projects/Compile.pas
  3. 1 1
      whatsnew.htm

+ 4 - 5
Projects/CompWizard.pas

@@ -823,8 +823,6 @@ end;
 { --- }
 
 procedure TWizardForm.GenerateScript;
-const
-  DisablePage: array [Boolean] of String = ('auto', 'yes');
 var
   Script, ISPP, Setup, Languages, Tasks, Files, INI, Icons, Run, UninstallDelete: String;
   WizardFile: PWizardFile;
@@ -900,7 +898,8 @@ begin
         Setup := Setup + 'DefaultDirName=' + AddBackslash(AppRootDirEdit.Text) + AppDirNameEdit.Text + SNewLine
       else
         Setup := Setup + 'DefaultDirName=' + AddBackslash(AppRootDirs[AppRootDirComboBox.ItemIndex].Constant) + AppDirNameEdit.Text + SNewLine;
-      Setup := Setup + 'DisableDirPage=' + DisablePage[not NotDisableDirPageCheck.Checked] + SNewLine;
+      if not NotDisableDirPageCheck.Checked then
+        Setup := Setup + 'DisableDirPage=yes' + SNewLine;
     end else begin
       Setup := Setup + 'CreateAppDir=no' + SNewLine;
     end;
@@ -931,7 +930,8 @@ begin
       Setup := Setup + 'DefaultGroupName=' + AppGroupNameEdit.Text + SNewLine;
       if not NoAppExeCheck.Checked then
         Icons := Icons + 'Name: "{group}\' + AppNameEdit.Text + '"; Filename: "{app}\' + AppExeName + '"' + SNewLine;
-      Setup := Setup + 'DisableProgramGroupPage=' + DisablePage[not NotDisableProgramGroupPageCheck.Checked] + SNewLine;
+      if not NotDisableProgramGroupPageCheck.Checked then
+        Setup := Setup + 'DisableProgramGroupPage=yes' + SNewLine;
       if AllowNoIconsCheck.Checked and NotDisableProgramGroupPageCheck.Checked then
         Setup := Setup + 'AllowNoIcons=yes' + SNewLine;
       if CreateURLIconCheck.Enabled and CreateURLIconCheck.Checked then
@@ -987,7 +987,6 @@ begin
     end;
 
     { Other }
-    Setup := Setup + 'DisableWelcomePage=yes' + SNewLine;
     Setup := Setup + 'Compression=lzma' + SNewLine;
     Setup := Setup + 'SolidCompression=yes' + SNewLine;
 

+ 3 - 3
Projects/Compile.pas

@@ -8296,15 +8296,15 @@ begin
       shAllowUNCPath, shUsePreviousUserInfo, shRestartIfNeededByRun,
       shAllowCancelDuringInstall, shWizardImageStretch, shAppendDefaultDirName,
       shAppendDefaultGroupName, shUsePreviousLanguage, shCloseApplications,
-      shRestartApplications, shAllowNetworkDrive];
+      shRestartApplications, shAllowNetworkDrive, shDisableWelcomePage];
     SetupHeader.PrivilegesRequired := prAdmin;
     SetupHeader.UninstallFilesDir := '{app}';
     SetupHeader.DefaultUserInfoName := '{sysuserinfoname}';
     SetupHeader.DefaultUserInfoOrg := '{sysuserinfoorg}';
     SetupHeader.BackColor := clBlue;
     SetupHeader.BackColor2 := clBlack;
-    SetupHeader.DisableDirPage := dpNo;
-    SetupHeader.DisableProgramGroupPage := dpNo;
+    SetupHeader.DisableDirPage := dpAuto;
+    SetupHeader.DisableProgramGroupPage := dpAuto;
     SetupHeader.CreateUninstallRegKey := 'yes';
     SetupHeader.Uninstallable := 'yes';
     BackSolid := False;

+ 1 - 1
whatsnew.htm

@@ -28,7 +28,7 @@ For conditions of distribution and use, see <a href="http://www.jrsoftware.org/f
 
 <p><a name="5.5.7"></a><span class="ver">5.5.7-dev </span><span class="date">(?)</span></p>
 <ul>
-<li>As recommended by Microsoft's desktop applications guideline, the Compiler IDE's New Script Wizard now sets <tt>DisableWelcomePage</tt> to <tt>yes</tt> and, if applicable, sets <tt>DisableDirPage</tt> and <tt>DisableProgramGroupPage</tt> to <tt>auto</tt>.</li>
+<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>none</tt>.</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>
 <li>Pascal Scripting change: function <tt>RegQueryBinaryValue</tt> can now be used to query any type of registry value and not just <tt>REG_BINARY</tt>-type values.</li>
 <li>The Setup and Uninstall programs are now marked as DEP and ASLR compatible.</li>