From: Uwe Hermann <redacted>
Date: Sun, 11 Jun 2017 18:08:17 +0000 (+0200)
Subject: Rename sigrok-logo-notext.ico to pulseview.ico.
X-Git-Tag: pulseview-0.4.0~6
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=fce541c37fc5d265b94c0f690f7d1d177a74d05f;p=pulseview.git

Rename sigrok-logo-notext.ico to pulseview.ico.
---

diff --git a/contrib/pulseview_cross.nsi.in b/contrib/pulseview_cross.nsi.in
index ef521ce8..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
@@ -198,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"
diff --git a/icons/pulseview.ico b/icons/pulseview.ico
new file mode 100644
index 00000000..d8b50c62
Binary files /dev/null and b/icons/pulseview.ico differ
diff --git a/icons/sigrok-logo-notext.ico b/icons/sigrok-logo-notext.ico
deleted file mode 100644
index d8b50c62..00000000
Binary files a/icons/sigrok-logo-notext.ico and /dev/null differ
diff --git a/pulseviewico.rc b/pulseviewico.rc
index 4ba6fd0d..1b4d12da 100644
--- a/pulseviewico.rc
+++ b/pulseviewico.rc
@@ -1 +1 @@
-IDI_ICON1	ICON	DISCARDABLE	"icons/sigrok-logo-notext.ico"
+IDI_ICON1	ICON	DISCARDABLE	"icons/pulseview.ico"