From 81d56fa45aa20c6633cdeb73ac01aed21846680b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Insaurralde=20Avalos?= Date: Tue, 14 Nov 2023 07:56:47 -0300 Subject: [PATCH] Improve upon #11268 - fix wrong description for shortcuts [skip ci] --- src/WindowsInstaller/include/declarations.nsh | 3 ++- src/WindowsInstaller/setup/configure.nsh | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/WindowsInstaller/include/declarations.nsh b/src/WindowsInstaller/include/declarations.nsh index 3832d33fc3..9a2d01382b 100644 --- a/src/WindowsInstaller/include/declarations.nsh +++ b/src/WindowsInstaller/include/declarations.nsh @@ -25,7 +25,8 @@ Configuration and variables of FreeCAD installer # Fixme: FC should use different preferences folder for every release !define APP_DIR_USERDATA ${APP_NAME} #!define APP_DIR_USERDATA "${APP_NAME}${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}" -!define APP_INFO "${APP_NAME} Installer/Uninstaller" +!define APP_SHORTCUT_INFO "${APP_NAME} - Your Own 3D Parametric Modeler" +!define APP_INFO "Install/Uninstall ${APP_NAME}" !define APP_WEBPAGE "https://www.freecad.org/" !define APP_WEBPAGE_INFO "${APP_NAME} Website" !define APP_WIKI "https://wiki.freecad.org/Main_Page" diff --git a/src/WindowsInstaller/setup/configure.nsh b/src/WindowsInstaller/setup/configure.nsh index d42ef4d6bb..7707622c71 100644 --- a/src/WindowsInstaller/setup/configure.nsh +++ b/src/WindowsInstaller/setup/configure.nsh @@ -6,7 +6,7 @@ Write registry information and configure FreeCAD */ -#!define SHORTCUT '${APP_NAME} ${APP_SERIES_NAME}.lnk" "$INSTDIR\${APP_RUN}" "" "$INSTDIR\${APP_RUN}" "" "" "" "${APP_INFO}"' +#!define SHORTCUT '${APP_NAME} ${APP_SERIES_NAME}.lnk" "$INSTDIR\${APP_RUN}" "" "$INSTDIR\${APP_RUN}" "" "" "" "${APP_SHORTCUT_INFO}"' #-------------------------------- # Registry information @@ -24,14 +24,14 @@ Section -InstallData StrCpy $StartmenuFolder "${APP_DIR}" ${endif} CreateDirectory "$SMPROGRAMS\$StartmenuFolder" - CreateShortCut "$SMPROGRAMS\$StartmenuFolder\${APP_NAME}.lnk" "$INSTDIR\${APP_RUN}" "" "$INSTDIR\${APP_RUN}" "" "" "" "${APP_INFO}" + CreateShortCut "$SMPROGRAMS\$StartmenuFolder\${APP_NAME}.lnk" "$INSTDIR\${APP_RUN}" "" "$INSTDIR\${APP_RUN}" "" "" "" "${APP_SHORTCUT_INFO}" # Link to website and Wiki WriteINIStr "$SMPROGRAMS\$StartmenuFolder\${APP_WEBPAGE_INFO}.url" "InternetShortcut" "URL" "${APP_WEBPAGE}" WriteINIStr "$SMPROGRAMS\$StartmenuFolder\${APP_WIKI_INFO}.url" "InternetShortcut" "URL" "${APP_WIKI}" # create desktop icon ${if} $CreateDesktopIcon == "true" SetOutPath "$INSTDIR\bin" - CreateShortCut "$DESKTOP\${APP_NAME} ${APP_SERIES_NAME}.lnk" "$INSTDIR\${APP_RUN}" "" "$INSTDIR\${APP_RUN}" "" "" "" "${APP_INFO}" + CreateShortCut "$DESKTOP\${APP_NAME} ${APP_SERIES_NAME}.lnk" "$INSTDIR\${APP_RUN}" "" "$INSTDIR\${APP_RUN}" "" "" "" "${APP_SHORTCUT_INFO}" ${endif} # Uninstaller information