Installer: Add "PulseView" to uninstaller/Zadig links.

Windows 10 merges all links of the same vendor ("sigrok" here) into one
section in the Start menu. If PulseView and sigrok-cli are installed,
there will be two "Uninstall" links and the user will not know which one
uninstalls which program.

diff --git a/contrib/pulseview_cross.nsi.in b/contrib/pulseview_cross.nsi.in
index 172db41a964ff7042c94a9d3ccab4353afd49e49..af5c1c68073c251d5492b617b35aa49aff5e7412 100644 (file)
--- a/contrib/pulseview_cross.nsi.in
+++ b/contrib/pulseview_cross.nsi.in
@@ -179,19 +179,19 @@ Section "PulseView (required)" Section1
                "" "Open-source, portable sigrok GUI"
 
        # Create a shortcut for the uninstaller.
-       CreateShortCut "$SMPROGRAMS\sigrok\PulseView\Uninstall.lnk" \
+       CreateShortCut "$SMPROGRAMS\sigrok\PulseView\Uninstall PulseView.lnk" \
                "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 \
                SW_SHOWNORMAL "" "Uninstall PulseView"
 
        # Create a shortcut for the Zadig executable.
-       CreateShortCut "$SMPROGRAMS\sigrok\PulseView\Zadig.lnk" \
+       CreateShortCut "$SMPROGRAMS\sigrok\PulseView\Zadig (PulseView).lnk" \
                "$INSTDIR\zadig.exe" "" "$INSTDIR\zadig.exe" 0 \
-               SW_SHOWNORMAL "" "Zadig"
+               SW_SHOWNORMAL "" "Zadig (PulseView)"
 
        # Create a shortcut for the Zadig executable (for Win XP).
-       CreateShortCut "$SMPROGRAMS\sigrok\PulseView\Zadig (Win XP).lnk" \
+       CreateShortCut "$SMPROGRAMS\sigrok\PulseView\Zadig (PulseView, Win XP).lnk" \
                "$INSTDIR\zadig_xp.exe" "" "$INSTDIR\zadig_xp.exe" 0 \
-               SW_SHOWNORMAL "" "Zadig (Win XP)"
+               SW_SHOWNORMAL "" "Zadig (PulseView, Win XP)"
 
        # Create registry keys for "Add/remove programs" in the control panel.
        WriteRegStr HKLM "${REGSTR}" "DisplayName" "PulseView"
@@ -277,9 +277,9 @@ Section "Uninstall"
 
        # Delete the links from the start menu.
        Delete "$SMPROGRAMS\sigrok\PulseView\PulseView.lnk"
-       Delete "$SMPROGRAMS\sigrok\PulseView\Uninstall.lnk"
-       Delete "$SMPROGRAMS\sigrok\PulseView\Zadig.lnk"
-       Delete "$SMPROGRAMS\sigrok\PulseView\Zadig (Win XP).lnk"
+       Delete "$SMPROGRAMS\sigrok\PulseView\Uninstall PulseView.lnk"
+       Delete "$SMPROGRAMS\sigrok\PulseView\Zadig (PulseView).lnk"
+       Delete "$SMPROGRAMS\sigrok\PulseView\Zadig (PulseView, Win XP).lnk"
 
        # Delete the sub-directory in the start menu.
        RMDir "$SMPROGRAMS\sigrok\PulseView"