(no commit message)

diff --git a/fluidbook/compile/script.nsi b/fluidbook/compile/script.nsi
index ad0a7caec984d6773f0211d8cb58684df3db7418..b949d9dee63e727024e0e7a52c8a8e7d39ccd7e8 100644 (file)
--- a/fluidbook/compile/script.nsi
+++ b/fluidbook/compile/script.nsi
@@ -2,14 +2,16 @@
 \r
 ;--------------------------------\r
 \r
+!define FLUIDBOOKNAME "$name"\r
+\r
 ; The name of the installer\r
-Name "$name"\r
+Name "${FLUIDBOOKNAME}"\r
 \r
 ; The file to write\r
 OutFile "$output"\r
 \r
 ; The default installation directory\r
-InstallDir $DESKTOP\$fname\r
+InstallDir $PROGRAMFILES\$fname\r
 \r
 ; Request application privileges for Windows Vista\r
 RequestExecutionLevel user\r
@@ -44,6 +46,10 @@ Section "" ;No components page, name is not important
   ; Put file there\r
   File /r "$fdir\*"\r
   \r
+  ; Create shortcut\r
+  CreateShortCut "$SMPROGRAMS\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "" "$INSTDIR\data\fluidbook.ico"\r
+  CreateShortCut "$DESKTOP\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "" "$INSTDIR\data\fluidbook.ico"\r
+  \r
   ExecShell "" "$INSTDIR\$fname.exe"\r
   \r
 SectionEnd ; end the section\r

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 a08fff41f5addac5d99f7545d5abebe66d71ab54..59feaeeb169e36b9bf795c227a61cf5c6f3bdceb 100644 (file)
--- 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);\r
                $nsi = str_replace('$nsisdir', '/usr/local/nsis/nsis-2.46/share/nsis', $nsi);\r
                $nsi = str_replace('$output', $this->getPathBase('exe'), $nsi);\r
-               $favicon = WS_COMPILE_ASSETS . '/fluidbook.ico';\r
-               if ($this->theme->parametres->favicon != '') {\r
-                       $favicon = $this->vdir . '/data/fluidbook.ico';\r
+               $favicon = $this->vdir . '/data/fluidbook.ico';\r
+               if ($this->theme->parametres->favicon == '') {\r
+                       copy(WS_COMPILE_ASSETS . '/fluidbook.ico',$favicon);\r
                }\r
                $nsi = str_replace('$favicon', $favicon, $nsi);\r
 \r

diff --git a/swf/_src/WSComposer.as3proj b/swf/_src/WSComposer.as3proj
index eec8e4494ab1917c912c903acbd19a0408d44c8a..1d933204d7754353379728defa3141d5dfd36e75 100644 (file)
--- a/swf/_src/WSComposer.as3proj
+++ b/swf/_src/WSComposer.as3proj
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>\r
-<project>\r
+<project version="2">\r
   <!-- Output SWF options -->\r
   <output>\r
-    <movie disabled="False" />\r
+    <movie outputType="Application" />\r
     <movie input="" />\r
     <movie path="..\composer.swf" />\r
     <movie fps="45" />\r
     <movie width="1400" />\r
     <movie height="900" />\r
     <movie version="10" />\r
+    <movie minorVersion="0" />\r
+    <movie platform="Flash Player" />\r
     <movie background="#FFFFFF" />\r
   </output>\r
   <!-- Other classes to be compiled into your SWF -->\r
@@ -24,6 +26,7 @@
     <option locale="" />\r
     <option loadConfig="" />\r
     <option optimize="True" />\r
+    <option omitTraces="True" />\r
     <option showActionScriptWarnings="True" />\r
     <option showBindingWarnings="True" />\r
     <option showInvalidCSS="True" />\r
@@ -39,7 +42,7 @@
     <option staticLinkRSL="True" />\r
     <option additional="" />\r
     <option compilerConstants="" />\r
-    <option customSDK="" />\r
+    <option minorVersion="" />\r
   </build>\r
   <!-- SWC Include Libraries -->\r
   <includeLibraries>\r
@@ -90,4 +93,6 @@
     <option showHiddenPaths="False" />\r
     <option testMovie="Default" />\r
   </options>\r
+  <!-- Plugin storage -->\r
+  <storage />\r
 </project>
\ No newline at end of file