diff --git a/artwork/README b/artwork/README index 3b5fd5826..04aa460dd 100644 --- a/artwork/README +++ b/artwork/README @@ -1,11 +1,11 @@ This directory contains original artwork used to generate the graphics used in various parts of the WSJT-X ecosystem. The CMake build scripts -do not generate the final image bitmaps becuase of teh extra tools +do not generate the final image bitmaps because of the extra tools required to complete this step. Instead there is shell script here (make_graphics.sh) that does the generation. If you want to modify the -sourec graphics or add new ones then you need an SVG editor (I use +source graphics or add new ones then you need an SVG editor (I use inkscape) and a tool to do various conversion steps (I use -ImageMagick), the sheel script explicitly uses these tools. +ImageMagick), the shell script explicitly uses these tools. The files here are: @@ -13,10 +13,13 @@ installer_logo.svg - A 150x57 pixel image (the size is important with a whte background that is used at the top right of the NSIS Windows installer. -wsjtx_globe_1024x1024.svg - A 1024x1024 pixel image which is used in - various places, mainly for high resolution icons. +wsjt_globe_1024x1024.svg - A 1024x1024 pixel generic globe image which + is used in various places, mainly for high resolution icons. -wsjtx_globe_128x128.svg - A 128x128 pixel image which is used for low +wsjtx_globe_1024x1024.svg - A 1024x1024 pixel WSJT-X specific image + which is used in various places, mainly for high resolution icons. + +wsjt_globe_128x128.svg - A 128x128 pixel image which is used for low resolution icons. make_graphics.sh - Run this script (on Linux) to generate the diff --git a/artwork/make_graphics.sh b/artwork/make_graphics.sh index 9a9275fb8..dfde2420b 100755 --- a/artwork/make_graphics.sh +++ b/artwork/make_graphics.sh @@ -3,7 +3,7 @@ # # Windows # -inkscape -z -e /tmp/image-0.png wsjtx_globe_128x128.svg +inkscape -z -e /tmp/image-0.png wsjt_globe_128x128.svg inkscape -z -e /tmp/image-1.png wsjtx_globe_1024x1024.svg convert '/tmp/image-%d.png[0-1]' -background transparent \ \( -clone 0 -resize 16 -colors 256 -compress none \) \ @@ -36,10 +36,11 @@ identify -format '%f %p/%n %m %C/%Q %r %G %A %z\n' ../icons/windows-icons/instal # # Mac # -inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_16x16.png -w 16 -h 16 wsjtx_globe_128x128.svg -inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_16x16@2x.png -w 32 -h 32 wsjtx_globe_128x128.svg -inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_32x32.png -w 32 -h 32 wsjtx_globe_128x128.svg -inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_32x32@2x.png -w 64 -h 64 wsjtx_globe_128x128.svg +mkdir -p ../icons/Darwin/wsjtx.iconset +inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_16x16.png -w 16 -h 16 wsjt_globe_128x128.svg +inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_16x16@2x.png -w 32 -h 32 wsjt_globe_128x128.svg +inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_32x32.png -w 32 -h 32 wsjt_globe_128x128.svg +inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_32x32@2x.png -w 64 -h 64 wsjt_globe_128x128.svg inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_128x128.png -w 128 -h 128 wsjtx_globe_1024x1024.svg inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_128x128@2x.png -w 256 -h 256 wsjtx_globe_1024x1024.svg inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_256x256.png -w 256 -h 256 wsjtx_globe_1024x1024.svg @@ -47,6 +48,19 @@ inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_256x256@2x.png -w 512 -h 512 w inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_512x512.png -w 512 -h 512 wsjtx_globe_1024x1024.svg inkscape -z -e ../icons/Darwin/wsjtx.iconset/icon_512x512@2x.png -w 1024 -h 1024 wsjtx_globe_1024x1024.svg identify -format '%f %p/%n %m %C/%Q %r %G %A %z\n' ../icons/Darwin/wsjtx.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 wsjt_globe_128x128.svg +inkscape -z -e ../icons/Darwin/wsjt.iconset/icon_16x16@2x.png -w 32 -h 32 wsjt_globe_128x128.svg +inkscape -z -e ../icons/Darwin/wsjt.iconset/icon_32x32.png -w 32 -h 32 wsjt_globe_128x128.svg +inkscape -z -e ../icons/Darwin/wsjt.iconset/icon_32x32@2x.png -w 64 -h 64 wsjt_globe_128x128.svg +inkscape -z -e ../icons/Darwin/wsjt.iconset/icon_128x128.png -w 128 -h 128 wsjtx_globe_1024x1024.svg +inkscape -z -e ../icons/Darwin/wsjt.iconset/icon_128x128@2x.png -w 256 -h 256 wsjtx_globe_1024x1024.svg +inkscape -z -e ../icons/Darwin/wsjt.iconset/icon_256x256.png -w 256 -h 256 wsjtx_globe_1024x1024.svg +inkscape -z -e ../icons/Darwin/wsjt.iconset/icon_256x256@2x.png -w 512 -h 512 wsjtx_globe_1024x1024.svg +inkscape -z -e ../icons/Darwin/wsjt.iconset/icon_512x512.png -w 512 -h 512 wsjtx_globe_1024x1024.svg +inkscape -z -e ../icons/Darwin/wsjt.iconset/icon_512x512@2x.png -w 1024 -h 1024 wsjtx_globe_1024x1024.svg +identify -format '%f %p/%n %m %C/%Q %r %G %A %z\n' ../icons/Darwin/wsjt.iconset/* # inkscape -z -e "../icons/Darwin/DragNDrop Background.png" -w 640 -h 480 -b white "DragNDrop Background.svg" identify -format '%f %p/%n %m %C/%Q %r %G %A %z\n' "../icons/Darwin/DragNDrop Background.png" diff --git a/artwork/wsjt_globe_1024x1024.svg b/artwork/wsjt_globe_1024x1024.svg new file mode 100644 index 000000000..c9c155ac2 --- /dev/null +++ b/artwork/wsjt_globe_1024x1024.svg @@ -0,0 +1,577 @@ + + + + + + + + Simple globe centered on North America + + + earth globe northamerica + + + + + Open Clip Art Library + + + + + Dan Gerhrads + + + + + Dan Gerhrads + + + May 1, 2005 + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + wmf2svg + + + + + + + + + + + + + + diff --git a/artwork/wsjtx_globe_128x128.svg b/artwork/wsjt_globe_128x128.svg similarity index 100% rename from artwork/wsjtx_globe_128x128.svg rename to artwork/wsjt_globe_128x128.svg diff --git a/icons/Darwin/wsjt.iconset/icon_128x128.png b/icons/Darwin/wsjt.iconset/icon_128x128.png new file mode 100644 index 000000000..9387de431 Binary files /dev/null and b/icons/Darwin/wsjt.iconset/icon_128x128.png differ diff --git a/icons/Darwin/wsjt.iconset/icon_128x128@2x.png b/icons/Darwin/wsjt.iconset/icon_128x128@2x.png new file mode 100644 index 000000000..6b0df8fba Binary files /dev/null and b/icons/Darwin/wsjt.iconset/icon_128x128@2x.png differ diff --git a/icons/Darwin/wsjt.iconset/icon_16x16.png b/icons/Darwin/wsjt.iconset/icon_16x16.png new file mode 100644 index 000000000..ecc5868e6 Binary files /dev/null and b/icons/Darwin/wsjt.iconset/icon_16x16.png differ diff --git a/icons/Darwin/wsjt.iconset/icon_16x16@2x.png b/icons/Darwin/wsjt.iconset/icon_16x16@2x.png new file mode 100644 index 000000000..9a8ee28d8 Binary files /dev/null and b/icons/Darwin/wsjt.iconset/icon_16x16@2x.png differ diff --git a/icons/Darwin/wsjt.iconset/icon_256x256.png b/icons/Darwin/wsjt.iconset/icon_256x256.png new file mode 100644 index 000000000..6b0df8fba Binary files /dev/null and b/icons/Darwin/wsjt.iconset/icon_256x256.png differ diff --git a/icons/Darwin/wsjt.iconset/icon_256x256@2x.png b/icons/Darwin/wsjt.iconset/icon_256x256@2x.png new file mode 100644 index 000000000..f30a99d28 Binary files /dev/null and b/icons/Darwin/wsjt.iconset/icon_256x256@2x.png differ diff --git a/icons/Darwin/wsjt.iconset/icon_32x32.png b/icons/Darwin/wsjt.iconset/icon_32x32.png new file mode 100644 index 000000000..9a8ee28d8 Binary files /dev/null and b/icons/Darwin/wsjt.iconset/icon_32x32.png differ diff --git a/icons/Darwin/wsjt.iconset/icon_32x32@2x.png b/icons/Darwin/wsjt.iconset/icon_32x32@2x.png new file mode 100644 index 000000000..88b285eea Binary files /dev/null and b/icons/Darwin/wsjt.iconset/icon_32x32@2x.png differ diff --git a/icons/Darwin/wsjt.iconset/icon_512x512.png b/icons/Darwin/wsjt.iconset/icon_512x512.png new file mode 100644 index 000000000..f30a99d28 Binary files /dev/null and b/icons/Darwin/wsjt.iconset/icon_512x512.png differ diff --git a/icons/Darwin/wsjt.iconset/icon_512x512@2x.png b/icons/Darwin/wsjt.iconset/icon_512x512@2x.png new file mode 100644 index 000000000..b0b4be5d9 Binary files /dev/null and b/icons/Darwin/wsjt.iconset/icon_512x512@2x.png differ