6 жил өмнө · 8b4774db6c
--- a/ISHelp/isetup.xml
+++ b/ISHelp/isetup.xml
@@ -3205,7 +3205,7 @@ Filename: "{win}\MYPROG.INI"; Section: "InstallSettings"; Key: "InstallPath"; St
 
				 <li>The Exit Setup? message box.</li>

			
 
				 <li>The FileNotInDir2 message box displayed when Setup requires a new disk to be inserted and the disk was not found.</li>

			
 
				 <li>Any (error) message box displayed before Setup (or Uninstall) could read the command line parameters.</li>

			
 
				-<li>Any message box displayed by [Code] support function <tt>MsgBox</tt>.</li>

			
 
				+<li>Any task dialog or message box displayed by [Code] support functions <tt>TaskDialogMsgBox</tt> and <tt>MsgBox</tt>.</li>

			
 
				 </ul>

			
 
				 </dd>

			
 
				 

			
@@ -3964,7 +3964,7 @@ Name: portablemode; Description: "Portable Mode"</pre></example>
 
				 <body>

			
 
				 <p>Can be set to one or more overrides which allow the end user to override the script's default <link topic="setup_privilegesrequired">PrivilegesRequired</link> setting.</p>

			
 
				 <p>If override <tt>commandline</tt> is allowed then Setup will support two additional command line parameters to override the script's default <link topic="setup_privilegesrequired">PrivilegesRequired</link> setting: /ALLUSERS and /CURRENTUSER. See <link topic="setupcmdline" anchor="ALLUSERS">Setup Command Line Parameters</link> for more details.</p>

			
 
				-<p>If override <tt>dialog</tt> is allowed then Setup will ask the user to choose the install mode based on the script's default <link topic="setup_privilegesrequired">PrivilegesRequired</link> setting using a dialog. Allowing <tt>dialog</tt> automatically allows <tt>commandline</tt> and when one of the command line parameters is used then Setup will not ask the user.</p>

			
 
				+<p>If override <tt>dialog</tt> is allowed then Setup will ask the user to choose the install mode based on the script's default <link topic="setup_privilegesrequired">PrivilegesRequired</link> setting using a suppressible dialog. Allowing <tt>dialog</tt> automatically allows <tt>commandline</tt> and when one of the command line parameters is used then Setup will not ask the user.</p>

			
 
				 </body>

			
 
				 </setuptopic>

			
 
				 

			
--- a/ISHelp/isxfunc.xml
+++ b/ISHelp/isxfunc.xml
@@ -2367,9 +2367,9 @@ end;</pre></example>
 
				 <p>If a task dialog is displayed:<br />

			
 
				 <tt>Instruction</tt> specifies the instruction to display.<br />

			
 
				 <tt>TaskDialogText</tt> specifies the message to display.<br />

			
 
				-<tt>Typ</tt> specifies which icon to display in the message box. If set to <tt>mbConfirmation</tt>, no icon will be displayed.<br />

			
 
				-<tt>Buttons</tt> specifies which buttons to include in the message box.<br />

			
 
				-<tt>ButtonLabels</tt> specifies which custom button labels to use. If set to an empty array, the system's default button labels will be used. If a label consists on two strings separated by a newline, then the first string specifies the button label and the second string specifies the button note.<br />

			
 
				+<tt>Typ</tt> specifies which icon to display in the task dialog. If set to <tt>mbConfirmation</tt>, no icon will be displayed.<br />

			
 
				+<tt>Buttons</tt> specifies which buttons to include in the task dialog.<br />

			
 
				+<tt>ButtonLabels</tt> specifies which custom button labels to use. If set to an empty array, the system's default button labels will be used. If a label consists of two strings separated by a newline, then the first string specifies the button label and the second string specifies the button note.<br />

			
 
				 <tt>ShieldButton</tt> specifies which button to display a shield icon on. If set to 0, no shield icon will be displayed.</p>

			
 
				 <p>If a a regular message box is displayed:<br/>

			
 
				 <tt>Instruction</tt> specifies the caption to display. If set to an empty string, the default caption will be displayed.<br />

			
--- a/whatsnew.htm
+++ b/whatsnew.htm
@@ -56,7 +56,7 @@ For conditions of distribution and use, see <a href="http://www.jrsoftware.org/f
 
				   <li>Added new [Setup] section directive: <tt>PrivilegesRequiredOverridesAllowed</tt>, which can be set to one or more overrides which allow the end user to override the script's default <tt>PrivilegesRequired</tt> setting. The following overrides are supported: <tt>commandline</tt> and <tt>dialog</tt>.</li>

			
 
				   <ul>

			
 
				     <li>If override <tt>commandline</tt> is allowed then Setup will support two additional command line parameters to override the script's default <tt>PrivilegesRequired</tt> setting: /ALLUSERS and /CURRENTUSER.</li>

			
 
				-    <li>If override <tt>dialog</tt> is allowed then Setup will ask the user to choose the install mode based on the script's default <tt>PrivilegesRequired</tt> setting using a dialog (<a href="https://i.imgur.com/9tjXjmg.png">example</a> if <tt>PrivilegesRequired</tt> is set to <tt>admin</tt>). Allowing <tt>dialog</tt> automatically allows <tt>commandline</tt> and when one of the command line parameters is used then Setup will not ask the user.</li>

			
 
				+    <li>If override <tt>dialog</tt> is allowed then Setup will ask the user to choose the install mode based on the script's default <tt>PrivilegesRequired</tt> setting using a suppressible dialog (<a href="https://i.imgur.com/9tjXjmg.png">example</a> if <tt>PrivilegesRequired</tt> is set to <tt>admin</tt>). Allowing <tt>dialog</tt> automatically allows <tt>commandline</tt> and when one of the command line parameters is used then Setup will not ask the user.</li>

			
 
				   </ul>

			
 
				   <li>Inno Setup's own installer now supports both administrative and non administrative mode and allows the <tt>commandline</tt> override.</li>

			
 
				 </ul>