Installer: place readme, key commands and user guide in a documentation folder in...

diff --git a/installer/locale/en/langstrings.txt b/installer/locale/en/langstrings.txt
index 9ce5530..badb459 100644 (file)
--- a/installer/locale/en/langstrings.txt
+++ b/installer/locale/en/langstrings.txt
@@ -10,6 +10,7 @@ LangString msg_pagePrevInstallUninstallCheckBox ${LANG_ENGLISH} "Uninstall (reco
 LangString shortcut_uninstall $(LANG_ENGLISH) "Uninstall"\r
 LangString shortcut_website $(LANG_ENGLISH) "Website"\r
 LangString shortcut_exploreUserConfigDir $(LANG_ENGLISH) "Explore user configuration directory"\r
+LangString docFolder $(LANG_ENGLISH) "Documentation"\r
 LangString shortcut_readme $(LANG_ENGLISH) "Readme"\r
 LangString shortcut_keycom $(LANG_ENGLISH) "Key commands"\r
 LangString shortcut_userguide $(LANG_ENGLISH) "User Guide"\r

diff --git a/installer/locale/fr/langstrings.txt b/installer/locale/fr/langstrings.txt
index c9777b4..1aa716d 100644 (file)
--- a/installer/locale/fr/langstrings.txt
+++ b/installer/locale/fr/langstrings.txt
@@ -10,6 +10,7 @@ LangString msg_pagePrevInstallUninstallCheckBox ${LANG_FRENCH} "D
 LangString shortcut_uninstall $(LANG_FRENCH) "Désinstaller"\r
 LangString shortcut_website $(LANG_FRENCH) "Site Web"\r
 LangString shortcut_exploreUserConfigDir $(LANG_french) "Explorer  le répertoire des paramètres utilisateur"\r
+LangString docFolder $(LANG_FRENCH) "Documentation"\r
 LangString shortcut_readme $(LANG_FRENCH) "Lisez-moi"\r
 LangString shortcut_keycom $(LANG_FRENCH) "Commandes de base"\r
 LangString shortcut_userguide $(LANG_FRENCH) "Guide de l'utilisateur"\r

diff --git a/installer/nvda.nsi b/installer/nvda.nsi
index a407dc0..50b2b23 100644 (file)
--- a/installer/nvda.nsi
+++ b/installer/nvda.nsi
@@ -213,9 +213,10 @@ File /r "${NVDASourceDir}\"
 CreateDirectory "$SMPROGRAMS\$StartMenuFolder"\r
 CreateShortCut "$SMPROGRAMS\$StartMenuFolder\${PRODUCT}.lnk" "$INSTDIR\${PRODUCT}.exe" "" "$INSTDIR\${PRODUCT}.exe" 0 SW_SHOWNORMAL\r
 CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(shortcut_exploreUserConfigDir).lnk" "$INSTDIR\nvda_slave.exe" "explore_userConfigPath" "" 0 SW_SHOWNORMAL\r
-CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(shortcut_readme).lnk" "$INSTDIR\documentation\$(path_readmefile)" "" "$INSTDIR\documentation\$(path_readmefile)" 0 SW_SHOWMAXIMIZED\r
-CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(shortcut_keycom).lnk" "$INSTDIR\documentation\$(path_keycomfile)" "" "$INSTDIR\documentation\$(path_keycomfile)" 0 SW_SHOWMAXIMIZED\r
-CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(shortcut_userguide).lnk" "$INSTDIR\documentation\$(path_userguide)" "" "$INSTDIR\documentation\$(path_userguide)" 0 SW_SHOWMAXIMIZED\r
+CreateDirectory "$SMPROGRAMS\$StartMenuFolder\$(docFolder)"\r
+CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(docFolder)\$(shortcut_readme).lnk" "$INSTDIR\documentation\$(path_readmefile)" "" "$INSTDIR\documentation\$(path_readmefile)" 0 SW_SHOWMAXIMIZED\r
+CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(docFolder)\$(shortcut_keycom).lnk" "$INSTDIR\documentation\$(path_keycomfile)" "" "$INSTDIR\documentation\$(path_keycomfile)" 0 SW_SHOWMAXIMIZED\r
+CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(docFolder)\$(shortcut_userguide).lnk" "$INSTDIR\documentation\$(path_userguide)" "" "$INSTDIR\documentation\$(path_userguide)" 0 SW_SHOWMAXIMIZED\r
 WriteIniStr "$INSTDIR\${PRODUCT}.url" "InternetShortcut" "URL" "${WEBSITE}"\r
 CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(shortcut_website).lnk" "$INSTDIR\${PRODUCT}.url" "" "$INSTDIR\${PRODUCT}.url" 0\r
 CreateShortCut "$DESKTOP\${PRODUCT}.lnk" "$INSTDIR\${PRODUCT}.exe" "" "$INSTDIR\${PRODUCT}.exe" 0 SW_SHOWNORMAL \\r
@@ -249,6 +250,8 @@ ExecWait "$INSTDIR\nvda_slave.exe installer_uninstallService"
 !insertmacro UNINSTALL.LOG_END_UNINSTALL\r
 !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder\r
 ;Cleanup shortcuts\r
+Delete "$SMPROGRAMS\$StartMenuFolder\$(docFolder)\*.*"\r
+RmDir "$SMPROGRAMS\$StartMenuFolder\$(docFolder)"\r
 Delete "$SMPROGRAMS\$StartMenuFolder\*.*"\r
 RmDir "$SMPROGRAMS\$StartMenuFolder"\r
 Delete $DESKTOP\${PRODUCT}.lnk"\r