--- a/sbsv2/raptor/util/install-windows/raptorinstallerscript.nsi	Wed Jul 28 13:20:46 2010 +0100
+++ b/sbsv2/raptor/util/install-windows/raptorinstallerscript.nsi	Thu Aug 12 09:00:16 2010 +0100
@@ -13,6 +13,10 @@
 # Description: 
 # Raptor installer/uninstaller script
 
+# Set compression type - the advice in the NSIS user manual 
+# is to have this at the top of the main .nsi file.
+SetCompressor /SOLID lzma
+
 # Standard NSIS Library includes 
 !include "MUI2.nsh"
 !include "LogicLib.nsh"
@@ -77,6 +81,7 @@
 ShowInstDetails show
 
 ##################### Pages in the installer #####################
+!define MUI_WELCOMEPAGE_TITLE_3LINES
 !insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_LICENSE ${RAPTOR_LOCATION}\license.txt
 !define MUI_PAGE_HEADER_TEXT "Installation type"
@@ -84,6 +89,7 @@
 !define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirLeave # Directory page exit function - disallow spaces in $INSTDIR
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
+!define MUI_FINISHPAGE_TITLE_3LINES
 !insertmacro MUI_PAGE_FINISH
 
 ######################## .onInit function ########################
@@ -107,9 +113,11 @@
     SetOutPath "$INSTDIR\lib"
     File /r /x distribution.policy.s60 ${RAPTOR_LOCATION}\lib\*.*
     SetOutPath "$INSTDIR\python"
-    File /r /x distribution.policy.s60 ${RAPTOR_LOCATION}\python\*.*
+    File /r /x distribution.policy.s60 /x *.pyc /x *.pydevproject /x *.project ${RAPTOR_LOCATION}\python\*.*
     SetOutPath "$INSTDIR\schema"
     File /r /x distribution.policy.s60 ${RAPTOR_LOCATION}\schema\*.*
+    SetOutPath "$INSTDIR\style"
+    File /r /x distribution.policy.s60 ${RAPTOR_LOCATION}\style\*.*
     SetOutPath "$INSTDIR\win32\bin"
     File /r /x distribution.policy.s60 ${RAPTOR_LOCATION}\win32\bin\*.*
     SetOutPath "$INSTDIR\win32\bv"
@@ -200,7 +208,6 @@
     ${EndUnless}
 	
 	# Write the uninstaller
-	# WriteUninstaller "$INSTDIR\${UNINSTALLER_FILENAME}"
 	WriteUninstaller "$INSTDIR\${UNINSTALLER_FILENAME}"
 	# Unload registry plug in
 	${registry::Unload}
@@ -320,9 +327,11 @@
 ShowUninstDetails show
 
 #################### Pages in the uninstaller ####################
+!define MUI_WELCOMEPAGE_TITLE_3LINES
 !insertmacro MUI_UNPAGE_WELCOME
 !insertmacro MUI_UNPAGE_CONFIRM
 !insertmacro MUI_UNPAGE_INSTFILES
+!define MUI_FINISHPAGE_TITLE_3LINES
 !insertmacro MUI_UNPAGE_FINISH
 
 ################## Sections in the uninstaller ##################
@@ -334,6 +343,7 @@
     RmDir /r $INSTDIR\lib
     RmDir /r $INSTDIR\python
     RmDir /r $INSTDIR\schema
+    RmDir /r $INSTDIR\style
     RmDir /r $INSTDIR\win32
     Delete $INSTDIR\RELEASE-NOTES.html
     RmDir /r $INSTDIR\notes