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

diff --git a/contrib/pulseview_cross.nsi.in b/contrib/pulseview_cross.nsi.in
index ef521ce8aca917082c4fa5cdb021ac1e03e580bc..13a45fe18435746f1f46c1062dd611a2ecb6b2cd 100644 (file)
--- 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.
 # --- 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
 
 # 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\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"
        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 (file)
index 0000000..d8b50c6
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 (file)
index d8b50c6..0000000
Binary files a/icons/sigrok-logo-notext.ico and /dev/null differ

diff --git a/pulseviewico.rc b/pulseviewico.rc
index 4ba6fd0d5e6d9d6c0a9f5732a1861cecbdf9fbaf..1b4d12dad362e846e94bb0d3fed12e8c4e1eb1c9 100644 (file)
--- a/pulseviewico.rc
+++ b/pulseviewico.rc
@@ -1 +1 @@
-IDI_ICON1      ICON    DISCARDABLE     "icons/sigrok-logo-notext.ico"
+IDI_ICON1      ICON    DISCARDABLE     "icons/pulseview.ico"