From 62b99aca7e2e7bb2d4ecaa6dfed75a3f8e17b2a9 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 20 Jan 2012 18:26:01 +0000
Subject: [PATCH]

---
 fluidbook/compile/script.nsi                        | 10 ++++++++--
 inc/ws/Util/packager/class.ws.packager.win.inst.php |  6 +++---
 swf/_src/WSComposer.as3proj                         | 11 ++++++++---
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/fluidbook/compile/script.nsi b/fluidbook/compile/script.nsi
index ad0a7caec..b949d9dee 100644
--- a/fluidbook/compile/script.nsi
+++ b/fluidbook/compile/script.nsi
@@ -2,14 +2,16 @@
 
 ;--------------------------------
 
+!define FLUIDBOOKNAME "$name"
+
 ; The name of the installer
-Name "$name"
+Name "${FLUIDBOOKNAME}"
 
 ; The file to write
 OutFile "$output"
 
 ; The default installation directory
-InstallDir $DESKTOP\$fname
+InstallDir $PROGRAMFILES\$fname
 
 ; Request application privileges for Windows Vista
 RequestExecutionLevel user
@@ -44,6 +46,10 @@ Section "" ;No components page, name is not important
   ; Put file there
   File /r "$fdir\*"
   
+  ; Create shortcut
+  CreateShortCut "$SMPROGRAMS\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "" "$INSTDIR\data\fluidbook.ico"
+  CreateShortCut "$DESKTOP\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "" "$INSTDIR\data\fluidbook.ico"
+  
   ExecShell "" "$INSTDIR\$fname.exe"
   
 SectionEnd ; end the section
diff --git a/inc/ws/Util/packager/class.ws.packager.win.inst.php b/inc/ws/Util/packager/class.ws.packager.win.inst.php
index a08fff41f..59feaeeb1 100644
--- a/inc/ws/Util/packager/class.ws.packager.win.inst.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.inst.php
@@ -37,9 +37,9 @@ class wsPackagerWinINST extends wsPackagerWinEXE {
 		$nsi = str_replace('$lang', utf8_decode($lang->nsis), $nsi);
 		$nsi = str_replace('$nsisdir', '/usr/local/nsis/nsis-2.46/share/nsis', $nsi);
 		$nsi = str_replace('$output', $this->getPathBase('exe'), $nsi);
-		$favicon = WS_COMPILE_ASSETS . '/fluidbook.ico';
-		if ($this->theme->parametres->favicon != '') {
-			$favicon = $this->vdir . '/data/fluidbook.ico';
+		$favicon = $this->vdir . '/data/fluidbook.ico';
+		if ($this->theme->parametres->favicon == '') {
+			copy(WS_COMPILE_ASSETS . '/fluidbook.ico',$favicon);
 		}
 		$nsi = str_replace('$favicon', $favicon, $nsi);
 
diff --git a/swf/_src/WSComposer.as3proj b/swf/_src/WSComposer.as3proj
index eec8e4494..1d933204d 100644
--- a/swf/_src/WSComposer.as3proj
+++ b/swf/_src/WSComposer.as3proj
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project>
+<project version="2">
   <!-- Output SWF options -->
   <output>
-    <movie disabled="False" />
+    <movie outputType="Application" />
     <movie input="" />
     <movie path="..\composer.swf" />
     <movie fps="45" />
     <movie width="1400" />
     <movie height="900" />
     <movie version="10" />
+    <movie minorVersion="0" />
+    <movie platform="Flash Player" />
     <movie background="#FFFFFF" />
   </output>
   <!-- Other classes to be compiled into your SWF -->
@@ -24,6 +26,7 @@
     <option locale="" />
     <option loadConfig="" />
     <option optimize="True" />
+    <option omitTraces="True" />
     <option showActionScriptWarnings="True" />
     <option showBindingWarnings="True" />
     <option showInvalidCSS="True" />
@@ -39,7 +42,7 @@
     <option staticLinkRSL="True" />
     <option additional="" />
     <option compilerConstants="" />
-    <option customSDK="" />
+    <option minorVersion="" />
   </build>
   <!-- SWC Include Libraries -->
   <includeLibraries>
@@ -90,4 +93,6 @@
     <option showHiddenPaths="False" />
     <option testMovie="Default" />
   </options>
+  <!-- Plugin storage -->
+  <storage />
 </project>
\ No newline at end of file
-- 
2.39.5