Index: ui.wxs
===================================================================
RCS file: /cvs/cvsnt/installer/ui.wxs,v
retrieving revision 1.1.2.7.4.49
diff -c -r1.1.2.7.4.49 ui.wxs
*** ui.wxs	21 Sep 2012 23:18:05 -0000	1.1.2.7.4.49
--- ui.wxs	27 Sep 2012 04:55:48 -0000
***************
*** 909,936 ****
          </Control>
                  <Control Type="Text" Transparent="yes" Id="Advert1" Width="375" Height="23" X="49" Y="124" Hidden="yes" >
                      <Text>Coming soon: a community support forum for people using CVS Suite to manage change in their teams.</Text>
                      <Condition Action="show">NOT Installed</Condition>
                  </Control>
!                 <Control Type="CheckBox" Id="SubscribeCheckbox" Width="134" Height="17" X="34" Y="101" CheckBoxValue="1" Hidden="yes" Property="SUBSCRIBE_ME">
                      <Text>Subscribe to the community discussion forum</Text>
                      <Condition Action="show">NOT Installed</Condition>
                  </Control>
                  <Control Type="CheckBox" Id="ContactMeCheckbox" Width="198" Height="17" X="34" Y="158" CheckBoxValue="1" Hidden="yes" Property="CONTACT_ME">
                      <Text>Have a sales person contact</Text>
                      <Condition Action="show">NOT Installed</Condition>
                  </Control>
                  <Control Type="Text" Transparent="yes" Id="Advert2" Width="375" Height="47" X="49" Y="176" Hidden="yes" >
                      <Text>March Hare Software provide quality tested feature builds, service level agreements, support and training.   See CVS Suite on the web for more information about Visual Studio integration, graphical clients, multi-site repository replication and more.</Text>
                      <Condition Action="show">NOT Installed</Condition>
                  </Control>
!                 <Control Type="Text" Transparent="yes" Id="EmailPrompt" Width="184" Height="17" X="38" Y="135" Hidden="yes" >
!                     <Text>Please enter your contact email address</Text>
                      <Condition Action="show">NOT Installed</Condition>
                  </Control>
!                 <Control Type="Edit" Id="email" Width="232" Height="15" X="56" Y="154" Property="CONTACT_EMAIL"  Hidden="yes" >
                      <Condition Action="show">NOT Installed</Condition>
                  </Control>
!         <Control Id="Buttons" Type="RadioButtonGroup" X="56" Y="349" Width="215" Height="36" Property="xAgreeAdv" />
        </Dialog>
        <Dialog Id="VerifyReadyDlg" Width="500" Height="404" Title="[ProductName] [Setup]" NoMinimize="yes" TrackDiskSpace="yes">
          <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="500" Height="404" TabSkip="no" Text="[DialogSoolinBitmap]" />
--- 909,954 ----
          </Control>
                  <Control Type="Text" Transparent="yes" Id="Advert1" Width="375" Height="23" X="49" Y="124" Hidden="yes" >
                      <Text>Coming soon: a community support forum for people using CVS Suite to manage change in their teams.</Text>
+ <?if $(var.TESTING)=1 ?>
                      <Condition Action="show">NOT Installed</Condition>
+ <?endif?>
                  </Control>
!                 <Control Type="CheckBox" Id="SubscribeCheckbox" Width="200" Height="17" X="34" Y="101" CheckBoxValue="1" Hidden="yes" Property="SUBSCRIBE_ME">
                      <Text>Subscribe to the community discussion forum</Text>
+ <?if $(var.TESTING)=1 ?>
                      <Condition Action="show">NOT Installed</Condition>
+ <?endif?>
                  </Control>
                  <Control Type="CheckBox" Id="ContactMeCheckbox" Width="198" Height="17" X="34" Y="158" CheckBoxValue="1" Hidden="yes" Property="CONTACT_ME">
                      <Text>Have a sales person contact</Text>
+ <?if $(var.TESTING)=1 ?>
                      <Condition Action="show">NOT Installed</Condition>
+ <?endif?>
                  </Control>
                  <Control Type="Text" Transparent="yes" Id="Advert2" Width="375" Height="47" X="49" Y="176" Hidden="yes" >
                      <Text>March Hare Software provide quality tested feature builds, service level agreements, support and training.   See CVS Suite on the web for more information about Visual Studio integration, graphical clients, multi-site repository replication and more.</Text>
+ <?if $(var.TRIAL)=1 ?>
                      <Condition Action="show">NOT Installed</Condition>
+ <?endif?>
                  </Control>
! <?if $(var.TRIAL)=0 ?>
!                 <Control Type="Text" Transparent="yes" Id="EmailDesc" Width="184" Height="38" X="49" Y="135" Hidden="yes" >
!                     <Text>The installer can automatically download your license and register your software.  The email address you supply is not used for any marketing purposes, it is only used to find your license key and register your software.</Text>
                      <Condition Action="show">NOT Installed</Condition>
                  </Control>
! <?endif?>
!                 <Control Type="Text" Transparent="yes" Id="EmailPrompt" Width="184" Height="17" X="88" Y="135" Hidden="yes" >
!                     <Text>Enter your organization or contact email address</Text>
                      <Condition Action="show">NOT Installed</Condition>
                  </Control>
!                 <Control Type="Edit" Id="email" Width="232" Height="15" X="106" Y="154" Property="CONTACT_EMAIL"  Hidden="yes" >
!                     <Condition Action="show">NOT Installed</Condition>
!                 </Control>
!         <Control Id="Buttons" Type="RadioButtonGroup" X="56" Y="349" Width="215" Height="36" Property="xAgreeAdv" Hidden="yes" >
! <?if $(var.TRIAL)=1 ?>
!           <Condition Action="show">NOT Installed</Condition>
! <?endif?>
!         </Control>
        </Dialog>
        <Dialog Id="VerifyReadyDlg" Width="500" Height="404" Title="[ProductName] [Setup]" NoMinimize="yes" TrackDiskSpace="yes">
          <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="500" Height="404" TabSkip="no" Text="[DialogSoolinBitmap]" />