Home Verkennen Help
Inloggen
pascal
/
innosetup
spiegel van https://github.com/jrsoftware/issrc.git
2
0
Vork 0
Bestanden Issues 0 Wiki
Bladeren bron

msgbox->dialog + help tweak

Martijn Laan 6 jaren geleden
bovenliggende
7762ca369b
commit
7ce5fc5800
5 gewijzigde bestanden met toevoegingen van 10 en 10 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 3 3
      ISHelp/isetup.xml
  2. 2 2
      Projects/Compile.pas
  3. 2 2
      Projects/Main.pas
  4. 1 1
      Projects/Struct.pas
  5. 2 2
      whatsnew.htm

+ 3 - 3
ISHelp/isetup.xml
Bestand weergeven 

@@ -3958,13 +3958,13 @@ Name: portablemode; Description: "Portable Mode"</pre></example>
 
 

 <setuptopic directive="PrivilegesRequiredOverridesAllowed">

 <keyword value="commandline" />

-<keyword value="msgbox" />

-<setupvalid>One or more of the following, separated by spaces: <br/><tt>commandline</tt> <br/><tt>msgbox</tt></setupvalid>

+<keyword value="dialog" />

+<setupvalid>One or more of the following, separated by spaces: <br/><tt>commandline</tt> <br/><tt>dialog</tt></setupvalid>

 <setupdefault><i>(blank)</i></setupdefault>

 <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>msgbox</tt> is allowed then Setup will ask the user whether administrative or non administrative install mode should be used based on the script's default <link topic="setup_privilegesrequired">PrivilegesRequired</link> setting. Allowing <tt>msgbox</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 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>

+ 2 - 2
Projects/Compile.pas
Bestand weergeven 

@@ -3684,7 +3684,7 @@ var
 
 

   function StrToPrivilegesRequiredOverrides(S: String): TSetupPrivilegesRequiredOverrides;

   const

-    Overrides: array[0..1] of PChar = ('commandline', 'msgbox');

+    Overrides: array[0..1] of PChar = ('commandline', 'dialog');

   begin

     Result := [];

     while True do

@@ -3692,7 +3692,7 @@ var
 
         -2: Break;

         -1: Invalid;

         0: Include(Result, proCommandLine);

-        1: Result := Result + [proCommandLine, proMsgBox];

+        1: Result := Result + [proCommandLine, proDialog];

       end;

   end;

 var

+ 2 - 2
Projects/Main.pas
Bestand weergeven 

@@ -2968,10 +2968,10 @@ begin
 
         { Apply InitPrivilegesRequired }

         if HasInitPrivilegesRequired and (proCommandLine in SetupHeader.PrivilegesRequiredOverridesAllowed) then

           SetupHeader.PrivilegesRequired := InitPrivilegesRequired

-        else if not InitSuppressMsgBoxes and (proMsgBox in SetupHeader.PrivilegesRequiredOverridesAllowed) then begin

+        else if not InitSuppressMsgBoxes and (proDialog in SetupHeader.PrivilegesRequiredOverridesAllowed) then begin

           { Ask user. Doesn't log since logging hasn't started yet. Also doesn't use ExpandedAppName since it isn't set yet.

             Afterwards we need to tell the respawned Setup about the user choice (and avoid it asking agin). Will use the

-            command line parameter for this. Allowing proMsgBox forces allowing proCommandLine, so we can count on the parameter to work. }

+            command line parameter for this. Allowing proDialog forces allowing proCommandLine, so we can count on the parameter to work. }

           if SetupHeader.PrivilegesRequired = prLowest then begin

             case TaskDialogMsgBox('MAINICON', SetupMessages[msgPrivilegesRequiredOverrideInstruction],

                    SetupMessages[msgPrivilegesRequiredOverrideTaskDialogText2], SetupMessages[msgPrivilegesRequiredOverrideMsgBoxText2],

+ 1 - 1
Projects/Struct.pas
Bestand weergeven 

@@ -73,7 +73,7 @@ type
 
   TSetupProcessorArchitectures = set of TSetupProcessorArchitecture;

   TSetupDisablePage = (dpAuto, dpNo, dpYes);

   TSetupPrivilegesRequired = (prNone, prPowerUser, prAdmin, prLowest);

-  TSetupPrivilegesRequiredOverride = (proCommandLine, proMsgBox);

+  TSetupPrivilegesRequiredOverride = (proCommandLine, proDialog);

   TSetupPrivilegesRequiredOverrides = set of TSetupPrivilegesRequiredOverride;

 const

   SetupProcessorArchitectureNames: array[TSetupProcessorArchitecture] of String =

+ 2 - 2
whatsnew.htm
Bestand weergeven 

@@ -53,10 +53,10 @@ For conditions of distribution and use, see <a href="http://www.jrsoftware.org/f
 
 <p><span class="head2">Overridable install mode</span></p>

 <p>Once your script is fully updated to support both administrative and non administrative mode (for example by using the new &quot;auto&quot; constants and the new [Registry] section <tt>Root</tt> value <tt>HKA</tt>) you can then use the following:</p>

 <ul>

-  <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>msgbox</tt>.</li>

+  <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>msgbox</tt> is allowed then Setup will ask the user to choose the install mode based on the script's default <tt>PrivilegesRequired</tt> setting (<a href="https://i.imgur.com/9tjXjmg.png">example</a> if <tt>PrivilegesRequired</tt> is set to <tt>admin</tt>). Allowing <tt>msgbox</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 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>