wait #4936 @3

diff --git a/fluidbook/compile/html-silent.nsi b/fluidbook/compile/html-silent.nsi
index 6f3810fb01c3344315b2069c6b9fb8eb95160de3..876bbb7e1e7449fcd3a584f335708688370eee92 100644 (file)
--- a/fluidbook/compile/html-silent.nsi
+++ b/fluidbook/compile/html-silent.nsi
@@ -51,8 +51,8 @@ Section "" ;No components page, name is not important
     File /a  /r "$fdir\*"\r
 \r
     ; Create shortcut\r
-    CreateShortCut "$SMPROGRAMS\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "" "$INSTDIR\package.nw\icon.ico"\r
-    CreateShortCut "$DESKTOP\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "" "$INSTDIR\package.nw\icon.ico"\r
+    CreateShortCut "$SMPROGRAMS\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "--disable-crash-handler=true" "$INSTDIR\package.nw\icon.ico"\r
+    CreateShortCut "$DESKTOP\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "--disable-crash-handler=true" "$INSTDIR\package.nw\icon.ico"\r
 \r
     WriteRegStr HKCU "${REG_UNINSTALL}" "DisplayName" "${FLUIDBOOKNAME}"\r
     WriteRegStr HKCU "${REG_UNINSTALL}" "DisplayIcon" "$\"$INSTDIR\package.nw\icon.ico$\""\r
@@ -63,7 +63,7 @@ Section "" ;No components page, name is not important
 \r
     WriteUninstaller "$INSTDIR\Uninstall.exe"\r
 \r
-    ExecShell "" "$INSTDIR\$fname.exe"\r
+    ExecShell "" "$INSTDIR\$fname.exe" "--disable-crash-handler=true"\r
 SectionEnd\r
 \r
 Section "Uninstall"\r

diff --git a/fluidbook/compile/html.nsi b/fluidbook/compile/html.nsi
index 38c4bedafd4d47992bafad80f506855531fd6223..1656b40d78ac27c3f885a7b32bbc0a9dcd636236 100644 (file)
--- a/fluidbook/compile/html.nsi
+++ b/fluidbook/compile/html.nsi
@@ -47,8 +47,8 @@ Section "" ;No components page, name is not important
     File /a  /r "$fdir\*"\r
 \r
     ; Create shortcut\r
-    CreateShortCut "$SMPROGRAMS\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "" "$INSTDIR\package.nw\icon.ico"\r
-    CreateShortCut "$DESKTOP\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "" "$INSTDIR\package.nw\icon.ico"\r
+    CreateShortCut "$SMPROGRAMS\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "--disable-crash-handler=true" "$INSTDIR\package.nw\icon.ico"\r
+    CreateShortCut "$DESKTOP\${FLUIDBOOKNAME}.lnk" "$INSTDIR\$fname.exe" "--disable-crash-handler=true" "$INSTDIR\package.nw\icon.ico"\r
 \r
     WriteRegStr HKCU "${REG_UNINSTALL}" "DisplayName" "${FLUIDBOOKNAME}"\r
     WriteRegStr HKCU "${REG_UNINSTALL}" "DisplayIcon" "$\"$INSTDIR\package.nw\icon.ico$\""\r
@@ -59,7 +59,7 @@ Section "" ;No components page, name is not important
 \r
     WriteUninstaller "$INSTDIR\Uninstall.exe"\r
 \r
-    ExecShell "" "$INSTDIR\$fname.exe"\r
+    ExecShell "" "$INSTDIR\$fname.exe" "--disable-crash-handler=true"\r
 SectionEnd\r
 \r
 Section "Uninstall"\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 460aaeab669c36b58aa35496f5fd722597d57a21..8a2740488d8c9e457f9675320235a2db81cc123b 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -737,8 +737,8 @@ class wsBookParametres extends wsParametres
         // .
         $this->fields['offlineLink'] = array('type' => 'text', 'default' => 'http://', 'editable' => true, 'label' => __("URL du Fluidbook"), 'hint' => __('URL du fluidbook utilisée pour la version Offline (CD-ROM, clé USB, Exécutables)'));
         $this->fields['offlineTitle'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __("Titre de l'application"));
-        $this->fields['offlineWindowsInstallPath'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Chemin d\'installation par défaut'), 'hint' => __('Par défaut') . ': %APPDATA%/Titre-de-l-application'];
-        $this->fields['offlineWindowsProfilePath'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Répertoire de stockage du profile'), 'hint' => __('Par défaut') . ': %APPDATA%/Titre-de-l-application'];
+        $this->fields['offlineWindowsInstallPath'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Chemin d\'installation par défaut'), 'hint' => __('Par défaut') . ': %LOCALAPPDATA%/%title%'];
+        $this->fields['offlineWindowsProfilePath'] = ['type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Répertoire de stockage du profile'), 'hint' => __('Par défaut') . ': %LOCALAPPDATA%/%title%'];
         $this->fields['offlineEnableAdvancedPrinting'] = ['type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __('Activer le menu d\'impression avancée')];
         $this->forms['offline'] = array('label' => __('Version offline'),
             'fieldsnames' => array('offlineTitle', 'offlineLink', '|', 'offlineWindowsInstallPath', 'offlineWindowsProfilePath', '|', 'offlineEnableAdvancedPrinting'));

diff --git a/inc/ws/Util/packager/class.ws.packager.win.exe.html.php b/inc/ws/Util/packager/class.ws.packager.win.exe.html.php
index fb46ab8feac153884f47d8916e935a5ea378e9d1..924e46fe50472ba8766056bf50a74c48132f5c24 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.win.exe.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.exe.html.php
@@ -82,6 +82,12 @@ class wsPackagerWinEXEHTML extends wsPackager
                 'fs' => '0.0.1-security',\r
                 'path' => '^0.12.7'],\r
         ];\r
+\r
+        if ($this->book->parametres->offlineWindowsProfilePath != '') {\r
+            $datadir = str_replace('%title%', $this->exeName, $this->book->parametres->offlineWindowsProfilePath);\r
+            $data['chromium-args'] = '--crash-dumps-dir=\'' . $datadir . '\' --user-data-dir=\'' . $datadir . '\'';\r
+        }\r
+\r
         $pngIcon = $this->vdir . '/icon.png';\r
         $winIcon = $this->vdir . '/icon.ico';\r
 \r