Merge lp:~mandel/ubuntuone-windows-installer/remove_installer_options into lp:ubuntuone-windows-installer/beta

[Manuel de la Peña]

Removes the use of the Mondo UI to use the minimal one.

[Rodrigo Moya (rodrigo-moya)]

review: Approve

[John Lenton (chipaca)]

the directory change is good also. I'm assuming we don't care about the upgrade from the old dir to the new?

review: Approve

[Manuel de la Peña (mandel)]

> the directory change is good also. I'm assuming we don't care about the
> upgrade from the old dir to the new?
I do not expect issues since during the upgrade the user will not be allow to change the path.

=== modified file 'install/UbuntuOne.wxs'
--- install/UbuntuOne.wxs	2010-09-01 14:47:21 +0000
+++ install/UbuntuOne.wxs	2010-09-01 14:47:21 +0000
@@ -63,7 +63,7 @@
                 </Directory>
             </Directory>
 			<Directory Id="ProgramFilesFolder" 
-			           Name="PFiles"> 
+			           Name="ProgramFilesFolder"> 
 				<Directory Id="Canonical" 
 				           Name="Canonical">
 					<Directory Id="U1Installdir" 
@@ -1086,9 +1086,8 @@
             <ComponentRef Id="Msvcp90Component" />
             <ComponentRef Id="Msvcr90Component" />
 		</Feature>
-		
-		<!-- Provide the UI extensions to be used -->
-		<UIRef Id="WixUI_Mondo" />
+        
+        <UIRef Id="WixUI_Minimal"/>
 		<UIRef Id="WixUI_ErrorProgressText" />
 		
 		<!-- UI settings, to be defined by the design team -->