VirtualBox

Ignore:
Timestamp:
Apr 29, 2024 8:09:47 AM (9 months ago)
Author:
vboxsync
Message:

Windows host installer: Upgraded to WIX v4 (4.0.5). This is a massive change that accumulates the transition from WIX v3 -> v4 where the WIX XML scheme as well as the build system has changed. See comments for details. bugref:10644

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Installer/win/UserInterface.wxi

    r104410 r104453  
    1 <?xml version="1.0" encoding="UTF-8"?>
    2 <!--
     1<!--
    32    User interface include for VirtualBox WiX script.
    43-->
    … …  
    2524-->
    2625
    27 <Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
     26<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
    2827    <UI>
    2928        <!-- This dialog will be shown when the user cancels the installation -->
    3029        <Dialog Id="VBoxCancelDlg" Width="260" Height="85" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
    3130            <Control Id="No" Type="PushButton" X="132" Y="57" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_No)">
    32                 <Publish Event="EndDialog" Value="Return">1</Publish>
     31                <Publish Event="EndDialog" Value="Return" />
    3332            </Control>
    3433            <Control Id="Yes" Type="PushButton" X="72" Y="57" Width="56" Height="17" Text="!(loc.ButtonText_Yes)">
    35                 <Publish Event="EndDialog" Value="Exit">1</Publish>
     34                <Publish Event="EndDialog" Value="Exit" />
    3635            </Control>
    3736            <Control Id="Text" Type="Text" X="48" Y="15" Width="194" Height="30">
    38                 <Text>!(loc.CancelDlg_Question)</Text>
     37                <Text Value="!(loc.CancelDlg_Question)" />
    3938            </Control>
    4039            <Control Id="Icon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="Information icon" FixedSize="yes" IconSize="32" Text="[InfoIcon]" />
    … …  
    4847            <!-- Title text drawn on the background -->
    4948            <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
    50                 <Text>{\DlgVerdanaBold13}!(loc.WelcomeDlg_Header)</Text>
     49                <Text Value="{\DlgVerdanaBold13}!(loc.WelcomeDlg_Header)" />
    5150            </Control>
    5251
    5352            <!-- Text saying what we gonna do -->
    5453            <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="130" Transparent="yes" NoPrefix="yes">
    55                 <Text>!(loc.WelcomeDlg_Body)</Text>
     54                <Text Value="!(loc.WelcomeDlg_Body)" />
    5655            </Control>
    5756
    … …  
    6160            <!-- Build number text drawn left bottom -->
    6261            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    63                 <Text>[Version_text] $(var.Property_Version)</Text>
     62                <Text Value="[Version_text] $(var.Property_Version)" />
    6463            </Control>
    6564
    … …  
    6867            <!-- Canceling will bring up a confirmation dialog ('SpawnDialog' attribute) -->
    6968            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
    70                 <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
     69                <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
    7170            </Control>
    7271        </Dialog>
    … …  
    8584            <!-- The font used here is defined below -->
    8685            <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
    87                 <Text>[DlgTitleFont]!(loc.LicenseAgreementDlg_Header)</Text>
     86                <Text Value="[DlgTitleFont]!(loc.LicenseAgreementDlg_Header)" />
    8887            </Control>
    8988
    9089            <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
    91                 <Text>!(loc.LicenseAgreementDlg_Body)</Text>
     90                <Text Value="!(loc.LicenseAgreementDlg_Body)" />
    9291            </Control>
    9392
    … …  
    9695
    9796            <!-- The license text should be a RTF text so we have formatting -->
    98             <Control Id="AgreementText" Type="ScrollableText" X="20" Y="60" Width="330" Height="120" Sunken="yes" TabSkip="no" Text="!(loc.LicenseText)"/>
     97            <Control Id="AgreementText" Type="ScrollableText" X="20" Y="60" Width="330" Height="120" Sunken="yes" TabSkip="no" Text="!(loc.LicenseText)" />
    9998
    10099            <!-- This radio button group is defined below -->
    … …  
    106105            <!-- Build number text drawn left bottom -->
    107106            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    108                 <Text>[Version_text] $(var.Property_Version)</Text>
     107                <Text Value="[Version_text] $(var.Property_Version)" />
    109108            </Control>
    110109
    111110            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Back)" />
    112             <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Next)">
    113                 <!-- 'Next' button is only enabled when 'I agree' radio button is selected -->
    114                 <Condition Action="disable"><![CDATA[IAgree <> "Yes"]]></Condition>
    115                 <Condition Action="enable"><![CDATA[IAgree = "Yes"]]></Condition>
    116             </Control>
     111            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Next)" DisableCondition="IAgree &lt;&gt; &quot;Yes&quot;" EnableCondition="IAgree = &quot;Yes&quot;" />
    117112
    118113            <!-- Canceling will bring up a confirmation dialog ('SpawnDialog' attribute) -->
    119114            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
    120                 <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
     115                <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
    121116            </Control>
    122117        </Dialog>
    … …  
    127122
    128123            <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
    129                 <Text>{\DlgVerdanaBold13}!(loc.CheckSerialDlg_Header)</Text>
     124                <Text Value="{\DlgVerdanaBold13}!(loc.CheckSerialDlg_Header)" />
    130125            </Control>
    131126
    132127            <!-- Text saying what we gonna do -->
    133128            <Control Id="Description" Type="Text" X="135" Y="50" Width="220" Height="130" Transparent="yes" NoPrefix="yes">
    134                 <Text>!(loc.CheckSerialDlg_Body)</Text>
    135             </Control>
    136 
    137             <Control Id="Serial1Edit" Type="Edit" X="135" Y="90" Width="30" Height="18" Property="Serial1" Text="{5}">
    138                 <!--<Publish Event="DoAction" Value="CheckSerial">1</Publish>-->
    139             </Control>
    140             <Control Id="Serial2Edit" Type="Edit" X="170" Y="90" Width="30" Height="18" Property="Serial2" Text="{5}">
    141                 <!--<Publish Event="DoAction" Value="CheckSerial">1</Publish>-->
    142             </Control>
    143             <Control Id="Serial3Edit" Type="Edit" X="205" Y="90" Width="30" Height="18" Property="Serial3" Text="{5}">
    144                 <!--<Publish Event="DoAction" Value="CheckSerial">1</Publish>-->
    145             </Control>
    146             <Control Id="Serial4Edit" Type="Edit" X="240" Y="90" Width="30" Height="18" Property="Serial4" Text="{5}">
    147                 <!--<Publish Event="DoAction" Value="CheckSerial">1</Publish>-->
    148             </Control>
    149             <Control Id="Serial5Edit" Type="Edit" X="275" Y="90" Width="30" Height="18" Property="Serial5" Text="{5}">
    150                 <!--<Publish Event="DoAction" Value="CheckSerial">1</Publish>-->
    151             </Control>
     129                <Text Value="!(loc.CheckSerialDlg_Body)" />
     130            </Control>
     131
     132            <Control Id="Serial1Edit" Type="Edit" X="135" Y="90" Width="30" Height="18" Property="Serial1" Text="{5}" />
     133            <Control Id="Serial2Edit" Type="Edit" X="170" Y="90" Width="30" Height="18" Property="Serial2" Text="{5}" />
     134            <Control Id="Serial3Edit" Type="Edit" X="205" Y="90" Width="30" Height="18" Property="Serial3" Text="{5}" />
     135            <Control Id="Serial4Edit" Type="Edit" X="240" Y="90" Width="30" Height="18" Property="Serial4" Text="{5}" />
     136            <Control Id="Serial5Edit" Type="Edit" X="275" Y="90" Width="30" Height="18" Property="Serial5" Text="{5}" />
    152137
    153138            <Control Id="Description3" Type="Text" X="135" Y="120" Width="220" Height="130" Transparent="yes" NoPrefix="yes">
    154                 <Text>!(loc.CheckSerialDlg_Footer)</Text>
     139                <Text Value="!(loc.CheckSerialDlg_Footer)" />
    155140            </Control>
    156141
    … …  
    158143            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Check)" />
    159144            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
    160                 <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
     145                <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
    161146            </Control>
    162147
    … …  
    166151            <!-- Build number text drawn left bottom -->
    167152            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    168                 <Text>[Version_text] $(var.Property_Version)</Text>
     153                <Text Value="[Version_text] $(var.Property_Version)" />
    169154            </Control>
    170155
    … …  
    178163            <!-- Title text drawn on the background -->
    179164            <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
    180                 <Text>{\DlgInvalidSerial}!(loc.WrongSerialDlg_Header)</Text>
     165                <Text Value="{\DlgInvalidSerial}!(loc.WrongSerialDlg_Header)" />
    181166            </Control>
    182167
    183168            <!-- Text saying what we gonna do -->
    184169            <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="130" Transparent="yes" NoPrefix="yes">
    185                 <Text>!(loc.WrongSerialDlg_Desc1)</Text>
     170                <Text Value="!(loc.WrongSerialDlg_Desc1)" />
    186171            </Control>
    187172
    188173            <Control Id="Description2" Type="Text" X="135" Y="95" Width="220" Height="130" Transparent="yes" NoPrefix="yes">
    189                 <Text>!(loc.WrongSerialDlg_Desc2)</Text>
     174                <Text Value="!(loc.WrongSerialDlg_Desc2)" />
    190175            </Control>
    191176
    … …  
    195180            <!-- Build number text drawn left bottom -->
    196181            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    197                 <Text>[Version_text] $(var.Property_Version)</Text>
     182                <Text Value="[Version_text] $(var.Property_Version)" />
    198183            </Control>
    199184
    … …  
    202187            <!-- Canceling will bring up a confirmation dialog ('SpawnDialog' attribute) -->
    203188            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
    204                 <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
     189                <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
    205190            </Control>
    206191
    … …  
    215200            <!-- Title text drawn on the background -->
    216201            <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
    217                 <Text>{\DlgInvalidSerial}!(loc.InvalidTargetDirDlg_Header)</Text>
     202                <Text Value="{\DlgInvalidSerial}!(loc.InvalidTargetDirDlg_Header)" />
    218203            </Control>
    219204
    220205            <!-- Text saying what we gonna do -->
    221206            <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="130" Transparent="yes" NoPrefix="yes">
    222                 <Text>!(loc.InvalidTargetDirDlg_Desc1)</Text>
    223             </Control>
    224 
    225             <Control Id="Description2" Type="Text" X="135" Y="105" Width="220" Height="130" Transparent="yes" NoPrefix="yes">
    226                 <Text>!(loc.InvalidTargetDirDlg_Desc2)</Text>
     207                <Text Value="!(loc.InvalidTargetDirDlg_Desc1)" />
     208            </Control>
     209
     210            <Control Id="Description2" Type="Text" X="135" Y="95" Width="220" Height="130" Transparent="yes" NoPrefix="yes">
     211                <Text Value="!(loc.InvalidTargetDirDlg_Desc2)" />
    227212            </Control>
    228213
    … …  
    232217            <!-- Build number text drawn left bottom -->
    233218            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    234                 <Text>[Version_text] $(var.Property_Version)</Text>
    235             </Control>
    236 
    237             <Control Id="Back" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Back)"/>
     219                <Text Value="[Version_text] $(var.Property_Version)" />
     220            </Control>
     221
     222            <Control Id="Back" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Back)" />
    238223
    239224            <!-- Canceling will bring up a confirmation dialog ('SpawnDialog' attribute) -->
    240225            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
    241                 <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
     226                <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
    242227            </Control>
    243228
    … …  
    250235            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
    251236            <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
    252                 <Text>[DlgTitleFont]!(loc.CustomizeDlg_CustomSetup)</Text>
     237                <Text Value="[DlgTitleFont]!(loc.CustomizeDlg_CustomSetup)" />
    253238            </Control>
    254239            <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
    255                 <Text>!(loc.CustomizeDlg_SelFeatures)</Text>
     240                <Text Value="!(loc.CustomizeDlg_SelFeatures)" />
    256241            </Control>
    257242            <Control Id="Text" Type="Text" X="25" Y="55" Width="320" Height="20">
    258                 <Text>!(loc.CustomizeDlg_IconTree)</Text>
    259             </Control>
    260             <Control Id="Tree" Type="SelectionTree" X="25" Y="85" Width="175" Height="95" Property="VBOX_TARGET_DIR"
    261                      Sunken="yes" TabSkip="no" Text="Tree of selections" />
    262             <Control Id="Browse" Type="PushButton" X="304" Y="200" Width="56" Height="17" Text="!(loc.ButtonText_Browse)">
    263                 <Publish Event="SelectionBrowse" Value="VBoxBrowseDlg">1</Publish>
    264                 <Condition Action="hide">Installed</Condition>
     243                <Text Value="!(loc.CustomizeDlg_IconTree)" />
     244            </Control>
     245            <Control Id="Tree" Type="SelectionTree" X="25" Y="85" Width="175" Height="95" Property="VBOX_TARGET_DIR" Sunken="yes" TabSkip="no" Text="Tree of selections" />
     246            <Control Id="Browse" Type="PushButton" X="304" Y="200" Width="56" Height="17" Text="!(loc.ButtonText_Browse)" HideCondition="Installed">
     247                <Publish Event="SelectionBrowse" Value="VBoxBrowseDlg" />
     248               
    265249            </Control>
    266250            <Control Id="DiskCost" Type="PushButton" X="111" Y="243" Width="56" Height="17">
    267                 <Text>!(loc.CustomizeDlg_DiskUsage)</Text>
    268                 <Publish Event="SpawnDialog" Value="VBoxDiskCostDlg">1</Publish>
     251                <Text Value="!(loc.CustomizeDlg_DiskUsage)" />
     252                <Publish Event="SpawnDialog" Value="VBoxDiskCostDlg" />
    269253                <Subscribe Event="SelectionNoItems" Attribute="Enabled" />
    270254            </Control>
    271255            <Control Id="Box" Type="GroupBox" X="210" Y="81" Width="140" Height="98" />
    272256            <Control Id="ItemDescription" Type="Text" X="215" Y="90" Width="131" Height="30">
    273                 <Text>!(loc.CustomizeDlg_SelItemDesc)</Text>
     257                <Text Value="!(loc.CustomizeDlg_SelItemDesc)" />
    274258                <Subscribe Event="SelectionDescription" Attribute="Text" />
    275259            </Control>
    276260            <Control Id="ItemSize" Type="Text" X="215" Y="130" Width="131" Height="45">
    277                 <Text>!(loc.CustomizeDlg_SelItemSize)</Text>
     261                <Text Value="!(loc.CustomizeDlg_SelItemSize)" />
    278262                <Subscribe Event="SelectionSize" Attribute="Text" />
    279263            </Control>
    280             <Control Id="Location" Type="Text" X="75" Y="200" Width="215" Height="20">
    281                 <Text>!(loc.CustomizeDlg_SelItemPath)</Text>
     264            <Control Id="Location" Type="Text" X="75" Y="200" Width="215" Height="20" HideCondition="Installed">
     265                <Text Value="!(loc.CustomizeDlg_SelItemPath)" />
    282266                <Subscribe Event="SelectionPath" Attribute="Text" />
    283267                <Subscribe Event="SelectionPathOn" Attribute="Visible" />
    284                 <Condition Action="hide">Installed</Condition>
    285             </Control>
    286             <Control Id="LocationLabel" Type="Text" X="25" Y="200" Width="50" Height="10" Text="!(loc.CustomizeDlg_Location)">
     268               
     269            </Control>
     270            <Control Id="LocationLabel" Type="Text" X="25" Y="200" Width="50" Height="10" Text="!(loc.CustomizeDlg_Location)" HideCondition="Installed">
    287271                <Subscribe Event="SelectionPathOn" Attribute="Visible" />
    288                 <Condition Action="hide">Installed</Condition>
     272               
    289273            </Control>
    290274
    … …  
    294278            </Control>
    295279            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
    296                 <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
    297             </Control>
    298 
    299             <!-- Build number text drawn left bottom -->
    300             <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
    301             <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    302                 <Text>[Version_text] $(var.Property_Version)</Text>
     280                <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
     281            </Control>
     282
     283            <!-- Build number text drawn left bottom -->
     284            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
     285            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
     286                <Text Value="[Version_text] $(var.Property_Version)" />
    303287            </Control>
    304288        </Dialog>
    … …  
    314298            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
    315299            <Control Id="Title" Type="Text" X="15" Y="6" Width="220" Height="40" Transparent="yes" NoPrefix="yes">
    316                 <Text>[DlgTitleFont]!(loc.CustomizeDlg_CustomSetup)</Text>
     300                <Text Value="[DlgTitleFont]!(loc.CustomizeDlg_CustomSetup)" />
    317301            </Control>
    318302            <Control Id="Description" Type="Text" X="25" Y="23" Width="220" Height="20" Transparent="yes" NoPrefix="yes">
    319                 <Text>!(loc.CustomizeDlg_SelFeatures)</Text>
     303                <Text Value="!(loc.CustomizeDlg_SelFeatures)" />
    320304            </Control>
    321305
    322306            <Control Id="CommonDescription" Type="Text" X="25" Y="55" Width="325" Height="20" Transparent="yes" NoPrefix="yes">
    323               <Text>!(loc.SelectionNetworkTypeDlg_CommonDescription)</Text>
     307              <Text Value="!(loc.SelectionNetworkTypeDlg_CommonDescription)" />
    324308            </Control>
    325309
    … …  
    328312
    329313            <!-- Description text -->
    330             <Control Id="DescriptionNDIS5" Type="Text" X="200" Y="105" Width="150" Height="60" Transparent="yes" NoPrefix="yes">
    331               <Text>!(loc.SelectionNetworkTypeDlg_DescriptionNDIS5)</Text>
    332               <Condition Action="hide"> NETWORKTYPE = "NDIS6"</Condition>
    333               <Condition Action="show"> NETWORKTYPE = "NDIS5"</Condition>
    334             </Control>
    335             <Control Id="DescriptionNDIS6" Type="Text" X="200" Y="105" Width="150" Height="60" Transparent="yes" NoPrefix="yes">
    336               <Text>!(loc.SelectionNetworkTypeDlg_DescriptionNDIS6)</Text>
    337               <Condition Action="hide"> NETWORKTYPE = "NDIS5"</Condition>
    338               <Condition Action="show"> NETWORKTYPE = "NDIS6"</Condition>
    339             </Control>
    340 
    341             <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_Next)"/>
    342             <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Back)"/>
    343             <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17"
    344                 Text="!(loc.ButtonText_Cancel)">
    345                 <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
    346             </Control>
    347 
    348             <!-- Build number text drawn left bottom -->
    349             <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
    350             <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    351                 <Text>[Version_text] $(var.Property_Version)</Text>
     314            <Control Id="DescriptionNDIS5" Type="Text" X="200" Y="105" Width="150" Height="60" Transparent="yes" NoPrefix="yes" HideCondition="NETWORKTYPE = &quot;NDIS6&quot;" ShowCondition="NETWORKTYPE = &quot;NDIS5&quot;">
     315              <Text Value="!(loc.SelectionNetworkTypeDlg_DescriptionNDIS5)" />
     316             
     317             
     318            </Control>
     319            <Control Id="DescriptionNDIS6" Type="Text" X="200" Y="105" Width="150" Height="60" Transparent="yes" NoPrefix="yes" HideCondition="NETWORKTYPE = &quot;NDIS5&quot;" ShowCondition="NETWORKTYPE = &quot;NDIS6&quot;">
     320              <Text Value="!(loc.SelectionNetworkTypeDlg_DescriptionNDIS6)" />
     321             
     322             
     323            </Control>
     324
     325            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_Next)" />
     326            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Back)" />
     327            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Cancel)">
     328                <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
     329            </Control>
     330
     331            <!-- Build number text drawn left bottom -->
     332            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
     333            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
     334                <Text Value="[Version_text] $(var.Property_Version)" />
    352335            </Control>
    353336        </Dialog>
    … …  
    357340            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
    358341            <Control Id="Title" Type="Text" X="15" Y="6" Width="220" Height="40" Transparent="yes" NoPrefix="yes">
    359                 <Text>[DlgTitleFont]!(loc.CustomizeDlg_CustomSetup)</Text>
     342                <Text Value="[DlgTitleFont]!(loc.CustomizeDlg_CustomSetup)" />
    360343            </Control>
    361344            <Control Id="Description" Type="Text" X="25" Y="23" Width="220" Height="20" Transparent="yes" NoPrefix="yes">
    362                 <Text>!(loc.CustomizeDlg_SelFeatures)</Text>
     345                <Text Value="!(loc.CustomizeDlg_SelFeatures)" />
    363346            </Control>
    364347            <Control Id="Text" Type="Text" X="25" Y="70" Width="320" Height="20">
    365                 <Text>!(loc.Customize2Dlg_Desc)</Text>
     348                <Text Value="!(loc.Customize2Dlg_Desc)" />
    366349            </Control>
    367350<?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
    … …  
    373356                 change their Windows color scheme.
    374357                 Also see: http://osdir.com/ml/windows.devel.wix.user/2005-02/msg00300.html -->
    375             <Control Id="StartMenuEntriesCheckBox" Type="CheckBox" X="25" Y="95" Width="200" Height="17"
    376                      Property="VBOX_INSTALLSTARTMENUENTRIES" CheckBoxValue="1" Default="no">
    377                 <Text>!(loc.Customize2Dlg_CreateStartMenuEntries)</Text>
    378             </Control>
    379             <Control Id="DesktopShortcutCheckBox" Type="CheckBox" X="25" Y="115" Width="200" Height="17"
    380                      Property="VBOX_INSTALLDESKTOPSHORTCUT" CheckBoxValue="1" Default="no">
    381                 <Text>!(loc.Customize2Dlg_CreateDesktopShortcut)</Text>
    382             </Control>
    383             <Control Id="QuicklaunchShortcutCheckBox" Type="CheckBox" X="25" Y="135" Width="200" Height="17"
    384                      Property="VBOX_INSTALLQUICKLAUNCHSHORTCUT" CheckBoxValue="1" Default="no">
    385                 <Text>!(loc.Customize2Dlg_CreateQuickLaunch)</Text>
    386             </Control>
    387             <Control Id="RegisterFileExtensionsCheckBox" Type="CheckBox" X="25" Y="155" Width="200" Height="17"
    388                      Property="VBOX_REGISTERFILEEXTENSIONS" CheckBoxValue="1" Default="no">
    389                 <Text>!(loc.Customize2Dlg_RegisterFileExtensions)</Text>
     358            <Control Id="StartMenuEntriesCheckBox" Type="CheckBox" X="25" Y="95" Width="200" Height="17" Property="VBOX_INSTALLSTARTMENUENTRIES" CheckBoxValue="1" Default="no">
     359                <Text Value="!(loc.Customize2Dlg_CreateStartMenuEntries)" />
     360            </Control>
     361            <Control Id="DesktopShortcutCheckBox" Type="CheckBox" X="25" Y="115" Width="200" Height="17" Property="VBOX_INSTALLDESKTOPSHORTCUT" CheckBoxValue="1" Default="no">
     362                <Text Value="!(loc.Customize2Dlg_CreateDesktopShortcut)" />
     363            </Control>
     364            <Control Id="QuicklaunchShortcutCheckBox" Type="CheckBox" X="25" Y="135" Width="200" Height="17" Property="VBOX_INSTALLQUICKLAUNCHSHORTCUT" CheckBoxValue="1" Default="no">
     365                <Text Value="!(loc.Customize2Dlg_CreateQuickLaunch)" />
     366            </Control>
     367            <Control Id="RegisterFileExtensionsCheckBox" Type="CheckBox" X="25" Y="155" Width="200" Height="17" Property="VBOX_REGISTERFILEEXTENSIONS" CheckBoxValue="1" Default="no">
     368                <Text Value="!(loc.Customize2Dlg_RegisterFileExtensions)" />
    390369            </Control>
    391370<?endif?> <!-- VBOX_WITH_QTGUI -->
    … …  
    396375            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
    397376            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    398                 <Text>[Version_text] $(var.Property_Version)</Text>
     377                <Text Value="[Version_text] $(var.Property_Version)" />
    399378            </Control>
    400379        </Dialog>
    … …  
    407386            <!-- Title text drawn on the background -->
    408387            <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
    409                 <Text>{\DlgWarnDisconNetIfaces}!(loc.WarnDisconNetIfacesDlg_Title)</Text>
     388                <Text Value="{\DlgWarnDisconNetIfaces}!(loc.WarnDisconNetIfacesDlg_Title)" />
    410389            </Control>
    411390
    412391            <Control Id="Title2" Type="Text" X="135" Y="40" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
    413                 <Text>{\DlgWarnDisconNetIfaces}!(loc.WarnDisconNetIfacesDlg_Title2)</Text>
     392                <Text Value="{\DlgWarnDisconNetIfaces}!(loc.WarnDisconNetIfacesDlg_Title2)" />
    414393            </Control>
    415394
    416395            <!-- Text saying what we gonna do -->
    417396            <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="130" Transparent="yes" NoPrefix="yes">
    418                 <Text>!(loc.WarnDisconNetIfacesDlg_Desc)</Text>
     397                <Text Value="!(loc.WarnDisconNetIfacesDlg_Desc)" />
    419398            </Control>
    420399
    421400            <Control Id="Description2" Type="Text" X="135" Y="115" Width="220" Height="130" Transparent="yes" NoPrefix="yes">
    422                 <Text>!(loc.WarnDisconNetIfacesDlg_Question)</Text>
     401                <Text Value="!(loc.WarnDisconNetIfacesDlg_Question)" />
    423402            </Control>
    424403
    … …  
    428407            <!-- Build number text drawn left bottom -->
    429408            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    430                 <Text>[Version_text] $(var.Property_Version)</Text>
     409                <Text Value="[Version_text] $(var.Property_Version)" />
    431410            </Control>
    432411
    433412            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Yes)" />
    434413            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_No)">
    435                 <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
     414                <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
    436415            </Control>
    437416
    … …  
    445424            <!-- Title text drawn on the background -->
    446425            <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
    447                 <Text>{\DlgWarnPython}!(loc.WarnPythonDlg_Title)</Text>
     426                <Text Value="{\DlgWarnPython}!(loc.WarnPythonDlg_Title)" />
    448427            </Control>
    449428
    450429            <Control Id="Title2" Type="Text" X="135" Y="40" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
    451                 <Text>{\DlgWarnPython}!(loc.WarnPythonDlg_Title2)</Text>
     430                <Text Value="{\DlgWarnPython}!(loc.WarnPythonDlg_Title2)" />
    452431            </Control>
    453432
    454433            <!-- Text saying what we gonna do -->
    455434            <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="130" Transparent="yes" NoPrefix="yes">
    456                 <Text>!(loc.WarnPythonDlg_Desc)</Text>
     435                <Text Value="!(loc.WarnPythonDlg_Desc)" />
    457436            </Control>
    458437
    459438            <Control Id="Description2" Type="Text" X="135" Y="115" Width="220" Height="130" Transparent="yes" NoPrefix="yes">
    460                 <Text>!(loc.WarnPythonDlg_Desc2)</Text>
     439                <Text Value="!(loc.WarnPythonDlg_Desc2)" />
    461440            </Control>
    462441
    463442            <Control Id="Description3" Type="Text" X="135" Y="160" Width="220" Height="130" Transparent="yes" NoPrefix="yes">
    464                 <Text>!(loc.WarnPythonDlg_Question)</Text>
     443                <Text Value="!(loc.WarnPythonDlg_Question)" />
    465444            </Control>
    466445
    … …  
    470449            <!-- Build number text drawn left bottom -->
    471450            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    472                 <Text>[Version_text] $(var.Property_Version)</Text>
     451                <Text Value="[Version_text] $(var.Property_Version)" />
    473452            </Control>
    474453
    475454            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Yes)" />
    476455            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_No)">
    477                 <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
     456                <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
    478457            </Control>
    479458
    … …  
    482461        <Dialog Id="VBoxDiskCostDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
    483462            <Control Id="OK" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_OK)">
    484                 <Publish Event="EndDialog" Value="Return">1</Publish>
     463                <Publish Event="EndDialog" Value="Return" />
    485464            </Control>
    486465            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
    487466            <Control Id="Description" Type="Text" X="20" Y="20" Width="280" Height="20" Transparent="yes" NoPrefix="yes">
    488               <Text>!(loc.DiskCostDlg_SpaceRequired)</Text>
     467              <Text Value="!(loc.DiskCostDlg_SpaceRequired)" />
    489468            </Control>
    490469            <Control Id="Text" Type="Text" X="20" Y="53" Width="330" Height="40">
    491                 <Text>!(loc.DiskCostDlg_NotEnoughSpace)</Text>
     470                <Text Value="!(loc.DiskCostDlg_NotEnoughSpace)" />
    492471            </Control>
    493472            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
    494473            <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
    495                 <Text>[DlgTitleFont]!(loc.DiskCostDlg_SpaceRequirements)</Text>
     474                <Text Value="[DlgTitleFont]!(loc.DiskCostDlg_SpaceRequirements)" />
    496475            </Control>
    497476            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
    498477            <Control Id="VolumeList" Type="VolumeCostList" X="20" Y="100" Width="330" Height="120" Sunken="yes" Fixed="yes" Remote="yes">
    499                 <Text>!(loc.DiskCostDlg_VolumeList)</Text>
     478                <Text Value="!(loc.DiskCostDlg_VolumeList)" />
    500479            </Control>
    501480        </Dialog>
    … …  
    505484            <Control Id="PathEdit" Type="PathEdit" X="84" Y="202" Width="261" Height="18" Property="VBOX_TARGET_DIR" Indirect="yes" />
    506485            <Control Id="OK" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_OK)" />
    507             <Control Id="Cancel" Type="PushButton" X="240" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)"/>
     486            <Control Id="Cancel" Type="PushButton" X="240" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)" />
    508487            <Control Id="ComboLabel" Type="Text" X="25" Y="58" Width="44" Height="10" TabSkip="no" Text="!(loc.BrowseDlg_LookIn)" />
    509             <Control Id="DirectoryCombo" Type="DirectoryCombo" X="70" Y="55" Width="220" Height="80"
    510                      Property="VBOX_TARGET_DIR" Indirect="yes" Fixed="yes" Remote="yes">
     488            <Control Id="DirectoryCombo" Type="DirectoryCombo" X="70" Y="55" Width="220" Height="80" Property="VBOX_TARGET_DIR" Indirect="yes" Fixed="yes" Remote="yes">
    511489                <Subscribe Event="IgnoreChange" Attribute="IgnoreChange" />
    512490            </Control>
    513491            <Control Id="Up" Type="PushButton" X="298" Y="55" Width="19" Height="19" ToolTip="!(loc.BrowseDlg_UpOneLevelTooltip)" Icon="yes" FixedSize="yes" IconSize="16" Text="[FolderUp]">
    514                 <Publish Event="DirectoryListUp" Value="0">1</Publish>
    515             </Control>
    516             <Control Id="NewFolder" Type="PushButton" X="325" Y="55" Width="19" Height="19"
    517                      ToolTip="!(loc.BrowseDlg_CreateNewFolderTooltip)" Icon="yes" FixedSize="yes" IconSize="16" Text="[FolderNew]">
    518                 <Publish Event="DirectoryListNew" Value="0">1</Publish>
    519             </Control>
    520             <Control Id="DirectoryList" Type="DirectoryList" X="25" Y="83" Width="320" Height="110"
    521                      Property="VBOX_TARGET_DIR" Sunken="yes" Indirect="yes" TabSkip="no" />
     492                <Publish Event="DirectoryListUp" Value="0" />
     493            </Control>
     494            <Control Id="NewFolder" Type="PushButton" X="325" Y="55" Width="19" Height="19" ToolTip="!(loc.BrowseDlg_CreateNewFolderTooltip)" Icon="yes" FixedSize="yes" IconSize="16" Text="[FolderNew]">
     495                <Publish Event="DirectoryListNew" Value="0" />
     496            </Control>
     497            <Control Id="DirectoryList" Type="DirectoryList" X="25" Y="83" Width="320" Height="110" Property="VBOX_TARGET_DIR" Sunken="yes" Indirect="yes" TabSkip="no" />
    522498            <Control Id="PathLabel" Type="Text" X="25" Y="205" Width="59" Height="10" TabSkip="no" Text="!(loc.BrowseDlg_FolderName)" />
    523499            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
    524500            <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
    525                 <Text>!(loc.BrowseDlg_BrowseDestFolder)</Text>
     501                <Text Value="!(loc.BrowseDlg_BrowseDestFolder)" />
    526502            </Control>
    527503            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
    528504            <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
    529                 <Text>[DlgTitleFont]!(loc.BrowseDlg_ChangeCurFolder)</Text>
     505                <Text Value="[DlgTitleFont]!(loc.BrowseDlg_ChangeCurFolder)" />
    530506            </Control>
    531507            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
    … …  
    534510        <Dialog Id="VBoxPrepareDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" Modeless="yes">
    535511            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
    536                 <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
     512                <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
    537513            </Control>
    538514            <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[DialogBitmap]" />
    … …  
    543519            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
    544520            <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
    545                 <Text>[DlgTitleFont]!(loc.VerifyReadyDlg_ReadyToInstall)</Text>
     521                <Text Value="[DlgTitleFont]!(loc.VerifyReadyDlg_ReadyToInstall)" />
    546522            </Control>
    547523            <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
    548                 <Text>!(loc.VerifyReadyDlg_ReadyToBegin)</Text>
     524                <Text Value="!(loc.VerifyReadyDlg_ReadyToBegin)" />
    549525            </Control>
    550526            <Control Id="Text" Type="Text" X="25" Y="70" Width="320" Height="80">
    551                 <Text>!(loc.VerifyReadyDlg_ClickInstall)</Text>
     527                <Text Value="!(loc.VerifyReadyDlg_ClickInstall)" />
    552528            </Control>
    553529            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
    554530            <Control Id="Install" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Install)">
    555                 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
    556                 <Publish Event="SpawnDialog" Value="VBoxOutOfRbDiskDlg"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)]]></Publish>
    557                 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"]]></Publish>
    558                 <Publish Event="EnableRollback" Value="False"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"]]></Publish>
    559                 <Publish Event="SpawnDialog" Value="VBoxOutOfDiskDlg"><![CDATA[(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")]]></Publish>
     531                <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
     532                <Publish Event="SpawnDialog" Value="VBoxOutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
     533                <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
     534                <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
     535                <Publish Event="SpawnDialog" Value="VBoxOutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
    560536            </Control>
    561537            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Back)" />
    562538            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
    563                 <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
    564             </Control>
    565 
    566             <!-- Build number text drawn left bottom -->
    567             <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    568                 <Text>[Version_text] $(var.Property_Version)</Text>
     539                <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
     540            </Control>
     541
     542            <!-- Build number text drawn left bottom -->
     543            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
     544                <Text Value="[Version_text] $(var.Property_Version)" />
    569545            </Control>
    570546        </Dialog>
    … …  
    574550            <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_Finish)">
    575551<?if $(env.VBOX_WITH_QTGUI) = "yes" ?> <!-- Only expose action to start VirtualBox if we also ship FE/Qt with it. -->
    576                 <Publish Event="DoAction" Value="ca_StartVBox"><![CDATA[VBOX_START]]></Publish>
    577 <?endif ?>
    578                 <Publish Event="EndDialog" Value="Return">1</Publish>
    579             </Control>
    580 
    581             <!-- Build number text drawn left bottom -->
    582             <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    583                 <Text>[Version_text] $(var.Property_Version)</Text>
     552                <Publish Event="DoAction" Value="ca_StartVBox" Condition="VBOX_START" />
     553<?endif?>
     554                <Publish Event="EndDialog" Value="Return" />
     555            </Control>
     556
     557            <!-- Build number text drawn left bottom -->
     558            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
     559                <Text Value="[Version_text] $(var.Property_Version)" />
    584560            </Control>
    585561
    … …  
    588564            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.ButtonText_Back)" />
    589565            <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="20" Transparent="yes" NoPrefix="yes">
    590                 <Text>!(loc.ExitDlg_ClickFinish)</Text>
     566                <Text Value="!(loc.ExitDlg_ClickFinish)" />
    591567            </Control>
    592568
    … …  
    600576                 change their Windows color scheme.
    601577                 Also see: http://osdir.com/ml/windows.devel.wix.user/2005-02/msg00300.html -->
    602             <Control Id="StartVBoxCheckBox" Type="CheckBox" X="135" Y="115" Width="200" Height="17"
    603                      Property="VBOX_START" CheckBoxValue="1" Default="no">
    604                 <Text>!(loc.ExitDlg_StartVBox)</Text>
    605                 <Condition Action="hide">
    606                     <![CDATA[(InstallMode="Repair") OR (InstallMode="Remove") OR
    607                       (InstallMode="Change")]]>
    608                 </Condition>
    609             </Control>
    610 <?endif ?>
     578            <Control Id="StartVBoxCheckBox" Type="CheckBox" X="135" Y="115" Width="200" Height="17" Property="VBOX_START" CheckBoxValue="1" Default="no" HideCondition="(InstallMode=&quot;Repair&quot;) OR (InstallMode=&quot;Remove&quot;) OR&#xA;                      (InstallMode=&quot;Change&quot;)">
     579                <Text Value="!(loc.ExitDlg_StartVBox)" />
     580               
     581            </Control>
     582<?endif?>
    611583            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
    612584            <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
    613                 <Text>{\DlgVerdanaBold13}!(loc.ExitDlg_InstComplete)</Text>
     585                <Text Value="{\DlgVerdanaBold13}!(loc.ExitDlg_InstComplete)" />
    614586            </Control>
    615587        </Dialog>
    … …  
    620592            <Control Id="ErrorText" Type="Text" X="75" Y="20" Width="155" Height="80" TabSkip="no" NoPrefix="yes" Text="Error information text" />
    621593            <Control Id="Y" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="!(loc.ButtonText_Yes)">
    622                 <Publish Event="EndDialog" Value="ErrorYes">1</Publish>
     594                <Publish Event="EndDialog" Value="ErrorYes" />
    623595            </Control>
    624596            <Control Id="A" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="!(loc.ButtonText_Cancel)">
    625                 <Publish Event="EndDialog" Value="ErrorAbort">1</Publish>
     597                <Publish Event="EndDialog" Value="ErrorAbort" />
    626598            </Control>
    627599            <Control Id="C" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="!(loc.ButtonText_Cancel)">
    628                 <Publish Event="EndDialog" Value="ErrorCancel">1</Publish>
     600                <Publish Event="EndDialog" Value="ErrorCancel" />
    629601            </Control>
    630602            <Control Id="ErrorIcon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="Information icon" FixedSize="yes" IconSize="32" Text="[InfoIcon]" />
    631603            <Control Id="I" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="!(loc.ButtonText_Ignore)">
    632                 <Publish Event="EndDialog" Value="ErrorIgnore">1</Publish>
     604                <Publish Event="EndDialog" Value="ErrorIgnore" />
    633605            </Control>
    634606            <Control Id="N" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="!(loc.ButtonText_No)">
    635                 <Publish Event="EndDialog" Value="ErrorNo">1</Publish>
     607                <Publish Event="EndDialog" Value="ErrorNo" />
    636608            </Control>
    637609            <Control Id="O" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="!(loc.ButtonText_OK)">
    638                 <Publish Event="EndDialog" Value="ErrorOk">1</Publish>
     610                <Publish Event="EndDialog" Value="ErrorOk" />
    639611            </Control>
    640612            <Control Id="R" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="!(loc.ButtonText_Retry)">
    641                 <Publish Event="EndDialog" Value="ErrorRetry">1</Publish>
     613                <Publish Event="EndDialog" Value="ErrorRetry" />
    642614            </Control>
    643615        </Dialog>
    … …  
    646618        <Dialog Id="VBoxFatalErrorDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
    647619            <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_Finish)">
    648                 <Publish Event="EndDialog" Value="Exit">1</Publish>
     620                <Publish Event="EndDialog" Value="Exit" />
    649621            </Control>
    650622            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.ButtonText_Cancel)" />
    … …  
    655627            <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="80" Transparent="yes" NoPrefix="yes" Text="!(loc.FatalErrorDescription1) !(loc.FatalErrorDescription2)" />
    656628            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    657                 <Text>[Version_text] $(var.Property_Version)</Text>
     629                <Text Value="[Version_text] $(var.Property_Version)" />
    658630            </Control>
    659631        </Dialog>
    … …  
    661633        <Dialog Id="FilesInUse" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" KeepModeless="yes">
    662634            <Control Id="Retry" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_Retry)">
    663                 <Publish Event="EndDialog" Value="Retry">1</Publish>
     635                <Publish Event="EndDialog" Value="Retry" />
    664636            </Control>
    665637            <!-- Currently we don't want to let the users ignore a running VirtualBox installation, as this
    … …  
    670642            -->
    671643            <Control Id="Exit" Type="PushButton" X="235" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Exit)">
    672                 <Publish Event="EndDialog" Value="Exit">1</Publish>
     644                <Publish Event="EndDialog" Value="Exit" />
    673645            </Control>
    674646            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
    … …  
    684656        <Dialog Id="VBoxUserExitDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
    685657            <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_Finish)">
    686                 <Publish Event="EndDialog" Value="Exit">1</Publish>
    687             </Control>
    688             <!-- Build number text drawn left bottom -->
    689             <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    690                 <Text>[Version_text] $(var.Property_Version)</Text>
     658                <Publish Event="EndDialog" Value="Exit" />
     659            </Control>
     660            <!-- Build number text drawn left bottom -->
     661            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
     662                <Text Value="[Version_text] $(var.Property_Version)" />
    691663            </Control>
    692664
    … …  
    696668            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
    697669            <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
    698                 <Text>{\DlgVerdanaBold13}!(loc.UserExitDlg_Header)</Text>
     670                <Text Value="{\DlgVerdanaBold13}!(loc.UserExitDlg_Header)" />
    699671            </Control>
    700672            <Control Id="Description1" Type="Text" X="135" Y="70" Width="220" Height="40" Transparent="yes" NoPrefix="yes">
    701                 <Text>!(loc.UserExitDlg_Desc)</Text>
     673                <Text Value="!(loc.UserExitDlg_Desc)" />
    702674            </Control>
    703675            <Control Id="Description2" Type="Text" X="135" Y="115" Width="220" Height="20" Transparent="yes" NoPrefix="yes">
    704                 <Text>!(loc.UserExitDlg_Footer)</Text>
     676                <Text Value="!(loc.UserExitDlg_Footer)" />
    705677            </Control>
    706678        </Dialog>
    … …  
    709681        <Dialog Id="VBoxProgressDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" Modeless="yes">
    710682            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
    711                 <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
    712             </Control>
    713 
    714             <!-- Build number text drawn left bottom -->
    715             <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    716                 <Text>[Version_text] $(var.Property_Version)</Text>
     683                <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
     684            </Control>
     685
     686            <!-- Build number text drawn left bottom -->
     687            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
     688                <Text Value="[Version_text] $(var.Property_Version)" />
    717689            </Control>
    718690
    … …  
    724696            </Control>
    725697            <Control Id="Text" Type="Text" X="35" Y="65" Width="300" Height="20">
    726                 <Text>!(loc.ProgressDlg_PleaseWait)</Text>
     698                <Text Value="!(loc.ProgressDlg_PleaseWait)" />
    727699            </Control>
    728700            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
    729701            <Control Id="Title" Type="Text" X="20" Y="15" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
    730                 <Text>[DlgTitleFont][Progress1] [ProductName]</Text>
     702                <Text Value="[DlgTitleFont][Progress1] [ProductName]" />
    731703            </Control>
    732704            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
    … …  
    739711        <Dialog Id="VBoxResumeDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
    740712            <Control Id="Install" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Install)">
    741                 <Publish Event="SpawnWaitDialog" Value="VBoxWaitForCostingDlg">CostingComplete = 1</Publish>
    742                 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
    743                 <Publish Event="SpawnDialog" Value="VBoxOutOfRbDiskDlg">
    744                     <![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)]]>
    745                 </Publish>
    746                 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"]]></Publish>
    747                 <Publish Event="EnableRollback" Value="False"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"]]></Publish>
    748                 <Publish Event="SpawnDialog" Value="VBoxOutOfDiskDlg">
    749                     <![CDATA[(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")]]>
    750                 </Publish>
     713                <Publish Event="SpawnWaitDialog" Value="VBoxWaitForCostingDlg" Condition="CostingComplete = 1" />
     714                <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
     715                <Publish Event="SpawnDialog" Value="VBoxOutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
     716                <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
     717                <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
     718                <Publish Event="SpawnDialog" Value="VBoxOutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
    751719            </Control>
    752720
    753721            <!-- Build number text drawn left bottom -->
    754722            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
    755                 <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
     723                <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
    756724            </Control>
    757725            <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[DialogBitmap]" />
    758726            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.ButtonText_Back)" />
    759727            <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
    760                 <Text>{\DlgVerdanaBold13}!(loc.ResumeDlg_Header)</Text>
     728                <Text Value="{\DlgVerdanaBold13}!(loc.ResumeDlg_Header)" />
    761729            </Control>
    762730            <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="30" Transparent="yes" NoPrefix="yes">
    763                 <Text>!(loc.ResumeDlg_Desc)</Text>
    764             </Control>
    765             <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
    766             <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    767                 <Text>[Version_text] $(var.Property_Version)</Text>
     731                <Text Value="!(loc.ResumeDlg_Desc)" />
     732            </Control>
     733            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
     734            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
     735                <Text Value="[Version_text] $(var.Property_Version)" />
    768736            </Control>
    769737        </Dialog>
    … …  
    773741        <Dialog Id="VBoxMaintenanceTypeDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
    774742            <Control Id="RepairLabel" Type="Text" X="105" Y="90" Width="100" Height="10" TabSkip="no">
    775                 <Text>[DlgTitleFont]!(loc.MaintenanceTypeDlg_Repair)</Text>
    776             </Control>
    777             <Control Id="RepairButton" Type="PushButton" X="50" Y="90" Width="38" Height="38" ToolTip="!(loc.MaintenanceTypeDlg_RepairTooltip)"
    778                      Icon="yes" FixedSize="yes" IconSize="32" Text="[RepairIcon]">
    779                 <Publish Property="InstallMode" Value="Repair">1</Publish>
    780                 <Publish Property="Progress1" Value="!(loc.MaintenanceTypeDlg_RepairProgress1)">1</Publish>
    781                 <Publish Property="Progress2" Value="!(loc.MaintenanceTypeDlg_RepairProgress2)">1</Publish>
    782                 <Publish Event="NewDialog" Value="VBoxVerifyRepairDlg">1</Publish>
     743                <Text Value="[DlgTitleFont]!(loc.MaintenanceTypeDlg_Repair)" />
     744            </Control>
     745            <Control Id="RepairButton" Type="PushButton" X="50" Y="90" Width="38" Height="38" ToolTip="!(loc.MaintenanceTypeDlg_RepairTooltip)" Icon="yes" FixedSize="yes" IconSize="32" Text="[RepairIcon]">
     746                <Publish Property="InstallMode" Value="Repair" />
     747                <Publish Property="Progress1" Value="!(loc.MaintenanceTypeDlg_RepairProgress1)" />
     748                <Publish Property="Progress2" Value="!(loc.MaintenanceTypeDlg_RepairProgress2)" />
     749                <Publish Event="NewDialog" Value="VBoxVerifyRepairDlg" />
    783750            </Control>
    784751            <Control Id="RemoveLabel" Type="Text" X="105" Y="163" Width="100" Height="10" TabSkip="no">
    785                 <Text>[DlgTitleFont]!(loc.MaintenanceTypeDlg_Remove)</Text>
    786             </Control>
    787             <Control Id="RemoveButton" Type="PushButton" X="50" Y="163" Width="38" Height="38" ToolTip="!(loc.MaintenanceTypeDlg_RemoveTooltip)"
    788                      Icon="yes" FixedSize="yes" IconSize="32" Text="[RemoveIcon]">
    789                 <Publish Property="InstallMode" Value="Remove">1</Publish>
    790                 <Publish Property="Progress1" Value="!(loc.MaintenanceTypeDlg_RemoveProgress1)">1</Publish>
    791                 <Publish Property="Progress2" Value="!(loc.MaintenanceTypeDlg_RemoveProgress2)">1</Publish>
    792                 <Publish Event="NewDialog" Value="VBoxVerifyRemoveDlg">1</Publish>
    793             </Control>
    794 
    795             <!-- Build number text drawn left bottom -->
    796             <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    797                 <Text>[Version_text] $(var.Property_Version)</Text>
     752                <Text Value="[DlgTitleFont]!(loc.MaintenanceTypeDlg_Remove)" />
     753            </Control>
     754            <Control Id="RemoveButton" Type="PushButton" X="50" Y="163" Width="38" Height="38" ToolTip="!(loc.MaintenanceTypeDlg_RemoveTooltip)" Icon="yes" FixedSize="yes" IconSize="32" Text="[RemoveIcon]">
     755                <Publish Property="InstallMode" Value="Remove" />
     756                <Publish Property="Progress1" Value="!(loc.MaintenanceTypeDlg_RemoveProgress1)" />
     757                <Publish Property="Progress2" Value="!(loc.MaintenanceTypeDlg_RemoveProgress2)" />
     758                <Publish Event="NewDialog" Value="VBoxVerifyRemoveDlg" />
     759            </Control>
     760
     761            <!-- Build number text drawn left bottom -->
     762            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
     763                <Text Value="[Version_text] $(var.Property_Version)" />
    798764            </Control>
    799765
    800766            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Back)">
    801                 <Publish Event="NewDialog" Value="VBoxMaintenanceWelcomeDlg">1</Publish>
     767                <Publish Event="NewDialog" Value="VBoxMaintenanceWelcomeDlg" />
    802768            </Control>
    803769            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.ButtonText_Next)" />
    804770            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
    805                 <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
     771                <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
    806772            </Control>
    807773            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
    808774            <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="20" Transparent="yes" NoPrefix="yes">
    809                 <Text>!(loc.MaintenanceTypeDlg_SelOption)</Text>
     775                <Text Value="!(loc.MaintenanceTypeDlg_SelOption)" />
    810776            </Control>
    811777            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
    812778            <Control Id="Title" Type="Text" X="15" Y="6" Width="240" Height="15" Transparent="yes" NoPrefix="yes">
    813                 <Text>[DlgTitleFont]!(loc.MaintenanceTypeDlg_Header)</Text>
     779                <Text Value="[DlgTitleFont]!(loc.MaintenanceTypeDlg_Header)" />
    814780            </Control>
    815781            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
    816782            <Control Id="RemoveText" Type="Text" X="105" Y="176" Width="230" Height="20">
    817                 <Text>!(loc.MaintenanceTypeDlg_RemoveText)</Text>
     783                <Text Value="!(loc.MaintenanceTypeDlg_RemoveText)" />
    818784            </Control>
    819785            <Control Id="RepairText" Type="Text" X="105" Y="102" Width="230" Height="30">
    820                 <Text>!(loc.MaintenanceTypeDlg_RepairText)</Text>
     786                <Text Value="!(loc.MaintenanceTypeDlg_RepairText)" />
    821787            </Control>
    822788        </Dialog>
    … …  
    826792        <Dialog Id="VBoxMaintenanceWelcomeDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
    827793            <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
    828                 <Text>{\DlgVerdanaBold13}!(loc.MaintenanceWelcomeDlg_Header)</Text>
    829             </Control>
    830 
    831             <!-- Build number text drawn left bottom -->
    832             <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    833                 <Text>[Version_text] $(var.Property_Version)</Text>
     794                <Text Value="{\DlgVerdanaBold13}!(loc.MaintenanceWelcomeDlg_Header)" />
     795            </Control>
     796
     797            <!-- Build number text drawn left bottom -->
     798            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
     799                <Text Value="[Version_text] $(var.Property_Version)" />
    834800            </Control>
    835801
    836802            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Next)">
    837                 <Publish Event="SpawnWaitDialog" Value="VBoxWaitForCostingDlg">CostingComplete = 1</Publish>
    838                 <Publish Event="NewDialog" Value="VBoxMaintenanceTypeDlg">1</Publish>
     803                <Publish Event="SpawnWaitDialog" Value="VBoxWaitForCostingDlg" Condition="CostingComplete = 1" />
     804                <Publish Event="NewDialog" Value="VBoxMaintenanceTypeDlg" />
    839805            </Control>
    840806            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
    841                 <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
     807                <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
    842808            </Control>
    843809            <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[DialogBitmap]" />
    844810            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.ButtonText_Back)" />
    845811            <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
    846                 <Text>!(loc.MaintenanceWelcomeDlg_Desc)</Text>
     812                <Text Value="!(loc.MaintenanceWelcomeDlg_Desc)" />
    847813            </Control>
    848814            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
    … …  
    854820            <!-- Build number text drawn left bottom -->
    855821            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    856                 <Text>[Version_text] $(var.Property_Version)</Text>
     822                <Text Value="[Version_text] $(var.Property_Version)" />
    857823            </Control>
    858824
    859825            <Control Id="OK" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_OK)">
    860                 <Publish Event="EndDialog" Value="Return">1</Publish>
     826                <Publish Event="EndDialog" Value="Return" />
    861827            </Control>
    862828            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
    863829            <Control Id="Description" Type="Text" X="20" Y="20" Width="280" Height="20" Transparent="yes" NoPrefix="yes">
    864                 <Text>!(loc.OutOfDiskDlg_InstallationExceeds)</Text>
     830                <Text Value="!(loc.OutOfDiskDlg_InstallationExceeds)" />
    865831            </Control>
    866832            <Control Id="Text" Type="Text" X="20" Y="53" Width="330" Height="40">
    867                 <Text>!(loc.OutOfDiskDlg_NotEnoughDiskSpace)</Text>
     833                <Text Value="!(loc.OutOfDiskDlg_NotEnoughDiskSpace)" />
    868834            </Control>
    869835            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
    870836            <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
    871                 <Text>[DlgTitleFont]!(loc.OutOfDiskDlg_OutOfDiskSpace)</Text>
     837                <Text Value="[DlgTitleFont]!(loc.OutOfDiskDlg_OutOfDiskSpace)" />
    872838            </Control>
    873839            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
    874840            <Control Id="VolumeList" Type="VolumeCostList" X="20" Y="100" Width="330" Height="120" Sunken="yes" Fixed="yes" Remote="yes">
    875                 <Text>{120}{70}{70}{70}{70}</Text>
     841                <Text Value="{120}{70}{70}{70}{70}" />
    876842            </Control>
    877843        </Dialog>
    … …  
    879845        <Dialog Id="VBoxOutOfRbDiskDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
    880846            <Control Id="No" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_No)">
    881                 <Publish Event="EndDialog" Value="Return">1</Publish>
     847                <Publish Event="EndDialog" Value="Return" />
    882848            </Control>
    883849            <Control Id="Yes" Type="PushButton" X="240" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Yes)">
    884                 <Publish Event="EnableRollback" Value="False">1</Publish>
    885                 <Publish Event="EndDialog" Value="Return">1</Publish>
     850                <Publish Event="EnableRollback" Value="False" />
     851                <Publish Event="EndDialog" Value="Return" />
    886852            </Control>
    887853            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
    888854            <Control Id="Description" Type="Text" X="20" Y="20" Width="280" Height="20" Transparent="yes" NoPrefix="yes">
    889                 <Text>!(loc.OutOfRbDiskDlg_InstallationExceeds)</Text>
     855                <Text Value="!(loc.OutOfRbDiskDlg_InstallationExceeds)" />
    890856            </Control>
    891857            <Control Id="Text" Type="Text" X="20" Y="53" Width="330" Height="40">
    892                 <Text>!(loc.OutOfRbDiskDlg_NotEnoughDiskSpace)</Text>
     858                <Text Value="!(loc.OutOfRbDiskDlg_NotEnoughDiskSpace)" />
    893859            </Control>
    894860            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
    895861            <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
    896                 <Text>[DlgTitleFont]!(loc.OutOfRbDiskDlg_OutOfDiskSpace)</Text>
     862                <Text Value="[DlgTitleFont]!(loc.OutOfRbDiskDlg_OutOfDiskSpace)" />
    897863            </Control>
    898864            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
    899865            <Control Id="VolumeList" Type="VolumeCostList" X="20" Y="140" Width="330" Height="80" Sunken="yes" Fixed="yes" Remote="yes" ShowRollbackCost="yes">
    900                 <Text>{120}{70}{70}{70}{70}</Text>
     866                <Text Value="{120}{70}{70}{70}{70}" />
    901867            </Control>
    902868            <Control Id="Text2" Type="Text" X="20" Y="94" Width="330" Height="40">
    903                 <Text>!(loc.OutOfRbDiskDlg_Desc)</Text>
     869                <Text Value="!(loc.OutOfRbDiskDlg_Desc)" />
    904870            </Control>
    905871        </Dialog>
    … …  
    909875            <!-- Build number text drawn left bottom -->
    910876            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    911                 <Text>[Version_text] $(var.Property_Version)</Text>
     877                <Text Value="[Version_text] $(var.Property_Version)" />
    912878            </Control>
    913879
    914880            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Back)">
    915                 <Publish Event="NewDialog" Value="VBoxMaintenanceTypeDlg">1</Publish>
     881                <Publish Event="NewDialog" Value="VBoxMaintenanceTypeDlg" />
    916882            </Control>
    917883            <Control Id="Remove" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Remove)">
    918                 <Publish Event="Remove" Value="All"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
    919                 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
    920                 <Publish Event="SpawnDialog" Value="VBoxOutOfRbDiskDlg"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)]]></Publish>
    921                 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"]]></Publish>
    922                 <Publish Event="EnableRollback" Value="False"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"]]></Publish>
    923                 <Publish Event="SpawnDialog" Value="VBoxOutOfDiskDlg"><![CDATA[(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")]]></Publish>
     884                <Publish Event="Remove" Value="All" Condition="OutOfDiskSpace &lt;&gt; 1" />
     885                <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
     886                <Publish Event="SpawnDialog" Value="VBoxOutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
     887                <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
     888                <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
     889                <Publish Event="SpawnDialog" Value="VBoxOutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
    924890            </Control>
    925891            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
    926                 <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
     892                <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
    927893            </Control>
    928894            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
    929895            <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
    930                 <Text>!(loc.VerifyRemoveDlg_Desc)</Text>
     896                <Text Value="!(loc.VerifyRemoveDlg_Desc)" />
    931897            </Control>
    932898            <Control Id="Text" Type="Text" X="25" Y="70" Width="320" Height="30">
    933                 <Text>!(loc.VerifyRemoveDlg_ClickRemove)</Text>
     899                <Text Value="!(loc.VerifyRemoveDlg_ClickRemove)" />
    934900            </Control>
    935901            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
    936902            <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
    937                 <Text>[DlgTitleFont]!(loc.VerifyRemoveDlg_Header)</Text>
     903                <Text Value="[DlgTitleFont]!(loc.VerifyRemoveDlg_Header)" />
    938904            </Control>
    939905            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
    … …  
    942908        <Dialog Id="VBoxVerifyRepairDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes" TrackDiskSpace="yes">
    943909            <Control Id="Repair" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Repair)">
    944                 <Publish Event="ReinstallMode" Value="ecmus"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
    945                 <Publish Event="Reinstall" Value="All"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
    946                 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
    947                 <Publish Event="SpawnDialog" Value="VBoxOutOfRbDiskDlg"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)]]></Publish>
    948                 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"]]></Publish>
    949                 <Publish Event="EnableRollback" Value="False"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"]]></Publish>
    950                 <Publish Event="SpawnDialog" Value="VBoxOutOfDiskDlg"><![CDATA[(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")]]></Publish>
    951             </Control>
    952 
    953             <!-- Build number text drawn left bottom -->
    954             <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
    955                 <Text>[Version_text] $(var.Property_Version)</Text>
     910                <Publish Event="ReinstallMode" Value="ecmus" Condition="OutOfDiskSpace &lt;&gt; 1" />
     911                <Publish Event="Reinstall" Value="All" Condition="OutOfDiskSpace &lt;&gt; 1" />
     912                <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace &lt;&gt; 1" />
     913                <Publish Event="SpawnDialog" Value="VBoxOutOfRbDiskDlg" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST=&quot;P&quot; OR NOT PROMPTROLLBACKCOST)" />
     914                <Publish Event="EndDialog" Value="Return" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
     915                <Publish Event="EnableRollback" Value="False" Condition="OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST=&quot;D&quot;" />
     916                <Publish Event="SpawnDialog" Value="VBoxOutOfDiskDlg" Condition="(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST=&quot;F&quot;)" />
     917            </Control>
     918
     919            <!-- Build number text drawn left bottom -->
     920            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
     921                <Text Value="[Version_text] $(var.Property_Version)" />
    956922            </Control>
    957923
    958924            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
    959                 <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
     925                <Publish Event="SpawnDialog" Value="VBoxCancelDlg" />
    960926            </Control>
    961927            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
    962928            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Back)">
    963                 <Publish Event="NewDialog" Value="VBoxMaintenanceTypeDlg">1</Publish>
     929                <Publish Event="NewDialog" Value="VBoxMaintenanceTypeDlg" />
    964930            </Control>
    965931            <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
    966                 <Text>!(loc.VerifyRepairDlg_ReadyToBegin)</Text>
     932                <Text Value="!(loc.VerifyRepairDlg_ReadyToBegin)" />
    967933            </Control>
    968934            <Control Id="Text" Type="Text" X="25" Y="70" Width="320" Height="30">
    969                 <Text>!(loc.VerifyRepairDlg_ClickRepair)</Text>
     935                <Text Value="!(loc.VerifyRepairDlg_ClickRepair)" />
    970936            </Control>
    971937            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
    972938            <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
    973                 <Text>[DlgTitleFont]!(loc.VerifyRepairDlg_Header)</Text>
     939                <Text Value="[DlgTitleFont]!(loc.VerifyRepairDlg_Header)" />
    974940            </Control>
    975941            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
    … …  
    978944        <Dialog Id="VBoxWaitForCostingDlg" Width="260" Height="85" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
    979945            <Control Id="Return" Type="PushButton" X="102" Y="57" Width="56" Height="17" Default="yes" Cancel="yes" Text="[ButtonText_Return]">
    980                 <Publish Event="EndDialog" Value="Exit">1</Publish>
     946                <Publish Event="EndDialog" Value="Exit" />
    981947            </Control>
    982948            <Control Id="Text" Type="Text" X="48" Y="15" Width="194" Height="30">
    983                 <Text>!(loc.WaitForCostingDlg_PleaseWait)</Text>
     949                <Text Value="!(loc.WaitForCostingDlg_PleaseWait)" />
    984950            </Control>
    985951            <Control Id="Icon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="Exclamation icon" FixedSize="yes" IconSize="32" Text="[ExclamationIcon]" />
    … …  
    987953
    988954        <!-- Dialog property table. -->
    989         <Property Id="ErrorDialog" Value="VBoxErrorDlg"/>
     955        <Property Id="ErrorDialog" Value="VBoxErrorDlg" />
    990956
    991957        <!-- Define some textstyles used for formatting dialog items. -->
    992         <Property Id="DefaultUIFont">DlgFont8</Property>
     958        <Property Id="DefaultUIFont" Value="DlgFont8" />
    993959        <TextStyle Id="DlgFont8" FaceName="Tahoma" Size="8" />
    994960        <TextStyle Id="DlgFontBold8" FaceName="Tahoma" Size="8" Bold="yes" />
    … …  
    1000966        <!-- The UIText table contains the localized versions of some of the strings used in the user interface.
    1001967               These strings are not part of any other table. The UIText table is for strings that have no logical place in any other table. -->
    1002         <ProgressText Action="CostFinalize">!(loc.ProgressTextCostFinalize)</ProgressText>
    1003         <ProgressText Action="CostInitialize">!(loc.ProgressTextCostInitialize)</ProgressText>
    1004         <ProgressText Action="FileCost">!(loc.ProgressTextFileCost)</ProgressText>
    1005         <ProgressText Action="InstallValidate">!(loc.ProgressTextInstallValidate)</ProgressText>
    1006         <ProgressText Action="InstallFiles" Template="File: [1],  Directory: [9],  Size: [6]">!(loc.ProgressTextInstallFiles)</ProgressText>
    1007         <ProgressText Action="InstallAdminPackage" Template="File: [1], Directory: [9], Size: [6]">!(loc.ProgressTextInstallAdminPackage)</ProgressText>
    1008         <ProgressText Action="CreateShortcuts" Template="Shortcut: [1]">!(loc.ProgressTextCreateShortcuts)</ProgressText>
    1009         <ProgressText Action="PublishComponents" Template="Component ID: [1], Qualifier: [2]">!(loc.ProgressTextPublishComponents)</ProgressText>
    1010         <ProgressText Action="PublishFeatures" Template="Feature: [1]">!(loc.ProgressTextPublishFeatures)</ProgressText>
    1011         <ProgressText Action="PublishProduct">!(loc.ProgressTextPublishProduct)</ProgressText>
    1012         <ProgressText Action="RegisterClassInfo" Template="Class Id: [1]">!(loc.ProgressTextRegisterClassInfo)</ProgressText>
    1013         <ProgressText Action="RegisterExtensionInfo" Template="Extension: [1]">!(loc.ProgressTextRegisterExtensionInfo)</ProgressText>
    1014         <ProgressText Action="RegisterMIMEInfo" Template="MIME Content Type: [1], Extension: [2]">!(loc.ProgressTextRegisterMIMEInfo)</ProgressText>
    1015         <ProgressText Action="RegisterProgIdInfo" Template="ProgId: [1]">!(loc.ProgressTextRegisterProgIdInfo)</ProgressText>
    1016         <ProgressText Action="AllocateRegistrySpace" Template="Free space: [1]">!(loc.ProgressTextAllocateRegistrySpace)</ProgressText>
    1017         <ProgressText Action="AppSearch" Template="Property: [1], Signature: [2]">!(loc.ProgressTextAppSearch)</ProgressText>
    1018         <ProgressText Action="BindImage" Template="File: [1]">!(loc.ProgressTextBindImage)</ProgressText>
    1019         <ProgressText Action="CCPSearch">!(loc.ProgressTextCCPSearch)</ProgressText>
    1020         <ProgressText Action="CreateFolders" Template="Folder: [1]">!(loc.ProgressTextCreateFolders)</ProgressText>
    1021         <ProgressText Action="DeleteServices" Template="Service: [1]">!(loc.ProgressTextDeleteServices)</ProgressText>
    1022         <ProgressText Action="DuplicateFiles" Template="File: [1],  Directory: [9],  Size: [6]">!(loc.ProgressTextDuplicateFiles)</ProgressText>
    1023         <ProgressText Action="FindRelatedProducts" Template="Found application: [1]">!(loc.ProgressTextFindRelatedProducts)</ProgressText>
    1024         <ProgressText Action="InstallODBC">!(loc.ProgressTextInstallODBC)</ProgressText>
    1025         <ProgressText Action="InstallServices" Template="Service: [2]">!(loc.ProgressTextInstallServices)</ProgressText>
    1026         <ProgressText Action="LaunchConditions">!(loc.ProgressTextLaunchConditions)</ProgressText>
    1027         <ProgressText Action="MigrateFeatureStates" Template="Application: [1]">!(loc.ProgressTextMigrateFeatureStates)</ProgressText>
    1028         <ProgressText Action="MoveFiles" Template="File: [1],  Directory: [9],  Size: [6]">!(loc.ProgressTextMoveFiles)</ProgressText>
    1029         <ProgressText Action="PatchFiles" Template="File: [1],  Directory: [2],  Size: [3]">!(loc.ProgressTextPatchFiles)</ProgressText>
    1030         <ProgressText Action="ProcessComponents">!(loc.ProgressTextProcessComponents)</ProgressText>
    1031         <ProgressText Action="RegisterComPlus" Template="AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}">!(loc.ProgressTextRegisterComPlus)</ProgressText>
    1032         <ProgressText Action="RegisterFonts" Template="Font: [1]">!(loc.ProgressTextRegisterFonts)</ProgressText>
    1033         <ProgressText Action="RegisterProduct" Template="[1]">!(loc.ProgressTextRegisterProduct)</ProgressText>
    1034         <ProgressText Action="RegisterTypeLibraries" Template="LibID: [1]">!(loc.ProgressTextRegisterTypeLibraries)</ProgressText>
    1035         <ProgressText Action="RegisterUser" Template="[1]">!(loc.ProgressTextRegisterUser)</ProgressText>
    1036         <ProgressText Action="RemoveDuplicateFiles" Template="File: [1], Directory: [9]">!(loc.ProgressTextRemoveDuplicateFiles)</ProgressText>
    1037         <ProgressText Action="RemoveEnvironmentStrings" Template="Name: [1], Value: [2], Action [3]">!(loc.ProgressTextRemoveEnvironmentStrings)</ProgressText>
    1038         <ProgressText Action="RemoveExistingProducts" Template="Application: [1], Command line: [2]">!(loc.ProgressTextRemoveExistingProducts)</ProgressText>
    1039         <ProgressText Action="RemoveFiles" Template="File: [1], Directory: [9]">!(loc.ProgressTextRemoveFiles)</ProgressText>
    1040         <ProgressText Action="RemoveFolders" Template="Folder: [1]">!(loc.ProgressTextRemoveFolders)</ProgressText>
    1041         <ProgressText Action="RemoveIniValues" Template="File: [1],  Section: [2],  Key: [3], Value: [4]">!(loc.ProgressTextRemoveIniValues)</ProgressText>
    1042         <ProgressText Action="RemoveODBC">!(loc.ProgressTextRemoveODBC)</ProgressText>
    1043         <ProgressText Action="RemoveRegistryValues" Template="Key: [1], Name: [2]">!(loc.ProgressTextRemoveRegistryValues)</ProgressText>
    1044         <ProgressText Action="RemoveShortcuts" Template="Shortcut: [1]">!(loc.ProgressTextRemoveShortcuts)</ProgressText>
    1045         <ProgressText Action="RMCCPSearch">!(loc.ProgressTextRMCCPSearch)</ProgressText>
    1046         <ProgressText Action="SelfRegModules" Template="File: [1], Folder: [2]">!(loc.ProgressTextSelfRegModules)</ProgressText>
    1047         <ProgressText Action="SelfUnregModules" Template="File: [1], Folder: [2]">!(loc.ProgressTextSelfUnregModules)</ProgressText>
    1048         <ProgressText Action="SetODBCFolders">!(loc.ProgressTextSetODBCFolders)</ProgressText>
    1049         <ProgressText Action="StartServices" Template="Service: [1]">!(loc.ProgressTextStartServices)</ProgressText>
    1050         <ProgressText Action="StopServices" Template="Service: [1]">!(loc.ProgressTextStopServices)</ProgressText>
    1051         <ProgressText Action="UnpublishComponents" Template="Component ID: [1], Qualifier: [2]">!(loc.ProgressTextUnpublishComponents)</ProgressText>
    1052         <ProgressText Action="UnpublishFeatures" Template="Feature: [1]">!(loc.ProgressTextUnpublishFeatures)</ProgressText>
    1053         <ProgressText Action="UnregisterClassInfo" Template="Class Id: [1]">!(loc.ProgressTextUnregisterClassInfo)</ProgressText>
    1054         <ProgressText Action="UnregisterComPlus" Template="AppId: [1]{{, AppType: [2]}}">!(loc.ProgressTextUnregisterComPlus)</ProgressText>
    1055         <ProgressText Action="UnregisterExtensionInfo" Template="Extension: [1]">!(loc.ProgressTextUnregisterExtensionInfo)</ProgressText>
    1056         <ProgressText Action="UnregisterFonts" Template="Font: [1]">!(loc.ProgressTextUnregisterFonts)</ProgressText>
    1057         <ProgressText Action="UnregisterMIMEInfo" Template="MIME Content Type: [1], Extension: [2]">!(loc.ProgressTextUnregisterMIMEInfo)</ProgressText>
    1058         <ProgressText Action="UnregisterProgIdInfo" Template="ProgId: [1]">!(loc.ProgressTextUnregisterProgIdInfo)</ProgressText>
    1059         <ProgressText Action="UnregisterTypeLibraries" Template="LibID: [1]">!(loc.ProgressTextUnregisterTypeLibraries)</ProgressText>
    1060         <ProgressText Action="WriteEnvironmentStrings" Template="Name: [1], Value: [2], Action [3]">!(loc.ProgressTextWriteEnvironmentStrings)</ProgressText>
    1061         <ProgressText Action="WriteIniValues" Template="File: [1],  Section: [2],  Key: [3], Value: [4]">!(loc.ProgressTextWriteIniValues)</ProgressText>
    1062         <ProgressText Action="WriteRegistryValues" Template="Key: [1], Name: [2], Value: [3]">!(loc.ProgressTextWriteRegistryValues)</ProgressText>
    1063         <ProgressText Action="Advertise">!(loc.ProgressTextAdvertise)</ProgressText>
    1064         <ProgressText Action="GenerateScript" Template="[1]">!(loc.ProgressTextGenerateScript)</ProgressText>
    1065         <ProgressText Action="InstallSFPCatalogFile" Template="File: [1],  Dependencies: [2]">!(loc.ProgressTextInstallSFPCatalogFile)</ProgressText>
    1066         <ProgressText Action="MsiPublishAssemblies" Template="Application Context:[1], Assembly Name:[2]">!(loc.ProgressTextMsiPublishAssemblies)</ProgressText>
    1067         <ProgressText Action="MsiUnpublishAssemblies" Template="Application Context:[1], Assembly Name:[2]">!(loc.ProgressTextMsiUnpublishAssemblies)</ProgressText>
    1068         <ProgressText Action="Rollback" Template="[1]">!(loc.ProgressTextRollback)</ProgressText>
    1069         <ProgressText Action="RollbackCleanup" Template="File: [1]">!(loc.ProgressTextRollbackCleanup)</ProgressText>
    1070         <ProgressText Action="UnmoveFiles" Template="File: [1], Directory: [9]">!(loc.ProgressTextUnmoveFiles)</ProgressText>
    1071         <ProgressText Action="UnpublishProduct">!(loc.ProgressTextUnpublishProduct)</ProgressText>
    1072 
    1073         <UIText Id="bytes">!(loc.UITextbytes)</UIText>
    1074         <UIText Id="GB">!(loc.UITextGB)</UIText>
    1075         <UIText Id="KB">!(loc.UITextKB)</UIText>
    1076         <UIText Id="MB">!(loc.UITextMB)</UIText>
    1077         <UIText Id="AbsentPath"><![CDATA[-]]></UIText>
    1078         <UIText Id="MenuAbsent">!(loc.UITextMenuAbsent)</UIText>
    1079         <UIText Id="MenuAdvertise">!(loc.UITextMenuAdvertise)</UIText>
    1080         <UIText Id="MenuAllCD">!(loc.UITextMenuAllCD)</UIText>
    1081         <UIText Id="MenuAllLocal">!(loc.UITextMenuAllLocal)</UIText>
    1082         <UIText Id="MenuAllNetwork">!(loc.UITextMenuAllNetwork)</UIText>
    1083         <UIText Id="MenuCD">!(loc.UITextMenuCD)</UIText>
    1084         <UIText Id="MenuLocal">!(loc.UITextMenuLocal)</UIText>
    1085         <UIText Id="MenuNetwork">!(loc.UITextMenuNetwork)</UIText>
    1086         <UIText Id="ScriptInProgress">!(loc.UITextScriptInProgress)</UIText>
    1087         <UIText Id="SelAbsentAbsent">!(loc.UITextSelAbsentAbsent)</UIText>
    1088         <UIText Id="SelAbsentAdvertise">!(loc.UITextSelAbsentAdvertise)</UIText>
    1089         <UIText Id="SelAbsentCD">!(loc.UITextSelAbsentCD)</UIText>
    1090         <UIText Id="SelAbsentLocal">!(loc.UITextSelAbsentLocal)</UIText>
    1091         <UIText Id="SelAbsentNetwork">!(loc.UITextSelAbsentNetwork)</UIText>
    1092         <UIText Id="SelAdvertiseAbsent">!(loc.UITextSelAdvertiseAbsent)</UIText>
    1093         <UIText Id="SelAdvertiseAdvertise">!(loc.UITextSelAdvertiseAdvertise)</UIText>
    1094         <UIText Id="SelAdvertiseCD">!(loc.UITextSelAdvertiseCD)</UIText>
    1095         <UIText Id="SelAdvertiseLocal">!(loc.UITextSelAdvertiseLocal)</UIText>
    1096         <UIText Id="SelAdvertiseNetwork">!(loc.UITextSelAdvertiseNetwork)</UIText>
    1097         <UIText Id="SelCDAbsent">!(loc.UITextSelCDAbsent)</UIText>
    1098         <UIText Id="SelCDAdvertise">!(loc.UITextSelCDAdvertise)</UIText>
    1099         <UIText Id="SelCDCD">!(loc.UITextSelCDCD)</UIText>
    1100         <UIText Id="SelCDLocal">!(loc.UITextSelCDLocal)</UIText>
    1101         <UIText Id="SelChildCostNeg">!(loc.UITextSelChildCostNeg)</UIText>
    1102         <UIText Id="SelChildCostPos">!(loc.UITextSelChildCostPos)</UIText>
    1103         <UIText Id="SelCostPending">!(loc.UITextSelCostPending)</UIText>
    1104         <UIText Id="SelLocalAbsent">!(loc.UITextSelLocalAbsent)</UIText>
    1105         <UIText Id="SelLocalAdvertise">!(loc.UITextSelLocalAdvertise)</UIText>
    1106         <UIText Id="SelLocalCD">!(loc.UITextSelLocalCD)</UIText>
    1107         <UIText Id="SelLocalLocal">!(loc.UITextSelLocalLocal)</UIText>
    1108         <UIText Id="SelLocalNetwork">!(loc.UITextSelLocalNetwork)</UIText>
    1109         <UIText Id="SelNetworkAbsent">!(loc.UITextSelNetworkAbsent)</UIText>
    1110         <UIText Id="SelNetworkAdvertise">!(loc.UITextSelNetworkAdvertise)</UIText>
    1111         <UIText Id="SelNetworkLocal">!(loc.UITextSelNetworkLocal)</UIText>
    1112         <UIText Id="SelNetworkNetwork">!(loc.UITextSelNetworkNetwork)</UIText>
    1113         <UIText Id="SelParentCostNegNeg">!(loc.UITextSelParentCostNegNeg)</UIText>
    1114         <UIText Id="SelParentCostNegPos">!(loc.UITextSelParentCostNegPos)</UIText>
    1115         <UIText Id="SelParentCostPosNeg">!(loc.UITextSelParentCostPosNeg)</UIText>
    1116         <UIText Id="SelParentCostPosPos">!(loc.UITextSelParentCostPosPos)</UIText>
    1117         <UIText Id="TimeRemaining">!(loc.UITextTimeRemaining)</UIText>
    1118         <UIText Id="VolumeCostAvailable">!(loc.UITextVolumeCostAvailable)</UIText>
    1119         <UIText Id="VolumeCostDifference">!(loc.UITextVolumeCostDifference)</UIText>
    1120         <UIText Id="VolumeCostRequired">!(loc.UITextVolumeCostRequired)</UIText>
    1121         <UIText Id="VolumeCostSize">!(loc.UITextVolumeCostSize)</UIText>
    1122         <UIText Id="VolumeCostVolume">!(loc.UITextVolumeCostVolume)</UIText>
     968        <ProgressText Action="CostFinalize" Message="!(loc.ProgressTextCostFinalize)" />
     969        <ProgressText Action="CostInitialize" Message="!(loc.ProgressTextCostInitialize)" />
     970        <ProgressText Action="FileCost" Message="!(loc.ProgressTextFileCost)" />
     971        <ProgressText Action="InstallValidate" Message="!(loc.ProgressTextInstallValidate)" />
     972        <ProgressText Action="InstallFiles" Template="File: [1],  Directory: [9],  Size: [6]" Message="!(loc.ProgressTextInstallFiles)" />
     973        <ProgressText Action="InstallAdminPackage" Template="File: [1], Directory: [9], Size: [6]" Message="!(loc.ProgressTextInstallAdminPackage)" />
     974        <ProgressText Action="CreateShortcuts" Template="Shortcut: [1]" Message="!(loc.ProgressTextCreateShortcuts)" />
     975        <ProgressText Action="PublishComponents" Template="Component ID: [1], Qualifier: [2]" Message="!(loc.ProgressTextPublishComponents)" />
     976        <ProgressText Action="PublishFeatures" Template="Feature: [1]" Message="!(loc.ProgressTextPublishFeatures)" />
     977        <ProgressText Action="PublishProduct" Message="!(loc.ProgressTextPublishProduct)" />
     978        <ProgressText Action="RegisterClassInfo" Template="Class Id: [1]" Message="!(loc.ProgressTextRegisterClassInfo)" />
     979        <ProgressText Action="RegisterExtensionInfo" Template="Extension: [1]" Message="!(loc.ProgressTextRegisterExtensionInfo)" />
     980        <ProgressText Action="RegisterMIMEInfo" Template="MIME Content Type: [1], Extension: [2]" Message="!(loc.ProgressTextRegisterMIMEInfo)" />
     981        <ProgressText Action="RegisterProgIdInfo" Template="ProgId: [1]" Message="!(loc.ProgressTextRegisterProgIdInfo)" />
     982        <ProgressText Action="AllocateRegistrySpace" Template="Free space: [1]" Message="!(loc.ProgressTextAllocateRegistrySpace)" />
     983        <ProgressText Action="AppSearch" Template="Property: [1], Signature: [2]" Message="!(loc.ProgressTextAppSearch)" />
     984        <ProgressText Action="BindImage" Template="File: [1]" Message="!(loc.ProgressTextBindImage)" />
     985        <ProgressText Action="CCPSearch" Message="!(loc.ProgressTextCCPSearch)" />
     986        <ProgressText Action="CreateFolders" Template="Folder: [1]" Message="!(loc.ProgressTextCreateFolders)" />
     987        <ProgressText Action="DeleteServices" Template="Service: [1]" Message="!(loc.ProgressTextDeleteServices)" />
     988        <ProgressText Action="DuplicateFiles" Template="File: [1],  Directory: [9],  Size: [6]" Message="!(loc.ProgressTextDuplicateFiles)" />
     989        <ProgressText Action="FindRelatedProducts" Template="Found application: [1]" Message="!(loc.ProgressTextFindRelatedProducts)" />
     990        <ProgressText Action="InstallODBC" Message="!(loc.ProgressTextInstallODBC)" />
     991        <ProgressText Action="InstallServices" Template="Service: [2]" Message="!(loc.ProgressTextInstallServices)" />
     992        <ProgressText Action="LaunchConditions" Message="!(loc.ProgressTextLaunchConditions)" />
     993        <ProgressText Action="MigrateFeatureStates" Template="Application: [1]" Message="!(loc.ProgressTextMigrateFeatureStates)" />
     994        <ProgressText Action="MoveFiles" Template="File: [1],  Directory: [9],  Size: [6]" Message="!(loc.ProgressTextMoveFiles)" />
     995        <ProgressText Action="PatchFiles" Template="File: [1],  Directory: [2],  Size: [3]" Message="!(loc.ProgressTextPatchFiles)" />
     996        <ProgressText Action="ProcessComponents" Message="!(loc.ProgressTextProcessComponents)" />
     997        <ProgressText Action="RegisterComPlus" Template="AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" Message="!(loc.ProgressTextRegisterComPlus)" />
     998        <ProgressText Action="RegisterFonts" Template="Font: [1]" Message="!(loc.ProgressTextRegisterFonts)" />
     999        <ProgressText Action="RegisterProduct" Template="[1]" Message="!(loc.ProgressTextRegisterProduct)" />
     1000        <ProgressText Action="RegisterTypeLibraries" Template="LibID: [1]" Message="!(loc.ProgressTextRegisterTypeLibraries)" />
     1001        <ProgressText Action="RegisterUser" Template="[1]" Message="!(loc.ProgressTextRegisterUser)" />
     1002        <ProgressText Action="RemoveDuplicateFiles" Template="File: [1], Directory: [9]" Message="!(loc.ProgressTextRemoveDuplicateFiles)" />
     1003        <ProgressText Action="RemoveEnvironmentStrings" Template="Name: [1], Value: [2], Action [3]" Message="!(loc.ProgressTextRemoveEnvironmentStrings)" />
     1004        <ProgressText Action="RemoveExistingProducts" Template="Application: [1], Command line: [2]" Message="!(loc.ProgressTextRemoveExistingProducts)" />
     1005        <ProgressText Action="RemoveFiles" Template="File: [1], Directory: [9]" Message="!(loc.ProgressTextRemoveFiles)" />
     1006        <ProgressText Action="RemoveFolders" Template="Folder: [1]" Message="!(loc.ProgressTextRemoveFolders)" />
     1007        <ProgressText Action="RemoveIniValues" Template="File: [1],  Section: [2],  Key: [3], Value: [4]" Message="!(loc.ProgressTextRemoveIniValues)" />
     1008        <ProgressText Action="RemoveODBC" Message="!(loc.ProgressTextRemoveODBC)" />
     1009        <ProgressText Action="RemoveRegistryValues" Template="Key: [1], Name: [2]" Message="!(loc.ProgressTextRemoveRegistryValues)" />
     1010        <ProgressText Action="RemoveShortcuts" Template="Shortcut: [1]" Message="!(loc.ProgressTextRemoveShortcuts)" />
     1011        <ProgressText Action="RMCCPSearch" Message="!(loc.ProgressTextRMCCPSearch)" />
     1012        <ProgressText Action="SelfRegModules" Template="File: [1], Folder: [2]" Message="!(loc.ProgressTextSelfRegModules)" />
     1013        <ProgressText Action="SelfUnregModules" Template="File: [1], Folder: [2]" Message="!(loc.ProgressTextSelfUnregModules)" />
     1014        <ProgressText Action="SetODBCFolders" Message="!(loc.ProgressTextSetODBCFolders)" />
     1015        <ProgressText Action="StartServices" Template="Service: [1]" Message="!(loc.ProgressTextStartServices)" />
     1016        <ProgressText Action="StopServices" Template="Service: [1]" Message="!(loc.ProgressTextStopServices)" />
     1017        <ProgressText Action="UnpublishComponents" Template="Component ID: [1], Qualifier: [2]" Message="!(loc.ProgressTextUnpublishComponents)" />
     1018        <ProgressText Action="UnpublishFeatures" Template="Feature: [1]" Message="!(loc.ProgressTextUnpublishFeatures)" />
     1019        <ProgressText Action="UnregisterClassInfo" Template="Class Id: [1]" Message="!(loc.ProgressTextUnregisterClassInfo)" />
     1020        <ProgressText Action="UnregisterComPlus" Template="AppId: [1]{{, AppType: [2]}}" Message="!(loc.ProgressTextUnregisterComPlus)" />
     1021        <ProgressText Action="UnregisterExtensionInfo" Template="Extension: [1]" Message="!(loc.ProgressTextUnregisterExtensionInfo)" />
     1022        <ProgressText Action="UnregisterFonts" Template="Font: [1]" Message="!(loc.ProgressTextUnregisterFonts)" />
     1023        <ProgressText Action="UnregisterMIMEInfo" Template="MIME Content Type: [1], Extension: [2]" Message="!(loc.ProgressTextUnregisterMIMEInfo)" />
     1024        <ProgressText Action="UnregisterProgIdInfo" Template="ProgId: [1]" Message="!(loc.ProgressTextUnregisterProgIdInfo)" />
     1025        <ProgressText Action="UnregisterTypeLibraries" Template="LibID: [1]" Message="!(loc.ProgressTextUnregisterTypeLibraries)" />
     1026        <ProgressText Action="WriteEnvironmentStrings" Template="Name: [1], Value: [2], Action [3]" Message="!(loc.ProgressTextWriteEnvironmentStrings)" />
     1027        <ProgressText Action="WriteIniValues" Template="File: [1],  Section: [2],  Key: [3], Value: [4]" Message="!(loc.ProgressTextWriteIniValues)" />
     1028        <ProgressText Action="WriteRegistryValues" Template="Key: [1], Name: [2], Value: [3]" Message="!(loc.ProgressTextWriteRegistryValues)" />
     1029        <ProgressText Action="Advertise" Message="!(loc.ProgressTextAdvertise)" />
     1030        <ProgressText Action="GenerateScript" Template="[1]" Message="!(loc.ProgressTextGenerateScript)" />
     1031        <ProgressText Action="InstallSFPCatalogFile" Template="File: [1],  Dependencies: [2]" Message="!(loc.ProgressTextInstallSFPCatalogFile)" />
     1032        <ProgressText Action="MsiPublishAssemblies" Template="Application Context:[1], Assembly Name:[2]" Message="!(loc.ProgressTextMsiPublishAssemblies)" />
     1033        <ProgressText Action="MsiUnpublishAssemblies" Template="Application Context:[1], Assembly Name:[2]" Message="!(loc.ProgressTextMsiUnpublishAssemblies)" />
     1034        <ProgressText Action="Rollback" Template="[1]" Message="!(loc.ProgressTextRollback)" />
     1035        <ProgressText Action="RollbackCleanup" Template="File: [1]" Message="!(loc.ProgressTextRollbackCleanup)" />
     1036        <ProgressText Action="UnmoveFiles" Template="File: [1], Directory: [9]" Message="!(loc.ProgressTextUnmoveFiles)" />
     1037        <ProgressText Action="UnpublishProduct" Message="!(loc.ProgressTextUnpublishProduct)" />
     1038
     1039        <UIText Id="bytes" Value="!(loc.UITextbytes)" />
     1040        <UIText Id="GB" Value="!(loc.UITextGB)" />
     1041        <UIText Id="KB" Value="!(loc.UITextKB)" />
     1042        <UIText Id="MB" Value="!(loc.UITextMB)" />
     1043        <UIText Id="AbsentPath" Value="-" />
     1044        <UIText Id="MenuAbsent" Value="!(loc.UITextMenuAbsent)" />
     1045        <UIText Id="MenuAdvertise" Value="!(loc.UITextMenuAdvertise)" />
     1046        <UIText Id="MenuAllCD" Value="!(loc.UITextMenuAllCD)" />
     1047        <UIText Id="MenuAllLocal" Value="!(loc.UITextMenuAllLocal)" />
     1048        <UIText Id="MenuAllNetwork" Value="!(loc.UITextMenuAllNetwork)" />
     1049        <UIText Id="MenuCD" Value="!(loc.UITextMenuCD)" />
     1050        <UIText Id="MenuLocal" Value="!(loc.UITextMenuLocal)" />
     1051        <UIText Id="MenuNetwork" Value="!(loc.UITextMenuNetwork)" />
     1052        <UIText Id="ScriptInProgress" Value="!(loc.UITextScriptInProgress)" />
     1053        <UIText Id="SelAbsentAbsent" Value="!(loc.UITextSelAbsentAbsent)" />
     1054        <UIText Id="SelAbsentAdvertise" Value="!(loc.UITextSelAbsentAdvertise)" />
     1055        <UIText Id="SelAbsentCD" Value="!(loc.UITextSelAbsentCD)" />
     1056        <UIText Id="SelAbsentLocal" Value="!(loc.UITextSelAbsentLocal)" />
     1057        <UIText Id="SelAbsentNetwork" Value="!(loc.UITextSelAbsentNetwork)" />
     1058        <UIText Id="SelAdvertiseAbsent" Value="!(loc.UITextSelAdvertiseAbsent)" />
     1059        <UIText Id="SelAdvertiseAdvertise" Value="!(loc.UITextSelAdvertiseAdvertise)" />
     1060        <UIText Id="SelAdvertiseCD" Value="!(loc.UITextSelAdvertiseCD)" />
     1061        <UIText Id="SelAdvertiseLocal" Value="!(loc.UITextSelAdvertiseLocal)" />
     1062        <UIText Id="SelAdvertiseNetwork" Value="!(loc.UITextSelAdvertiseNetwork)" />
     1063        <UIText Id="SelCDAbsent" Value="!(loc.UITextSelCDAbsent)" />
     1064        <UIText Id="SelCDAdvertise" Value="!(loc.UITextSelCDAdvertise)" />
     1065        <UIText Id="SelCDCD" Value="!(loc.UITextSelCDCD)" />
     1066        <UIText Id="SelCDLocal" Value="!(loc.UITextSelCDLocal)" />
     1067        <UIText Id="SelChildCostNeg" Value="!(loc.UITextSelChildCostNeg)" />
     1068        <UIText Id="SelChildCostPos" Value="!(loc.UITextSelChildCostPos)" />
     1069        <UIText Id="SelCostPending" Value="!(loc.UITextSelCostPending)" />
     1070        <UIText Id="SelLocalAbsent" Value="!(loc.UITextSelLocalAbsent)" />
     1071        <UIText Id="SelLocalAdvertise" Value="!(loc.UITextSelLocalAdvertise)" />
     1072        <UIText Id="SelLocalCD" Value="!(loc.UITextSelLocalCD)" />
     1073        <UIText Id="SelLocalLocal" Value="!(loc.UITextSelLocalLocal)" />
     1074        <UIText Id="SelLocalNetwork" Value="!(loc.UITextSelLocalNetwork)" />
     1075        <UIText Id="SelNetworkAbsent" Value="!(loc.UITextSelNetworkAbsent)" />
     1076        <UIText Id="SelNetworkAdvertise" Value="!(loc.UITextSelNetworkAdvertise)" />
     1077        <UIText Id="SelNetworkLocal" Value="!(loc.UITextSelNetworkLocal)" />
     1078        <UIText Id="SelNetworkNetwork" Value="!(loc.UITextSelNetworkNetwork)" />
     1079        <UIText Id="SelParentCostNegNeg" Value="!(loc.UITextSelParentCostNegNeg)" />
     1080        <UIText Id="SelParentCostNegPos" Value="!(loc.UITextSelParentCostNegPos)" />
     1081        <UIText Id="SelParentCostPosNeg" Value="!(loc.UITextSelParentCostPosNeg)" />
     1082        <UIText Id="SelParentCostPosPos" Value="!(loc.UITextSelParentCostPosPos)" />
     1083        <UIText Id="TimeRemaining" Value="!(loc.UITextTimeRemaining)" />
     1084        <UIText Id="VolumeCostAvailable" Value="!(loc.UITextVolumeCostAvailable)" />
     1085        <UIText Id="VolumeCostDifference" Value="!(loc.UITextVolumeCostDifference)" />
     1086        <UIText Id="VolumeCostRequired" Value="!(loc.UITextVolumeCostRequired)" />
     1087        <UIText Id="VolumeCostSize" Value="!(loc.UITextVolumeCostSize)" />
     1088        <UIText Id="VolumeCostVolume" Value="!(loc.UITextVolumeCostVolume)" />
    11231089
    11241090        <!-- Own error messages -->
    1125         <Error Id="25001">!(loc.Error25001)</Error>
     1091        <Error Id="25001" Message="!(loc.Error25001)" />
    11261092
    11271093        <!-- The text used in front of the build number -->
    1128         <Property Id="Version_text">Version</Property>
     1094        <Property Id="Version_text" Value="Version" />
    11291095
    11301096        <!-- Define an alias for the font to be used in dialogs -->
    1131         <Property Id="DlgTitleFont">{&amp;DlgFontBold8}</Property>
     1097        <Property Id="DlgTitleFont" Value="{&amp;DlgFontBold8}" />
    11321098
    11331099        <!-- This property preselects the "Don't agree" radio button in the license page -->
    1134         <Property Id="IAgree">No</Property>
     1100        <Property Id="IAgree" Value="No" />
    11351101
    11361102        <!-- Icon files used for the UI -->
    … …  
    11481114
    11491115        <!-- Aliases for the graphic files -->
    1150         <Property Id="InfoIcon">infoico</Property>
    1151         <Property Id="ExclamationIcon">exclico</Property>
    1152         <Property Id="RemoveIcon">removico</Property>
    1153         <Property Id="RepairIcon">repairic</Property>
    1154         <Property Id="DialogBitmap">dlgjpg</Property>
    1155         <Property Id="BannerBitmap">bannerjpg</Property>
    1156         <Property Id="FolderUp">folderupico</Property>
    1157         <Property Id="FolderNew">foldernewico</Property>
     1116        <Property Id="InfoIcon" Value="infoico" />
     1117        <Property Id="ExclamationIcon" Value="exclico" />
     1118        <Property Id="RemoveIcon" Value="removico" />
     1119        <Property Id="RepairIcon" Value="repairic" />
     1120        <Property Id="DialogBitmap" Value="dlgjpg" />
     1121        <Property Id="BannerBitmap" Value="bannerjpg" />
     1122        <Property Id="FolderUp" Value="folderupico" />
     1123        <Property Id="FolderNew" Value="foldernewico" />
    11581124
    11591125        <!-- Property which defines if we need to show the customization dialog or not.
    11601126             We only show the dialog on new installs to let the users choose the components to install. -->
    1161         <Property Id="VBOX_SHOW_CUSTOMIZE_DLG">
    1162             <![CDATA[((PREVIOUSVERSIONSINSTALLED OR NEWERVERSIONDETECTED) OR ((NOT PREVIOUSVERSIONSINSTALLED) AND (NOT NEWERVERSIONDETECTED)))]]>
    1163         </Property>
     1127        <Property Id="VBOX_SHOW_CUSTOMIZE_DLG" Value="((PREVIOUSVERSIONSINSTALLED OR NEWERVERSIONDETECTED) OR ((NOT PREVIOUSVERSIONSINSTALLED) AND (NOT NEWERVERSIONDETECTED)))" />
    11641128<?if $(env.VBOX_WITH_LICENSE_DISPLAY) = "yes" ?>
    11651129        <!-- Property which defines whether the license dialog will be shown or not. -->
    1166         <Property Id="VBOX_SHOW_LICENSE_DLG">1</Property>
     1130        <Property Id="VBOX_SHOW_LICENSE_DLG" Value="1" />
    11671131<?endif?>
    11681132<?if $(env.VBOX_WITH_SERIALNUMBER_INSTALL) = "yes2" ?>
    11691133        <!-- Property which defines whether the installer checks the serial number or not. -->
    1170         <Property Id="VBOX_SHOW_SERIAL_CHECK_DLG">1</Property>
     1134        <Property Id="VBOX_SHOW_SERIAL_CHECK_DLG" Value="1" />
    11711135<?endif?>
    11721136<?if $(env.VBOX_WITH_QTGUI) = "no" ?>
    … …  
    11741138             dialog only is needed for GUI-based options, so skip if we either don't ship FE/Qt or don't show
    11751139             the (first) customization dialog. -->
    1176         <Property Id="VBOX_SHOW_CUSTOMIZE2_DLG"><![CDATA[VBOX_SHOW_CUSTOMIZE_DLG]]></Property>
     1140        <Property Id="VBOX_SHOW_CUSTOMIZE2_DLG" Value="VBOX_SHOW_CUSTOMIZE_DLG" />
    11771141<?endif?>
    11781142
    … …  
    11901154        <!-- Note: All values except 0 and "" (empty string) are interpreted as TRUE. -->
    11911155
    1192         <Publish Dialog="VBoxWelcomeDlg" Control="Next" Event="NewDialog" Value="VBoxLicenseAgreementDlg"><![CDATA[VBOX_SHOW_LICENSE_DLG]]></Publish>
    1193         <Publish Dialog="VBoxWelcomeDlg" Control="Next" Event="NewDialog" Value="VBoxCheckSerialDlg"><![CDATA[(NOT VBOX_SHOW_LICENSE_DLG) AND VBOX_SHOW_SERIAL_CHECK_DLG]]></Publish>
    1194         <Publish Dialog="VBoxWelcomeDlg" Control="Next" Event="NewDialog" Value="VBoxCustomizeDlg"><![CDATA[VBOX_SHOW_CUSTOMIZE_DLG AND (NOT VBOX_SHOW_LICENSE_DLG) AND (NOT VBOX_SHOW_SERIAL_CHECK_DLG)]]></Publish>
    1195         <Publish Dialog="VBoxWelcomeDlg" Control="Next" Event="NewDialog" Value="VBoxVerifyReadyDlg"><![CDATA[NOT VBOX_SHOW_CUSTOMIZE_DLG AND (NOT VBOX_SHOW_LICENSE_DLG) AND (NOT VBOX_SHOW_SERIAL_CHECK_DLG)]]></Publish>
    1196 
    1197         <Publish Dialog="VBoxLicenseAgreementDlg" Control="Next" Event="NewDialog" Value="VBoxCheckSerialDlg"><![CDATA[VBOX_SHOW_SERIAL_CHECK_DLG]]></Publish>
    1198         <Publish Dialog="VBoxLicenseAgreementDlg" Control="Next" Event="NewDialog" Value="VBoxCustomizeDlg"><![CDATA[(NOT VBOX_SHOW_SERIAL_CHECK_DLG) AND (VBOX_SHOW_CUSTOMIZE_DLG)]]></Publish>
    1199         <Publish Dialog="VBoxLicenseAgreementDlg" Control="Next" Event="NewDialog" Value="VBoxVerifyReadyDlg"><![CDATA[(NOT VBOX_SHOW_SERIAL_CHECK_DLG) AND (NOT VBOX_SHOW_CUSTOMIZE_DLG)]]></Publish>
    1200         <Publish Dialog="VBoxLicenseAgreementDlg" Control="Back" Event="NewDialog" Value="VBoxWelcomeDlg">1</Publish>
    1201 
    1202         <Publish Dialog="VBoxCheckSerialDlg" Control="Back" Event="NewDialog" Value="VBoxLicenseAgreementDlg"><![CDATA[VBOX_SHOW_LICENSE_DLG]]></Publish>
    1203         <Publish Dialog="VBoxCheckSerialDlg" Control="Back" Event="NewDialog" Value="VBoxWelcomeDlg"><![CDATA[NOT VBOX_SHOW_LICENSE_DLG]]></Publish>
    1204         <Publish Dialog="VBoxCheckSerialDlg" Control="Next" Event="DoAction" Value="ca_CheckSerial" Order="1">1</Publish>
    1205         <Publish Dialog="VBoxCheckSerialDlg" Control="Next" Event="NewDialog" Value="VBoxCustomizeDlg"><![CDATA[(PREVIOUSVERSIONSINSTALLED OR NEWERVERSIONDETECTED) AND (VBOX_SERIAL_IS_VALID="1")]]></Publish>
    1206         <Publish Dialog="VBoxCheckSerialDlg" Control="Next" Event="NewDialog" Value="VBoxCustomizeDlg"><![CDATA[(NOT PREVIOUSVERSIONSINSTALLED) AND (NOT NEWERVERSIONDETECTED) AND (VBOX_SERIAL_IS_VALID="1")]]></Publish>
    1207         <Publish Dialog="VBoxCheckSerialDlg" Control="Next" Event="NewDialog" Value="VBoxWrongSerialDlg"><![CDATA[VBOX_SERIAL_IS_VALID="0"]]></Publish>
    1208 
    1209         <Publish Dialog="VBoxWrongSerialDlg" Control="Back" Event="NewDialog" Value="VBoxCheckSerialDlg">1</Publish>
    1210 
    1211         <Publish Dialog="VBoxBrowseDlg" Control="OK" Event="SetTargetPath" Value="[VBOX_TARGET_DIR]" Order="1">1</Publish>
    1212         <Publish Dialog="VBoxBrowseDlg" Control="OK" Event="EndDialog" Value="Return" Order="2">1</Publish>
    1213         <Publish Dialog="VBoxBrowseDlg" Control="Cancel" Event="Reset" Value="0" Order="1">1</Publish>
    1214         <Publish Dialog="VBoxBrowseDlg" Control="Cancel" Event="EndDialog" Value="Return" Order="2">1</Publish>
    1215 
    1216         <Publish Dialog="VBoxInvalidTargetDirDlg" Control="Back" Event="NewDialog" Value="VBoxCustomizeDlg">1</Publish>
     1156        <Publish Dialog="VBoxWelcomeDlg" Control="Next" Event="NewDialog" Value="VBoxLicenseAgreementDlg" Condition="VBOX_SHOW_LICENSE_DLG" />
     1157        <Publish Dialog="VBoxWelcomeDlg" Control="Next" Event="NewDialog" Value="VBoxCheckSerialDlg" Condition="(NOT VBOX_SHOW_LICENSE_DLG) AND VBOX_SHOW_SERIAL_CHECK_DLG" />
     1158        <Publish Dialog="VBoxWelcomeDlg" Control="Next" Event="NewDialog" Value="VBoxCustomizeDlg" Condition="VBOX_SHOW_CUSTOMIZE_DLG AND (NOT VBOX_SHOW_LICENSE_DLG) AND (NOT VBOX_SHOW_SERIAL_CHECK_DLG)" />
     1159        <Publish Dialog="VBoxWelcomeDlg" Control="Next" Event="NewDialog" Value="VBoxVerifyReadyDlg" Condition="NOT VBOX_SHOW_CUSTOMIZE_DLG AND (NOT VBOX_SHOW_LICENSE_DLG) AND (NOT VBOX_SHOW_SERIAL_CHECK_DLG)" />
     1160
     1161        <Publish Dialog="VBoxLicenseAgreementDlg" Control="Next" Event="NewDialog" Value="VBoxCheckSerialDlg" Condition="VBOX_SHOW_SERIAL_CHECK_DLG" />
     1162        <Publish Dialog="VBoxLicenseAgreementDlg" Control="Next" Event="NewDialog" Value="VBoxCustomizeDlg" Condition="(NOT VBOX_SHOW_SERIAL_CHECK_DLG) AND (VBOX_SHOW_CUSTOMIZE_DLG)" />
     1163        <Publish Dialog="VBoxLicenseAgreementDlg" Control="Next" Event="NewDialog" Value="VBoxVerifyReadyDlg" Condition="(NOT VBOX_SHOW_SERIAL_CHECK_DLG) AND (NOT VBOX_SHOW_CUSTOMIZE_DLG)" />
     1164        <Publish Dialog="VBoxLicenseAgreementDlg" Control="Back" Event="NewDialog" Value="VBoxWelcomeDlg" />
     1165
     1166        <Publish Dialog="VBoxCheckSerialDlg" Control="Back" Event="NewDialog" Value="VBoxLicenseAgreementDlg" Condition="VBOX_SHOW_LICENSE_DLG" />
     1167        <Publish Dialog="VBoxCheckSerialDlg" Control="Back" Event="NewDialog" Value="VBoxWelcomeDlg" Condition="NOT VBOX_SHOW_LICENSE_DLG" />
     1168        <Publish Dialog="VBoxCheckSerialDlg" Control="Next" Event="DoAction" Value="ca_CheckSerial" Order="1" />
     1169        <Publish Dialog="VBoxCheckSerialDlg" Control="Next" Event="NewDialog" Value="VBoxCustomizeDlg" Condition="(PREVIOUSVERSIONSINSTALLED OR NEWERVERSIONDETECTED) AND (VBOX_SERIAL_IS_VALID=&quot;1&quot;)" />
     1170        <Publish Dialog="VBoxCheckSerialDlg" Control="Next" Event="NewDialog" Value="VBoxCustomizeDlg" Condition="(NOT PREVIOUSVERSIONSINSTALLED) AND (NOT NEWERVERSIONDETECTED) AND (VBOX_SERIAL_IS_VALID=&quot;1&quot;)" />
     1171        <Publish Dialog="VBoxCheckSerialDlg" Control="Next" Event="NewDialog" Value="VBoxWrongSerialDlg" Condition="VBOX_SERIAL_IS_VALID=&quot;0&quot;" />
     1172
     1173        <Publish Dialog="VBoxWrongSerialDlg" Control="Back" Event="NewDialog" Value="VBoxCheckSerialDlg" />
     1174
     1175        <Publish Dialog="VBoxBrowseDlg" Control="OK" Event="SetTargetPath" Value="[VBOX_TARGET_DIR]" Order="1" />
     1176        <Publish Dialog="VBoxBrowseDlg" Control="OK" Event="EndDialog" Value="Return" Order="2" />
     1177        <Publish Dialog="VBoxBrowseDlg" Control="Cancel" Event="Reset" Value="0" Order="1" />
     1178        <Publish Dialog="VBoxBrowseDlg" Control="Cancel" Event="EndDialog" Value="Return" Order="2" />
     1179
     1180        <Publish Dialog="VBoxInvalidTargetDirDlg" Control="Back" Event="NewDialog" Value="VBoxCustomizeDlg" />
    12171181
    12181182        <!-- Note:  We have to set (1) or unset ({}) the properties first (see order #), as those will be needed for further routing.
    … …  
    12211185        <!-- Check if the chosen installation directory turned out to be invalid by calling our installation helper DLL
    12221186             and performing a custom action. See @bugref{10616} -->
    1223         <Publish Dialog="VBoxCustomizeDlg" Control="Next" Event="DoAction" Value="ca_CheckTargetDirPre" Order="1">1</Publish>
    1224         <Publish Dialog="VBoxCustomizeDlg" Control="Next" Property="VBOX_SHOW_INVALID_TARGET_DLG" Value="1" Order="2"><![CDATA[VBox_Target_Dir_Is_Valid="0"]]></Publish>
    1225         <Publish Dialog="VBoxCustomizeDlg" Control="Next" Property="VBOX_SHOW_INVALID_TARGET_DLG" Value="{}" Order="3"><![CDATA[VBox_Target_Dir_Is_Valid="1"]]></Publish>
    1226         <Publish Dialog="VBoxCustomizeDlg" Control="Next" Property="VBOX_SHOW_WARN_PYTHONAPI_DLG" Value="1" Order="4"><![CDATA[(&VBoxPython=3) AND (VBOX_PYTHON_DEPS_INSTALLED="0")]]></Publish>
    1227         <Publish Dialog="VBoxCustomizeDlg" Control="Next" Property="VBOX_SHOW_WARN_PYTHONAPI_DLG" Value="{}" Order="5"><![CDATA[(&VBoxPython<3)]]></Publish>
    1228         <Publish Dialog="VBoxCustomizeDlg" Control="Next" Property="VBOX_SHOW_WARN_DISCONNECTIFACES_DLG" Value="1" Order="6"><![CDATA[&VBoxNetworkFlt=3]]></Publish>
    1229         <Publish Dialog="VBoxCustomizeDlg" Control="Next" Property="VBOX_SHOW_WARN_DISCONNECTIFACES_DLG" Value="{}" Order="7"><![CDATA[&VBoxNetworkFlt<3]]></Publish>
     1187        <Publish Dialog="VBoxCustomizeDlg" Control="Next" Event="DoAction" Value="ca_CheckTargetDirPre" Order="1" />
     1188        <Publish Dialog="VBoxCustomizeDlg" Control="Next" Property="VBOX_SHOW_INVALID_TARGET_DLG" Value="1" Order="2" Condition="VBox_Target_Dir_Is_Valid=&quot;0&quot;" />
     1189        <Publish Dialog="VBoxCustomizeDlg" Control="Next" Property="VBOX_SHOW_INVALID_TARGET_DLG" Value="{}" Order="3" Condition="VBox_Target_Dir_Is_Valid=&quot;1&quot;" />
     1190        <Publish Dialog="VBoxCustomizeDlg" Control="Next" Property="VBOX_SHOW_WARN_PYTHONAPI_DLG" Value="1" Order="4" Condition="(&amp;VBoxPython=3) AND (VBOX_PYTHON_DEPS_INSTALLED=&quot;0&quot;)" />
     1191        <Publish Dialog="VBoxCustomizeDlg" Control="Next" Property="VBOX_SHOW_WARN_PYTHONAPI_DLG" Value="{}" Order="5" Condition="(&amp;VBoxPython&lt;3)" />
     1192        <Publish Dialog="VBoxCustomizeDlg" Control="Next" Property="VBOX_SHOW_WARN_DISCONNECTIFACES_DLG" Value="1" Order="6" Condition="&amp;VBoxNetworkFlt=3" />
     1193        <Publish Dialog="VBoxCustomizeDlg" Control="Next" Property="VBOX_SHOW_WARN_DISCONNECTIFACES_DLG" Value="{}" Order="7" Condition="&amp;VBoxNetworkFlt&lt;3" />
    12301194
    12311195        <!-- Show an error dialog if the chosen installation directory was found to be invalid. See @bugref{10616} -->
    1232         <Publish Dialog="VBoxCustomizeDlg" Control="Next" Event="NewDialog" Value="VBoxInvalidTargetDirDlg" Order="10"><![CDATA[VBOX_SHOW_INVALID_TARGET_DLG]]></Publish>
    1233         <Publish Dialog="VBoxCustomizeDlg" Control="Next" Event="NewDialog" Value="VBoxWarnDisconNetIfacesDlg" Order="20"><![CDATA[VBOX_SHOW_WARN_DISCONNECTIFACES_DLG and (NOT VBOX_SHOW_INVALID_TARGET_DLG)]]></Publish>
    1234         <Publish Dialog="VBoxCustomizeDlg" Control="Next" Event="NewDialog" Value="VBoxWarnPythonDlg" Order="30"><![CDATA[VBOX_SHOW_WARN_PYTHONAPI_DLG AND (NOT VBOX_SHOW_WARN_DISCONNECTIFACES_DLG) AND (NOT VBOX_SHOW_INVALID_TARGET_DLG)]]></Publish>
     1196        <Publish Dialog="VBoxCustomizeDlg" Control="Next" Event="NewDialog" Value="VBoxInvalidTargetDirDlg" Order="10" Condition="VBOX_SHOW_INVALID_TARGET_DLG" />
     1197        <Publish Dialog="VBoxCustomizeDlg" Control="Next" Event="NewDialog" Value="VBoxWarnDisconNetIfacesDlg" Order="20" Condition="VBOX_SHOW_WARN_DISCONNECTIFACES_DLG and (NOT VBOX_SHOW_INVALID_TARGET_DLG)" />
     1198        <Publish Dialog="VBoxCustomizeDlg" Control="Next" Event="NewDialog" Value="VBoxWarnPythonDlg" Order="30" Condition="VBOX_SHOW_WARN_PYTHONAPI_DLG AND (NOT VBOX_SHOW_WARN_DISCONNECTIFACES_DLG) AND (NOT VBOX_SHOW_INVALID_TARGET_DLG)" />
    12351199        <!-- Only allow going to the next stage if the chosen installation directory is valid. See @bugref{10616} -->
    1236         <Publish Dialog="VBoxCustomizeDlg" Control="Next" Event="NewDialog" Value="VBoxCustomize2Dlg" Order="40"><![CDATA[VBOX_SHOW_CUSTOMIZE2_DLG AND (NOT VBOX_SHOW_WARN_DISCONNECTIFACES_DLG) AND (NOT VBOX_SHOW_WARN_PYTHONAPI_DLG) AND (NOT VBOX_SHOW_INVALID_TARGET_DLG)]]></Publish>
    1237         <Publish Dialog="VBoxCustomizeDlg" Control="Next" Event="NewDialog" Value="VBoxVerifyReadyDlg" Order="50"><![CDATA[(NOT VBOX_SHOW_CUSTOMIZE2_DLG) AND (NOT VBOX_SHOW_WARN_DISCONNECTIFACES_DLG) AND (NOT VBOX_SHOW_WARN_PYTHONAPI_DLG)]]></Publish>
    1238         <Publish Dialog="VBoxCustomizeDlg" Control="Back" Event="NewDialog" Value="VBoxCheckSerialDlg"><![CDATA[VBOX_SHOW_SERIAL_CHECK_DLG]]></Publish>
    1239         <Publish Dialog="VBoxCustomizeDlg" Control="Back" Event="NewDialog" Value="VBoxLicenseAgreementDlg"><![CDATA[NOT VBOX_SHOW_SERIAL_CHECK_DLG AND VBOX_SHOW_LICENSE_DLG]]></Publish>
    1240         <Publish Dialog="VBoxCustomizeDlg" Control="Back" Event="NewDialog" Value="VBoxWelcomeDlg"><![CDATA[NOT VBOX_SHOW_SERIAL_CHECK_DLG AND NOT VBOX_SHOW_LICENSE_DLG]]></Publish>
    1241 
    1242         <Publish Dialog="VBoxWarnDisconNetIfacesDlg" Control="Next" Event="NewDialog" Value="VBoxVerifyReadyDlg"><![CDATA[(NOT VBOX_SHOW_CUSTOMIZE2_DLG) AND (NOT VBOX_SHOW_WARN_PYTHONAPI_DLG)]]></Publish>
    1243         <Publish Dialog="VBoxWarnDisconNetIfacesDlg" Control="Next" Event="NewDialog" Value="VBoxCustomize2Dlg"><![CDATA[VBOX_SHOW_CUSTOMIZE2_DLG AND (NOT VBOX_SHOW_WARN_PYTHONAPI_DLG)]]></Publish>
    1244         <Publish Dialog="VBoxWarnDisconNetIfacesDlg" Control="Next" Event="NewDialog" Value="VBoxWarnPythonDlg"><![CDATA[VBOX_SHOW_WARN_PYTHONAPI_DLG]]></Publish>
     1200        <Publish Dialog="VBoxCustomizeDlg" Control="Next" Event="NewDialog" Value="VBoxCustomize2Dlg" Order="40" Condition="VBOX_SHOW_CUSTOMIZE2_DLG AND (NOT VBOX_SHOW_WARN_DISCONNECTIFACES_DLG) AND (NOT VBOX_SHOW_WARN_PYTHONAPI_DLG) AND (NOT VBOX_SHOW_INVALID_TARGET_DLG)" />
     1201        <Publish Dialog="VBoxCustomizeDlg" Control="Next" Event="NewDialog" Value="VBoxVerifyReadyDlg" Order="50" Condition="(NOT VBOX_SHOW_CUSTOMIZE2_DLG) AND (NOT VBOX_SHOW_WARN_DISCONNECTIFACES_DLG) AND (NOT VBOX_SHOW_WARN_PYTHONAPI_DLG)" />
     1202        <Publish Dialog="VBoxCustomizeDlg" Control="Back" Event="NewDialog" Value="VBoxCheckSerialDlg" Condition="VBOX_SHOW_SERIAL_CHECK_DLG" />
     1203        <Publish Dialog="VBoxCustomizeDlg" Control="Back" Event="NewDialog" Value="VBoxLicenseAgreementDlg" Condition="NOT VBOX_SHOW_SERIAL_CHECK_DLG AND VBOX_SHOW_LICENSE_DLG" />
     1204        <Publish Dialog="VBoxCustomizeDlg" Control="Back" Event="NewDialog" Value="VBoxWelcomeDlg" Condition="NOT VBOX_SHOW_SERIAL_CHECK_DLG AND NOT VBOX_SHOW_LICENSE_DLG" />
     1205
     1206        <Publish Dialog="VBoxWarnDisconNetIfacesDlg" Control="Next" Event="NewDialog" Value="VBoxVerifyReadyDlg" Condition="(NOT VBOX_SHOW_CUSTOMIZE2_DLG) AND (NOT VBOX_SHOW_WARN_PYTHONAPI_DLG)" />
     1207        <Publish Dialog="VBoxWarnDisconNetIfacesDlg" Control="Next" Event="NewDialog" Value="VBoxCustomize2Dlg" Condition="VBOX_SHOW_CUSTOMIZE2_DLG AND (NOT VBOX_SHOW_WARN_PYTHONAPI_DLG)" />
     1208        <Publish Dialog="VBoxWarnDisconNetIfacesDlg" Control="Next" Event="NewDialog" Value="VBoxWarnPythonDlg" Condition="VBOX_SHOW_WARN_PYTHONAPI_DLG" />
    12451209        <!-- Note: VBoxWarnDisconNetIfacesDlg only has a "Cancel" button which aborts the installation. -->
    12461210
    1247         <Publish Dialog="VBoxWarnPythonDlg" Control="Next" Event="NewDialog" Value="VBoxCustomize2Dlg"><![CDATA[VBOX_SHOW_CUSTOMIZE2_DLG]]></Publish>
    1248         <Publish Dialog="VBoxWarnPythonDlg" Control="Next" Event="NewDialog" Value="VBoxVerifyReadyDlg"><![CDATA[NOT VBOX_SHOW_CUSTOMIZE2_DLG]]></Publish>
     1211        <Publish Dialog="VBoxWarnPythonDlg" Control="Next" Event="NewDialog" Value="VBoxCustomize2Dlg" Condition="VBOX_SHOW_CUSTOMIZE2_DLG" />
     1212        <Publish Dialog="VBoxWarnPythonDlg" Control="Next" Event="NewDialog" Value="VBoxVerifyReadyDlg" Condition="NOT VBOX_SHOW_CUSTOMIZE2_DLG" />
    12491213        <!-- Note: VBoxWarnPythonDlg only has a "Cancel" button which aborts the installation. -->
    12501214
    1251         <Publish Dialog="VBoxCustomize2Dlg" Control="Back" Event="NewDialog" Value="VBoxCustomizeDlg">1</Publish>
    1252         <Publish Dialog="VBoxCustomize2Dlg" Control="Next" Event="NewDialog" Value="VBoxVerifyReadyDlg">1</Publish>
    1253 
    1254         <Publish Dialog="VBoxVerifyReadyDlg" Control="Back" Event="NewDialog" Value="VBoxCustomize2Dlg"><![CDATA[VBOX_SHOW_CUSTOMIZE2_DLG]]></Publish>
    1255         <Publish Dialog="VBoxVerifyReadyDlg" Control="Back" Event="NewDialog" Value="VBoxCustomizeDlg"><![CDATA[NOT VBOX_SHOW_CUSTOMIZE2_DLG]]></Publish>
    1256         <Publish Dialog="VBoxVerifyReadyDlg" Control="Next" Event="NewDialog" Value="VBoxVerifyReadyDlg">1</Publish>
     1215        <Publish Dialog="VBoxCustomize2Dlg" Control="Back" Event="NewDialog" Value="VBoxCustomizeDlg" />
     1216        <Publish Dialog="VBoxCustomize2Dlg" Control="Next" Event="NewDialog" Value="VBoxVerifyReadyDlg" />
     1217
     1218        <Publish Dialog="VBoxVerifyReadyDlg" Control="Back" Event="NewDialog" Value="VBoxCustomize2Dlg" Condition="VBOX_SHOW_CUSTOMIZE2_DLG" />
     1219        <Publish Dialog="VBoxVerifyReadyDlg" Control="Back" Event="NewDialog" Value="VBoxCustomizeDlg" Condition="NOT VBOX_SHOW_CUSTOMIZE2_DLG" />
     1220        <Publish Dialog="VBoxVerifyReadyDlg" Control="Next" Event="NewDialog" Value="VBoxVerifyReadyDlg" />
    12571221
    12581222        <!-- This defines the order in which the GUI panels will be shown to the user. -->
    … …  
    12621226            <Custom Action="ca_IsMSCRTInstalled" After="AppSearch" />
    12631227<?endif?>
    1264             <Custom Action="ca_CheckTargetDirPre" After="AppSearch"/> <!-- Required for launch conditions. See @bugref{10616} -->
    1265             <Custom Action="ca_OriginalTargetDir" After="FileCost"><![CDATA[(NOT INSTALLDIR) AND (NOT EXISTINGINSTALLDIR)]]></Custom>
    1266             <Custom Action="ca_DefaultTargetDir" After="FileCost"><![CDATA[NOT Installed AND (NOT INSTALLDIR) AND EXISTINGINSTALLDIR]]></Custom>
     1228            <Custom Action="ca_CheckTargetDirPre" After="AppSearch" /> <!-- Required for launch conditions. See @bugref{10616} -->
     1229            <Custom Action="ca_OriginalTargetDir" After="FileCost" Condition="(NOT INSTALLDIR) AND (NOT EXISTINGINSTALLDIR)" />
     1230            <Custom Action="ca_DefaultTargetDir" After="FileCost" Condition="NOT Installed AND (NOT INSTALLDIR) AND EXISTINGINSTALLDIR" />
    12671231            <Custom Action="ca_IsWindows10" After="CostFinalize" />
    12681232
    … …  
    12701234            <!-- Check for the Python core package and other dependencies first.
    12711235                 The install helper code will set the public properties VBOX_PYTHON_INSTALLED / VBOX_PYTHON_DEPS_INSTALLED. -->
    1272             <Custom Action="ca_IsPythonInstalled" After="CostFinalize">1</Custom>
    1273             <Custom Action="ca_ArePythonAPIDepsInstalled" After="CostFinalize">1</Custom>
     1236            <Custom Action="ca_IsPythonInstalled" After="CostFinalize" Condition="1" />
     1237            <Custom Action="ca_ArePythonAPIDepsInstalled" After="CostFinalize" Condition="1" />
    12741238<?endif?>
    1275             <FindRelatedProducts Suppress="no">1</FindRelatedProducts>
     1239            <FindRelatedProducts Suppress="no" Condition="1" />
    12761240
    12771241            <Show Dialog="VBoxFatalErrorDlg" OnExit="error" />
    12781242            <Show Dialog="VBoxUserExitDlg" OnExit="cancel" />
    12791243            <Show Dialog="VBoxPrepareDlg" After="LaunchConditions" />
    1280             <Show Dialog="VBoxWelcomeDlg" After="MigrateFeatureStates">NOT Installed</Show>
    1281             <Show Dialog="VBoxResumeDlg" After="VBoxWelcomeDlg">Installed AND (RESUME OR Preselected)</Show>
    1282             <Show Dialog="VBoxMaintenanceWelcomeDlg" After="VBoxResumeDlg">Installed AND (NOT RESUME) AND (NOT Preselected)</Show>
    1283             <Show Dialog="VBoxExitDlg" OnExit="success">1</Show>
     1244            <Show Dialog="VBoxWelcomeDlg" After="MigrateFeatureStates" Condition="NOT Installed" />
     1245            <Show Dialog="VBoxResumeDlg" After="VBoxWelcomeDlg" Condition="Installed AND (RESUME OR Preselected)" />
     1246            <Show Dialog="VBoxMaintenanceWelcomeDlg" After="VBoxResumeDlg" Condition="Installed AND (NOT RESUME) AND (NOT Preselected)" />
     1247            <Show Dialog="VBoxExitDlg" OnExit="success" Condition="1" />
    12841248            <Show Dialog="VBoxProgressDlg" After="VBoxMaintenanceWelcomeDlg" />
    12851249
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette