X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=contrib%2Fpulseview_cross.nsi.in;h=13a45fe18435746f1f46c1062dd611a2ecb6b2cd;hp=172db41a964ff7042c94a9d3ccab4353afd49e49;hb=fce541c37fc5d265b94c0f690f7d1d177a74d05f;hpb=4bbd53c93847f579a2a0415704c91ef8adaa400c

diff --git a/contrib/pulseview_cross.nsi.in b/contrib/pulseview_cross.nsi.in
index 172db41a..13a45fe1 100644
--- a/contrib/pulseview_cross.nsi.in
+++ b/contrib/pulseview_cross.nsi.in
@@ -56,7 +56,7 @@ RequestExecutionLevel admin
 # --- MUI interface configuration ---------------------------------------------
 
 # Use the following icon for the installer EXE file.
-!define MUI_ICON "@PROJECT_SOURCE_DIR@/icons/sigrok-logo-notext.ico"
+!define MUI_ICON "@PROJECT_SOURCE_DIR@/icons/pulseview.ico"
 
 # Show a nice image at the top of each installer page.
 !define MUI_HEADERIMAGE
@@ -135,7 +135,6 @@ FunctionEnd
 # --- Default section ---------------------------------------------------------
 
 Section "PulseView (required)" Section1
-
 	# This section is gray (can't be disabled) in the component list.
 	SectionIn RO
 
@@ -179,19 +178,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"
@@ -199,7 +198,7 @@ Section "PulseView (required)" Section1
 		"$\"$INSTDIR\Uninstall.exe$\""
 	WriteRegStr HKLM "${REGSTR}" "InstallLocation" "$\"$INSTDIR$\""
 	WriteRegStr HKLM "${REGSTR}" "DisplayIcon" \
-		"$\"$INSTDIR\sigrok-logo-notext.ico$\""
+		"$\"$INSTDIR\pulseview.ico$\""
 	WriteRegStr HKLM "${REGSTR}" "Publisher" "sigrok"
 	WriteRegStr HKLM "${REGSTR}" "HelpLink" \
 		"http://sigrok.org/wiki/PulseView"
@@ -215,7 +214,6 @@ Section "PulseView (required)" Section1
 	# Display "Remove" instead of "Modify/Remove" in the control panel.
 	WriteRegDWORD HKLM "${REGSTR}" "NoModify" 1
 	WriteRegDWORD HKLM "${REGSTR}" "NoRepair" 1
-
 SectionEnd
 
 Section /o "Example data" Section2
@@ -239,7 +237,7 @@ Section /o "Example data" Section2
 	File "${CROSS}/share/sigrok-dumps/z80/kc85/kc85-20mhz.sr"
 
 	# Create a shortcut for the example data folder.
-	CreateShortCut "$SMPROGRAMS\sigrok\PulseView\Examples.lnk" \
+	CreateShortCut "$SMPROGRAMS\sigrok\PulseView\Examples (PulseView).lnk" \
 		"$INSTDIR\examples" "" "$INSTDIR\examples" 0 \
 		SW_SHOWNORMAL "" ""
 SectionEnd
@@ -248,7 +246,6 @@ SectionEnd
 # --- Uninstaller section -----------------------------------------------------
 
 Section "Uninstall"
-
 	# Always delete the uninstaller first (yes, this really works).
 	Delete "$INSTDIR\Uninstall.exe"
 
@@ -277,9 +274,10 @@ 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 "$SMPROGRAMS\sigrok\PulseView\Examples (PulseView).lnk"
 
 	# Delete the sub-directory in the start menu.
 	RMDir "$SMPROGRAMS\sigrok\PulseView"