diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-02-02 18:45:23 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-02-02 18:45:23 +0000 |
| commit | 21f90396288bbdd4403b6d7c36320d793119d482 (patch) | |
| tree | 1e0197279e54b1755f3a3abb4c3caacd6426a12a | |
| parent | ffaa20d004c31ca8ae8819166ea05665d7ccc01f (diff) | |
Add a Windows installer icon. Remove the ARGB versions from the other
Windows icons.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20685 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | image/wireshark.ico | bin | 49334 -> 49334 bytes | |||
| -rw-r--r-- | image/wiresharkdoc.ico | bin | 49334 -> 49334 bytes | |||
| -rwxr-xr-x | image/wiresharkinst.ico | bin | 0 -> 49334 bytes | |||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 8 |
5 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 9a12d481c5..042cafecaf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -603,6 +603,7 @@ EXTRA_DIST = \ image/up_arrow.xpm \ image/win32-file-dlg.rc \ image/wiresharkdoc.ico \ + image/wiresharkinst.ico \ image/wireshark.exe.manifest.in \ image/wireshark.ico \ image/wireshark.rc.in \ diff --git a/image/wireshark.ico b/image/wireshark.ico Binary files differindex 8dc8fe86e3..21454e1273 100644 --- a/image/wireshark.ico +++ b/image/wireshark.ico diff --git a/image/wiresharkdoc.ico b/image/wiresharkdoc.ico Binary files differindex c10c4f6a54..08c04eb892 100644 --- a/image/wiresharkdoc.ico +++ b/image/wiresharkdoc.ico diff --git a/image/wiresharkinst.ico b/image/wiresharkinst.ico Binary files differnew file mode 100755 index 0000000000..0f589a6091 --- /dev/null +++ b/image/wiresharkinst.ico diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 812669aea3..ba3f9055c7 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -38,8 +38,8 @@ Name "${PROGRAM_NAME} ${VERSION}" OutFile "${DEST}-setup-${VERSION}.exe" ; Icon of installer and uninstaller -Icon "..\..\image\wireshark.ico" -UninstallIcon "..\..\image\wireshark.ico" +;Icon "..\..\image\wiresharkinst.ico" +;UninstallIcon "..\..\image\wiresharkinst.ico" ; Uninstall stuff (NSIS 2.08: "\r\n" don't work here) !define MUI_UNCONFIRMPAGE_TEXT_TOP "The following Wireshark installation will be uninstalled. Click 'Next' to continue." @@ -62,8 +62,8 @@ XPStyle on !include "MUI.nsh" ;!addplugindir ".\Plugins" -!define MUI_ICON "..\..\image\wireshark.ico" -!define MUI_UNICON "..\..\image\wireshark.ico" +!define MUI_ICON "..\..\image\wiresharkinst.ico" +!define MUI_UNICON "..\..\image\wiresharkinst.ico" !define MUI_COMPONENTSPAGE_SMALLDESC !define MUI_FINISHPAGE_NOAUTOCLOSE |