Branch: Tag:

2008-07-16

2008-07-16 10:29:43 by Martin Stjernholm <mast@lysator.liu.se>

Some fixes to comply with more modern WiX 2.0 schema.

Rev: server/etc/RoxenUI.wxs:1.43

1010:    <Text>{\VSI_MS_Shell_Dlg13.0_0_0}MsiRadioButtonGroup</Text>    </Control>    </Dialog> -  <RadioGroup Property="AdminMaintenanceForm_Action"> +  <RadioButtonGroup Property="AdminMaintenanceForm_Action">    <RadioButton Text="{\VSI_MS_Sans_Serif13.0_0_0}&amp;Repair [ProductName]" X="0" Y="0" Width="348" Height="17">Repair</RadioButton>    <RadioButton Text="{\VSI_MS_Sans_Serif13.0_0_0}Re&amp;move [ProductName]" X="0" Y="18" Width="348" Height="17">Remove</RadioButton> -  </RadioGroup> -  <RadioGroup Property="MaintenanceForm_Action"> +  </RadioButtonGroup> +  <RadioButtonGroup Property="MaintenanceForm_Action">    <RadioButton Text="{\VSI_MS_Sans_Serif13.0_0_0}&amp;Repair [ProductName]" X="0" Y="0" Width="348" Height="17">Repair</RadioButton>    <RadioButton Text="{\VSI_MS_Sans_Serif13.0_0_0}Re&amp;move [ProductName]" X="0" Y="18" Width="348" Height="17">Remove</RadioButton> -  </RadioGroup> -  <RadioGroup Property="FolderForm_AllUsers"> +  </RadioButtonGroup> +  <RadioButtonGroup Property="FolderForm_AllUsers">    <RadioButton Text="{\VSI_MS_Sans_Serif13.0_0_0}&amp;Everyone" X="0" Y="0" Width="342" Height="17">ALL</RadioButton>    <RadioButton Text="{\VSI_MS_Sans_Serif13.0_0_0}Just &amp;me" X="0" Y="18" Width="342" Height="17">ME</RadioButton> -  </RadioGroup> -  <RadioGroup Property="INSTALLATION_TYPE"> +  </RadioButtonGroup> +  <RadioButtonGroup Property="INSTALLATION_TYPE">    <RadioButton Text="{\VSI_MS_Sans_Serif13.0_0_0}Custom" X="0" Y="0" Width="348" Height="17">1</RadioButton>    <RadioButton Text="{\VSI_MS_Sans_Serif13.0_0_0}Typical" X="0" Y="24" Width="348" Height="17">2</RadioButton> -  </RadioGroup> -  <RadioGroup Property="START_SERVER"> +  </RadioButtonGroup> +  <RadioButtonGroup Property="START_SERVER">    <RadioButton Text="{\VSI_MS_Sans_Serif13.0_0_0}Yes" X="0" Y="0" Width="348" Height="17">1</RadioButton>    <RadioButton Text="{\VSI_MS_Sans_Serif13.0_0_0}No" X="0" Y="24" Width="348" Height="17">0</RadioButton> -  </RadioGroup> -  <RadioGroup Property="INSTALL_SERVICE"> +  </RadioButtonGroup> +  <RadioButtonGroup Property="INSTALL_SERVICE">    <RadioButton Text="{\VSI_MS_Sans_Serif13.0_0_0}Yes" X="0" Y="0" Width="348" Height="17">1</RadioButton>    <RadioButton Text="{\VSI_MS_Sans_Serif13.0_0_0}No" X="0" Y="24" Width="348" Height="17">0</RadioButton> -  </RadioGroup> +  </RadioButtonGroup>    <ComboBox Property="SERVER_PROTOCOL"> -  <ListItem Id="http" /> -  <ListItem Id="https" /> +  <ListItem Value="http" /> +  <ListItem Value="https" />    </ComboBox>    <TextStyle Id="VSI_MS_Sans_Serif13.0_0_0" FaceName="MS Sans Serif" Size="9" Red="0" Green="0" Blue="0" />    <TextStyle Id="VSI_MS_Sans_Serif16.0_1_0" FaceName="MS Sans Serif" Size="12" Red="0" Green="0" Blue="0" Bold="yes" />
1164:    </Property>    <Property Id="OLDCONFIGDIR">    <DirectorySearch Id="OLDCONFIGURATIONS" Path="[TARGETDIR]configurations"> -  <FileSearch Name="Global_Variables" MinSize="128" /> +  <FileSearch LongName="Global_Variables" MinSize="128" />    </DirectorySearch>    </Property>    <AdminExecuteSequence>