diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in index c28c7f8..2e1cd0f 100644 --- a/CMakeCPackOptions.cmake.in +++ b/CMakeCPackOptions.cmake.in @@ -38,8 +38,8 @@ if (CPACK_GENERATOR MATCHES "NSIS") # set the install/unistall icon used for the installer itself # There is a bug in NSI that does not handle full unix paths properly. - set (CPACK_NSIS_MUI_ICON "@PROJECT_SOURCE_DIR@/icons/windows-icons\\wsjtx.ico") - set (CPACK_NSIS_MUI_UNIICON "@PROJECT_SOURCE_DIR@/icons/windows-icons\\wsjtx.ico") + set (CPACK_NSIS_MUI_ICON "@PROJECT_SOURCE_DIR@/icons/windows-icons\\ft8call.ico") + set (CPACK_NSIS_MUI_UNIICON "@PROJECT_SOURCE_DIR@/icons/windows-icons\\ft8call.ico") # set the package header icon for MUI set (CPACK_PACKAGE_ICON "@PROJECT_SOURCE_DIR@/icons/windows-icons\\installer_logo.bmp") # tell cpack to create links to the doc files diff --git a/CMakeLists.txt b/CMakeLists.txt index a13e381..f2fc7b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -723,7 +723,7 @@ set (TOP_LEVEL_RESOURCES mouse_commands.txt prefixes.txt cty.dat - icons/Darwin/wsjtx.iconset/icon_128x128.png + icons/Darwin/FT8Call.iconset/icon_128x128.png contrib/gpl-v3-logo.svg artwork/splash.png ) @@ -1527,7 +1527,7 @@ if (NOT WIN32 AND NOT APPLE) #COMPONENT runtime ) install ( - FILES icons/Unix/wsjtx_icon.png + FILES icons/Unix/ft8call_icon.png DESTINATION /usr/share/pixmaps #COMPONENT runtime ) diff --git a/artwork/make_graphics.sh b/artwork/make_graphics.sh index 6f33a08..adfa614 100755 --- a/artwork/make_graphics.sh +++ b/artwork/make_graphics.sh @@ -25,9 +25,9 @@ convert '/tmp/image-%d.png[0-1]' -background transparent \ \( -clone 1 -resize 128 -compress none \) \ \( -clone 1 -resize 256 -compress Zip \) \ -delete 1 -delete 0 \ - -alpha remove ../icons/windows-icons/wsjtx.ico + -alpha remove ../icons/windows-icons/ft8call.ico rm /tmp/image-0.png /tmp/image-1.png -identify -format '%f %p/%n %m %C/%Q %r %G %A %z\n' ../icons/windows-icons/wsjtx.ico +identify -format '%f %p/%n %m %C/%Q %r %G %A %z\n' ../icons/windows-icons/ft8call.ico # inkscape -z -e /dev/stdout -w 150 -h 57 -b white installer_logo.svg | tail -n +4 | \ convert png:- -resize 150x57 +matte BMP3:../icons/windows-icons/installer_logo.bmp @@ -36,18 +36,18 @@ identify -format '%f %p/%n %m %C/%Q %r %G %A %z\n' ../icons/windows-icons/instal # # Mac # -mkdir -p ../icons/Darwin/wsjtx.iconset -inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_16x16.png -w 16 -h 16 icon_128.svg -inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_16x16@2x.png -w 32 -h 32 icon_128.svg -inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_32x32.png -w 32 -h 32 icon_128.svg -inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_32x32@2x.png -w 64 -h 64 icon_128.svg -inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_128x128.png -w 128 -h 128 icon_1024.svg -inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_128x128@2x.png -w 256 -h 256 icon_1024.svg -inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_256x256.png -w 256 -h 256 icon_1024.svg -inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_256x256@2x.png -w 512 -h 512 icon_1024.svg -inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_512x512.png -w 512 -h 512 icon_1024.svg -inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_512x512@2x.png -w 1024 -h 1024 icon_1024.svg -identify -format '%f %p/%n %m %C/%Q %r %G %A %z\n' ../icons/Darwin/wsjtx.iconset/* +mkdir -p ../icons/Darwin/FT8Call.iconset +inkscape -z -e ../icons/Darwin/FT8Call.iconset/icon_16x16.png -w 16 -h 16 icon_128.svg +inkscape -z -e ../icons/Darwin/FT8Call.iconset/icon_16x16@2x.png -w 32 -h 32 icon_128.svg +inkscape -z -e ../icons/Darwin/FT8Call.iconset/icon_32x32.png -w 32 -h 32 icon_128.svg +inkscape -z -e ../icons/Darwin/FT8Call.iconset/icon_32x32@2x.png -w 64 -h 64 icon_128.svg +inkscape -z -e ../icons/Darwin/FT8Call.iconset/icon_128x128.png -w 128 -h 128 icon_1024.svg +inkscape -z -e ../icons/Darwin/FT8Call.iconset/icon_128x128@2x.png -w 256 -h 256 icon_1024.svg +inkscape -z -e ../icons/Darwin/FT8Call.iconset/icon_256x256.png -w 256 -h 256 icon_1024.svg +inkscape -z -e ../icons/Darwin/FT8Call.iconset/icon_256x256@2x.png -w 512 -h 512 icon_1024.svg +inkscape -z -e ../icons/Darwin/FT8Call.iconset/icon_512x512.png -w 512 -h 512 icon_1024.svg +inkscape -z -e ../icons/Darwin/FT8Call.iconset/icon_512x512@2x.png -w 1024 -h 1024 icon_1024.svg +identify -format '%f %p/%n %m %C/%Q %r %G %A %z\n' ../icons/Darwin/FT8Call.iconset/* # generic globe iconset for utilities mkdir -p ../icons/Darwin/wsjt.iconset inkscape -z -e ../icons/Darwin/wsjt.iconset/icon_16x16.png -w 16 -h 16 icon_128.svg @@ -68,5 +68,5 @@ identify -format '%f %p/%n %m %C/%Q %r %G %A %z\n' "../icons/Darwin/DragNDrop Ba # # KDE & Gnome # -inkscape -z -e ../icons/Unix/wsjtx_icon.png -w 128 -h 128 icon_1024.svg -identify -format '%f %p/%n %m %C/%Q %r %G %A %z\n' ../icons/Unix/wsjtx_icon.png +inkscape -z -e ../icons/Unix/ft8call_icon.png -w 128 -h 128 icon_1024.svg +identify -format '%f %p/%n %m %C/%Q %r %G %A %z\n' ../icons/Unix/ft8call_icon.png diff --git a/ft8call.desktop b/ft8call.desktop index cd10cdb..08c9e8d 100644 --- a/ft8call.desktop +++ b/ft8call.desktop @@ -3,7 +3,7 @@ Version=1.0 Name=ft8call Comment=Amateur Radio Weak Signal Operating Exec=ft8call -Icon=wsjtx_icon +Icon=ft8call_icon Terminal=false X-MultipleArgs=false Type=Application diff --git a/icons/Darwin/FT8Call.iconset/icon_128x128.png b/icons/Darwin/FT8Call.iconset/icon_128x128.png new file mode 100644 index 0000000..b71340b Binary files /dev/null and b/icons/Darwin/FT8Call.iconset/icon_128x128.png differ diff --git a/icons/Darwin/FT8Call.iconset/icon_128x128@2x.png b/icons/Darwin/FT8Call.iconset/icon_128x128@2x.png new file mode 100644 index 0000000..266c0b5 Binary files /dev/null and b/icons/Darwin/FT8Call.iconset/icon_128x128@2x.png differ diff --git a/icons/Darwin/FT8Call.iconset/icon_16x16.png b/icons/Darwin/FT8Call.iconset/icon_16x16.png new file mode 100644 index 0000000..30266f1 Binary files /dev/null and b/icons/Darwin/FT8Call.iconset/icon_16x16.png differ diff --git a/icons/Darwin/FT8Call.iconset/icon_16x16@2x.png b/icons/Darwin/FT8Call.iconset/icon_16x16@2x.png new file mode 100644 index 0000000..8b115f3 Binary files /dev/null and b/icons/Darwin/FT8Call.iconset/icon_16x16@2x.png differ diff --git a/icons/Darwin/FT8Call.iconset/icon_256x256.png b/icons/Darwin/FT8Call.iconset/icon_256x256.png new file mode 100644 index 0000000..266c0b5 Binary files /dev/null and b/icons/Darwin/FT8Call.iconset/icon_256x256.png differ diff --git a/icons/Darwin/FT8Call.iconset/icon_256x256@2x.png b/icons/Darwin/FT8Call.iconset/icon_256x256@2x.png new file mode 100644 index 0000000..5f84215 Binary files /dev/null and b/icons/Darwin/FT8Call.iconset/icon_256x256@2x.png differ diff --git a/icons/Darwin/FT8Call.iconset/icon_32x32.png b/icons/Darwin/FT8Call.iconset/icon_32x32.png new file mode 100644 index 0000000..8b115f3 Binary files /dev/null and b/icons/Darwin/FT8Call.iconset/icon_32x32.png differ diff --git a/icons/Darwin/FT8Call.iconset/icon_32x32@2x.png b/icons/Darwin/FT8Call.iconset/icon_32x32@2x.png new file mode 100644 index 0000000..8d8c59c Binary files /dev/null and b/icons/Darwin/FT8Call.iconset/icon_32x32@2x.png differ diff --git a/icons/Darwin/FT8Call.iconset/icon_512x512.png b/icons/Darwin/FT8Call.iconset/icon_512x512.png new file mode 100644 index 0000000..5f84215 Binary files /dev/null and b/icons/Darwin/FT8Call.iconset/icon_512x512.png differ diff --git a/icons/Darwin/FT8Call.iconset/icon_512x512@2x.png b/icons/Darwin/FT8Call.iconset/icon_512x512@2x.png new file mode 100644 index 0000000..f4e4eec Binary files /dev/null and b/icons/Darwin/FT8Call.iconset/icon_512x512@2x.png differ diff --git a/icons/Darwin/ft8call.iconset/icon_128x128.png b/icons/Darwin/ft8call.iconset/icon_128x128.png deleted file mode 100644 index 9387de4..0000000 Binary files a/icons/Darwin/ft8call.iconset/icon_128x128.png and /dev/null differ diff --git a/icons/Darwin/ft8call.iconset/icon_128x128@2x.png b/icons/Darwin/ft8call.iconset/icon_128x128@2x.png deleted file mode 100644 index 6b0df8f..0000000 Binary files a/icons/Darwin/ft8call.iconset/icon_128x128@2x.png and /dev/null differ diff --git a/icons/Darwin/ft8call.iconset/icon_16x16.png b/icons/Darwin/ft8call.iconset/icon_16x16.png deleted file mode 100644 index ecc5868..0000000 Binary files a/icons/Darwin/ft8call.iconset/icon_16x16.png and /dev/null differ diff --git a/icons/Darwin/ft8call.iconset/icon_16x16@2x.png b/icons/Darwin/ft8call.iconset/icon_16x16@2x.png deleted file mode 100644 index 9a8ee28..0000000 Binary files a/icons/Darwin/ft8call.iconset/icon_16x16@2x.png and /dev/null differ diff --git a/icons/Darwin/ft8call.iconset/icon_256x256.png b/icons/Darwin/ft8call.iconset/icon_256x256.png deleted file mode 100644 index 6b0df8f..0000000 Binary files a/icons/Darwin/ft8call.iconset/icon_256x256.png and /dev/null differ diff --git a/icons/Darwin/ft8call.iconset/icon_256x256@2x.png b/icons/Darwin/ft8call.iconset/icon_256x256@2x.png deleted file mode 100644 index f30a99d..0000000 Binary files a/icons/Darwin/ft8call.iconset/icon_256x256@2x.png and /dev/null differ diff --git a/icons/Darwin/ft8call.iconset/icon_32x32.png b/icons/Darwin/ft8call.iconset/icon_32x32.png deleted file mode 100644 index 9a8ee28..0000000 Binary files a/icons/Darwin/ft8call.iconset/icon_32x32.png and /dev/null differ diff --git a/icons/Darwin/ft8call.iconset/icon_32x32@2x.png b/icons/Darwin/ft8call.iconset/icon_32x32@2x.png deleted file mode 100644 index 88b285e..0000000 Binary files a/icons/Darwin/ft8call.iconset/icon_32x32@2x.png and /dev/null differ diff --git a/icons/Darwin/ft8call.iconset/icon_512x512.png b/icons/Darwin/ft8call.iconset/icon_512x512.png deleted file mode 100644 index f30a99d..0000000 Binary files a/icons/Darwin/ft8call.iconset/icon_512x512.png and /dev/null differ diff --git a/icons/Darwin/ft8call.iconset/icon_512x512@2x.png b/icons/Darwin/ft8call.iconset/icon_512x512@2x.png deleted file mode 100644 index b0b4be5..0000000 Binary files a/icons/Darwin/ft8call.iconset/icon_512x512@2x.png and /dev/null differ diff --git a/icons/Unix/ft8call_icon.png b/icons/Unix/ft8call_icon.png new file mode 100644 index 0000000..b71340b Binary files /dev/null and b/icons/Unix/ft8call_icon.png differ diff --git a/icons/windows-icons/ft8call.ico b/icons/windows-icons/ft8call.ico new file mode 100644 index 0000000..ee2b60d Binary files /dev/null and b/icons/windows-icons/ft8call.ico differ