From 82939b2644e598dab75970c9831b78233c444cb5 Mon Sep 17 00:00:00 2001
From: RedBlackAka <140876408+RedBlackAka@users.noreply.github.com>
Date: Fri, 21 Feb 2025 15:53:00 +0100
Subject: [PATCH 1/4] Clean up Windows Start Menu

---
 packaging/NSIS/Ultimaker-Cura.nsi.jinja | 32 +++++++++----------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/packaging/NSIS/Ultimaker-Cura.nsi.jinja b/packaging/NSIS/Ultimaker-Cura.nsi.jinja
index ac826af0d9..335626da12 100644
--- a/packaging/NSIS/Ultimaker-Cura.nsi.jinja
+++ b/packaging/NSIS/Ultimaker-Cura.nsi.jinja
@@ -16,13 +16,11 @@
 !define REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\${APP_NAME}-${VERSION}"
 !define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}-${VERSION}"
 
-!define REG_START_MENU "Start Menu Folder"
+!define REG_START_MENU "Start Menu Shortcut"
 
 ;Require administrator access
 RequestExecutionLevel admin
 
-var SM_Folder
-
 ######################################################################
 
 VIProductVersion  "${VIVERSION}"
@@ -68,7 +66,6 @@ InstallDir "$PROGRAMFILES64\${APP_NAME}"
 !define MUI_STARTMENUPAGE_REGISTRY_ROOT "${REG_ROOT}"
 !define MUI_STARTMENUPAGE_REGISTRY_KEY "${UNINSTALL_PATH}"
 !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${REG_START_MENU}"
-!insertmacro MUI_PAGE_STARTMENU Application $SM_Folder
 !endif
 
 !insertmacro MUI_PAGE_INSTFILES
@@ -108,25 +105,21 @@ WriteUninstaller "$INSTDIR\uninstall.exe"
 
 !ifdef REG_START_MENU
 !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-CreateDirectory "$SMPROGRAMS\$SM_Folder"
-CreateShortCut "$SMPROGRAMS\$SM_Folder\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
-CreateShortCut "$SMPROGRAMS\$SM_Folder\Uninstall ${APP_NAME}.lnk" "$INSTDIR\uninstall.exe"
+CreateShortCut "$SMPROGRAMS\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
 
 !ifdef WEB_SITE
 WriteIniStr "$INSTDIR\UltiMaker Cura website.url" "InternetShortcut" "URL" "${WEB_SITE}"
-CreateShortCut "$SMPROGRAMS\$SM_Folder\UltiMaker Cura website.lnk" "$INSTDIR\UltiMaker Cura website.url"
+CreateShortCut "$SMPROGRAMS\UltiMaker Cura website.lnk" "$INSTDIR\UltiMaker Cura website.url"
 !endif
 !insertmacro MUI_STARTMENU_WRITE_END
 !endif
 
 !ifndef REG_START_MENU
-CreateDirectory "$SMPROGRAMS\{{ app_name }}"
-CreateShortCut "$SMPROGRAMS\{{ app_name }}\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
-CreateShortCut "$SMPROGRAMS\{{ app_name }}\Uninstall ${APP_NAME}.lnk" "$INSTDIR\uninstall.exe"
+CreateShortCut "$SMPROGRAMS\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
 
 !ifdef WEB_SITE
 WriteIniStr "$INSTDIR\UltiMaker Cura website.url" "InternetShortcut" "URL" "${WEB_SITE}"
-CreateShortCut "$SMPROGRAMS\{{ app_name }}\UltiMaker Cura website.lnk" "$INSTDIR\UltiMaker Cura website.url"
+CreateShortCut "$SMPROGRAMS\UltiMaker Cura website.lnk" "$INSTDIR\UltiMaker Cura website.url"
 !endif
 !endif
 
@@ -184,22 +177,19 @@ Delete "$INSTDIR\${APP_NAME} website.url"
 RmDir /r /REBOOTOK "$INSTDIR"
 
 !ifdef REG_START_MENU
-!insertmacro MUI_STARTMENU_GETFOLDER "Application" $SM_Folder
-Delete "$SMPROGRAMS\$SM_Folder\${APP_NAME}.lnk"
-Delete "$SMPROGRAMS\$SM_Folder\Uninstall ${APP_NAME}.lnk"
+Delete "$SMPROGRAMS\${APP_NAME}.lnk"
+Delete "$SMPROGRAMS\Uninstall ${APP_NAME}.lnk"
 !ifdef WEB_SITE
-Delete "$SMPROGRAMS\$SM_Folder\UltiMaker Cura website.lnk"
+Delete "$SMPROGRAMS\UltiMaker Cura website.lnk"
 !endif
-RmDir "$SMPROGRAMS\$SM_Folder"
 !endif
 
 !ifndef REG_START_MENU
-Delete "$SMPROGRAMS\{{ app_name }}\${APP_NAME}.lnk"
-Delete "$SMPROGRAMS\{{ app_name }}\Uninstall ${APP_NAME}.lnk"
+Delete "$SMPROGRAMS\${APP_NAME}.lnk"
+Delete "$SMPROGRAMS\Uninstall ${APP_NAME}.lnk"
 !ifdef WEB_SITE
-Delete "$SMPROGRAMS\{{ app_name }}\UltiMaker Cura website.lnk"
+Delete "$SMPROGRAMS\UltiMaker Cura website.lnk"
 !endif
-RmDir "$SMPROGRAMS\{{ app_name }}"
 !endif
 
 !insertmacro APP_UNASSOCIATE "stl" "Cura.model"

From c33a32209311f0fb96c60db25e6743141e2a4064 Mon Sep 17 00:00:00 2001
From: Remco Burema <r.burema@ultimaker.com>
Date: Wed, 26 Mar 2025 08:57:43 +0100
Subject: [PATCH 2/4] Also remove website link.

Would otherwise be hanging loose in the start-menu somehwere.

done as part of CURA-12502
---
 packaging/NSIS/Ultimaker-Cura.nsi.jinja    | 24 +---------------------
 packaging/NSIS/create_windows_installer.py |  3 +--
 packaging/msi/create_windows_msi.py        |  3 +--
 3 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/packaging/NSIS/Ultimaker-Cura.nsi.jinja b/packaging/NSIS/Ultimaker-Cura.nsi.jinja
index 335626da12..8c5d48f9dd 100644
--- a/packaging/NSIS/Ultimaker-Cura.nsi.jinja
+++ b/packaging/NSIS/Ultimaker-Cura.nsi.jinja
@@ -1,9 +1,8 @@
-# Copyright (c) 2022 UltiMaker B.V.
+# Copyright (c) 2025 UltiMaker
 # Cura's build system is released under the terms of the AGPLv3 or higher.
 
 !define APP_NAME "{{ app_name }}"
 !define COMP_NAME "{{ company }}"
-!define WEB_SITE "{{ web_site }}"
 !define VERSION "{{ version }}"
 !define VIVERSION "{{ version_major }}.{{ version_minor }}.{{ version_patch }}.0"
 !define COPYRIGHT "Copyright (c) {{ year }} {{ company }}"
@@ -107,20 +106,11 @@ WriteUninstaller "$INSTDIR\uninstall.exe"
 !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
 CreateShortCut "$SMPROGRAMS\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
 
-!ifdef WEB_SITE
-WriteIniStr "$INSTDIR\UltiMaker Cura website.url" "InternetShortcut" "URL" "${WEB_SITE}"
-CreateShortCut "$SMPROGRAMS\UltiMaker Cura website.lnk" "$INSTDIR\UltiMaker Cura website.url"
-!endif
 !insertmacro MUI_STARTMENU_WRITE_END
 !endif
 
 !ifndef REG_START_MENU
 CreateShortCut "$SMPROGRAMS\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
-
-!ifdef WEB_SITE
-WriteIniStr "$INSTDIR\UltiMaker Cura website.url" "InternetShortcut" "URL" "${WEB_SITE}"
-CreateShortCut "$SMPROGRAMS\UltiMaker Cura website.lnk" "$INSTDIR\UltiMaker Cura website.url"
-!endif
 !endif
 
 WriteRegStr ${REG_ROOT} "${REG_APP_PATH}" "" "$INSTDIR\${MAIN_APP_EXE}"
@@ -131,9 +121,6 @@ WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}"  "DisplayIcon" "$INSTDIR\${MAIN_APP_
 WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}"  "DisplayVersion" "${VERSION}"
 WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}"  "Publisher" "${COMP_NAME}"
 
-!ifdef WEB_SITE
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}"  "URLInfoAbout" "${WEB_SITE}"
-!endif
 SectionEnd
 
 ######################################################################
@@ -170,26 +157,17 @@ RmDir "$INSTDIR\share\uranium"
 RmDir "$INSTDIR\share"
 
 Delete "$INSTDIR\uninstall.exe"
-!ifdef WEB_SITE
-Delete "$INSTDIR\${APP_NAME} website.url"
-!endif
 
 RmDir /r /REBOOTOK "$INSTDIR"
 
 !ifdef REG_START_MENU
 Delete "$SMPROGRAMS\${APP_NAME}.lnk"
 Delete "$SMPROGRAMS\Uninstall ${APP_NAME}.lnk"
-!ifdef WEB_SITE
-Delete "$SMPROGRAMS\UltiMaker Cura website.lnk"
-!endif
 !endif
 
 !ifndef REG_START_MENU
 Delete "$SMPROGRAMS\${APP_NAME}.lnk"
 Delete "$SMPROGRAMS\Uninstall ${APP_NAME}.lnk"
-!ifdef WEB_SITE
-Delete "$SMPROGRAMS\UltiMaker Cura website.lnk"
-!endif
 !endif
 
 !insertmacro APP_UNASSOCIATE "stl" "Cura.model"
diff --git a/packaging/NSIS/create_windows_installer.py b/packaging/NSIS/create_windows_installer.py
index d15d62b951..e01c757dbb 100644
--- a/packaging/NSIS/create_windows_installer.py
+++ b/packaging/NSIS/create_windows_installer.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 UltiMaker
+# Copyright (c) 2025 UltiMaker
 # Cura is released under the terms of the LGPLv3 or higher.
 
 
@@ -51,7 +51,6 @@ def generate_nsi(source_path: str, dist_path: str, filename: str, version: str):
         version_minor = str(parsed_version.minor),
         version_patch = str(parsed_version.patch),
         company = "UltiMaker",
-        web_site = "https://ultimaker.com",
         year = datetime.now().year,
         cura_license_file = str(source_loc.joinpath("packaging", "cura_license.txt")),
         compression_method = "LZMA",  # ZLIB, BZIP2 or LZMA
diff --git a/packaging/msi/create_windows_msi.py b/packaging/msi/create_windows_msi.py
index e44a9a924b..12c64ed24f 100644
--- a/packaging/msi/create_windows_msi.py
+++ b/packaging/msi/create_windows_msi.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 UltiMaker
+# Copyright (c) 2025 UltiMaker
 # Cura is released under the terms of the LGPLv3 or higher.
 
 
@@ -40,7 +40,6 @@ def generate_wxs(source_path: Path, dist_path: Path, filename: Path, app_name: s
         version_minor=str(parsed_version.minor),
         version_patch=str(parsed_version.patch),
         company="UltiMaker",
-        web_site="https://ultimaker.com",
         year=datetime.now().year,
         upgrade_code=str(uuid.uuid5(uuid.NAMESPACE_DNS, app_name)),
         cura_license_file=str(source_loc.joinpath("packaging", "msi", "cura_license.rtf")),

From f45cbeb5f4a8e250a9e9d5d4532cd636de0ec37d Mon Sep 17 00:00:00 2001
From: Remco Burema <r.burema@ultimaker.com>
Date: Wed, 16 Apr 2025 13:18:40 +0200
Subject: [PATCH 3/4] Remove spurious (and maybe erroneous?) empty line.

CURA-12502
---
 packaging/NSIS/Ultimaker-Cura.nsi.jinja | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packaging/NSIS/Ultimaker-Cura.nsi.jinja b/packaging/NSIS/Ultimaker-Cura.nsi.jinja
index 8c5d48f9dd..53d8777e5f 100644
--- a/packaging/NSIS/Ultimaker-Cura.nsi.jinja
+++ b/packaging/NSIS/Ultimaker-Cura.nsi.jinja
@@ -105,7 +105,6 @@ WriteUninstaller "$INSTDIR\uninstall.exe"
 !ifdef REG_START_MENU
 !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
 CreateShortCut "$SMPROGRAMS\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
-
 !insertmacro MUI_STARTMENU_WRITE_END
 !endif
 

From 2db896e80fcb7dcef778295e1ba778eaba77a963 Mon Sep 17 00:00:00 2001
From: Remco Burema <r.burema@ultimaker.com>
Date: Tue, 22 Apr 2025 10:24:06 +0200
Subject: [PATCH 4/4] win/pacakging -- Start menu-macro is only needed for when
 in folder?

Also it fails now since it seems like this macro _expects_ a folder to be set.

CURA-12502
---
 packaging/NSIS/Ultimaker-Cura.nsi.jinja | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packaging/NSIS/Ultimaker-Cura.nsi.jinja b/packaging/NSIS/Ultimaker-Cura.nsi.jinja
index 53d8777e5f..9f61e6950c 100644
--- a/packaging/NSIS/Ultimaker-Cura.nsi.jinja
+++ b/packaging/NSIS/Ultimaker-Cura.nsi.jinja
@@ -61,7 +61,6 @@ InstallDir "$PROGRAMFILES64\${APP_NAME}"
 
 !ifdef REG_START_MENU
 !define MUI_STARTMENUPAGE_NODISABLE
-!define MUI_STARTMENUPAGE_DEFAULTFOLDER "UltiMaker Cura"
 !define MUI_STARTMENUPAGE_REGISTRY_ROOT "${REG_ROOT}"
 !define MUI_STARTMENUPAGE_REGISTRY_KEY "${UNINSTALL_PATH}"
 !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${REG_START_MENU}"
@@ -103,9 +102,7 @@ SetOutPath "$INSTDIR"
 WriteUninstaller "$INSTDIR\uninstall.exe"
 
 !ifdef REG_START_MENU
-!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
 CreateShortCut "$SMPROGRAMS\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
-!insertmacro MUI_STARTMENU_WRITE_END
 !endif
 
 !ifndef REG_START_MENU