diff --git a/CREDITS.md b/CREDITS.md index d792ce6f..68e673e9 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -52,6 +52,12 @@ Some of the assets bundled with novelWriter were adapted from the following sour * [Owl](https://github.com/sdras/night-owl-vscode-theme) syntax themes by Sarah Drasner (MIT License) * [Solarized](https://github.com/altercation/solarized) themes by Ethan Schoonover (MIT License) +## Fonts + +The font used for the main novelWriter logo, mimetype and text banners is: + +* Pridi by Cadson Demak (Open Font License, Version 1.1) + ## Special Mentions Additional thanks to @johnblommers who was an early user and who has provided a lot of very useful diff --git a/docs/source/_static/novelwriter-dark.png b/docs/source/_static/novelwriter-dark.png index 0ad6329d..1c7935aa 100644 Binary files a/docs/source/_static/novelwriter-dark.png and b/docs/source/_static/novelwriter-dark.png differ diff --git a/docs/source/_static/novelwriter-light.png b/docs/source/_static/novelwriter-light.png index 02bd281d..7b4723a7 100644 Binary files a/docs/source/_static/novelwriter-light.png and b/docs/source/_static/novelwriter-light.png differ diff --git a/docs/source/_static/novelwriter-pdf.png b/docs/source/_static/novelwriter-pdf.png index 6261b1ee..2b61485e 100644 Binary files a/docs/source/_static/novelwriter-pdf.png and b/docs/source/_static/novelwriter-pdf.png differ diff --git a/novelwriter/assets/icons/novelwriter.ico b/novelwriter/assets/icons/novelwriter.ico index 24de4e24..fccc8bf9 100644 Binary files a/novelwriter/assets/icons/novelwriter.ico and b/novelwriter/assets/icons/novelwriter.ico differ diff --git a/novelwriter/assets/icons/novelwriter.svg b/novelwriter/assets/icons/novelwriter.svg index 18be89c1..a161cd19 100644 --- a/novelwriter/assets/icons/novelwriter.svg +++ b/novelwriter/assets/icons/novelwriter.svg @@ -1,184 +1,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - + + + + + + + + diff --git a/novelwriter/assets/icons/x-novelwriter-project.ico b/novelwriter/assets/icons/x-novelwriter-project.ico index c4937b3b..752d71e3 100644 Binary files a/novelwriter/assets/icons/x-novelwriter-project.ico and b/novelwriter/assets/icons/x-novelwriter-project.ico differ diff --git a/novelwriter/assets/icons/x-novelwriter-project.svg b/novelwriter/assets/icons/x-novelwriter-project.svg index 08546d15..dc577083 100644 --- a/novelwriter/assets/icons/x-novelwriter-project.svg +++ b/novelwriter/assets/icons/x-novelwriter-project.svg @@ -1,207 +1,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - + + + + + + + diff --git a/novelwriter/assets/text/credits_en.htm b/novelwriter/assets/text/credits_en.htm index 525ffca9..98393ef6 100644 --- a/novelwriter/assets/text/credits_en.htm +++ b/novelwriter/assets/text/credits_en.htm @@ -61,6 +61,13 @@ more contributions are listed on the project's Solarized themes by Ethan Schoonover (MIT License)

+

Fonts

+ +

The font used for the main novelWriter logo, mimetype and text banners is:

+

+ Pridi by Cadson Demak (Open Font License, Version 1.1) +

+

Special Mentions

Additional thanks to @johnblommers who was an early user and who has provided a lot diff --git a/setup/data/hicolor/128x128/apps/novelwriter.png b/setup/data/hicolor/128x128/apps/novelwriter.png index 3bef1318..a4bd8da4 100644 Binary files a/setup/data/hicolor/128x128/apps/novelwriter.png and b/setup/data/hicolor/128x128/apps/novelwriter.png differ diff --git a/setup/data/hicolor/128x128/mimetypes/application-x-novelwriter-project.png b/setup/data/hicolor/128x128/mimetypes/application-x-novelwriter-project.png index dbaac947..60d25560 100644 Binary files a/setup/data/hicolor/128x128/mimetypes/application-x-novelwriter-project.png and b/setup/data/hicolor/128x128/mimetypes/application-x-novelwriter-project.png differ diff --git a/setup/data/hicolor/16x16/apps/novelwriter.png b/setup/data/hicolor/16x16/apps/novelwriter.png index 20a90acf..4eb4c801 100644 Binary files a/setup/data/hicolor/16x16/apps/novelwriter.png and b/setup/data/hicolor/16x16/apps/novelwriter.png differ diff --git a/setup/data/hicolor/16x16/mimetypes/application-x-novelwriter-project.png b/setup/data/hicolor/16x16/mimetypes/application-x-novelwriter-project.png index 132b2f18..983235cd 100644 Binary files a/setup/data/hicolor/16x16/mimetypes/application-x-novelwriter-project.png and b/setup/data/hicolor/16x16/mimetypes/application-x-novelwriter-project.png differ diff --git a/setup/data/hicolor/24x24/apps/novelwriter.png b/setup/data/hicolor/24x24/apps/novelwriter.png index 0b89ac89..4f096a3c 100644 Binary files a/setup/data/hicolor/24x24/apps/novelwriter.png and b/setup/data/hicolor/24x24/apps/novelwriter.png differ diff --git a/setup/data/hicolor/24x24/mimetypes/application-x-novelwriter-project.png b/setup/data/hicolor/24x24/mimetypes/application-x-novelwriter-project.png index be91bcd5..3531fd06 100644 Binary files a/setup/data/hicolor/24x24/mimetypes/application-x-novelwriter-project.png and b/setup/data/hicolor/24x24/mimetypes/application-x-novelwriter-project.png differ diff --git a/setup/data/hicolor/256x256/apps/novelwriter.png b/setup/data/hicolor/256x256/apps/novelwriter.png index 143b1ef8..a9ec557a 100644 Binary files a/setup/data/hicolor/256x256/apps/novelwriter.png and b/setup/data/hicolor/256x256/apps/novelwriter.png differ diff --git a/setup/data/hicolor/256x256/mimetypes/application-x-novelwriter-project.png b/setup/data/hicolor/256x256/mimetypes/application-x-novelwriter-project.png index ce82f04b..9186479b 100644 Binary files a/setup/data/hicolor/256x256/mimetypes/application-x-novelwriter-project.png and b/setup/data/hicolor/256x256/mimetypes/application-x-novelwriter-project.png differ diff --git a/setup/data/hicolor/32x32/apps/novelwriter.png b/setup/data/hicolor/32x32/apps/novelwriter.png index d0046519..66c55c1f 100644 Binary files a/setup/data/hicolor/32x32/apps/novelwriter.png and b/setup/data/hicolor/32x32/apps/novelwriter.png differ diff --git a/setup/data/hicolor/32x32/mimetypes/application-x-novelwriter-project.png b/setup/data/hicolor/32x32/mimetypes/application-x-novelwriter-project.png index 32fc47cc..491b1bc7 100644 Binary files a/setup/data/hicolor/32x32/mimetypes/application-x-novelwriter-project.png and b/setup/data/hicolor/32x32/mimetypes/application-x-novelwriter-project.png differ diff --git a/setup/data/hicolor/48x48/apps/novelwriter.png b/setup/data/hicolor/48x48/apps/novelwriter.png index 3d3fce1d..669a1624 100644 Binary files a/setup/data/hicolor/48x48/apps/novelwriter.png and b/setup/data/hicolor/48x48/apps/novelwriter.png differ diff --git a/setup/data/hicolor/48x48/mimetypes/application-x-novelwriter-project.png b/setup/data/hicolor/48x48/mimetypes/application-x-novelwriter-project.png index 5fd7c22a..dddd247a 100644 Binary files a/setup/data/hicolor/48x48/mimetypes/application-x-novelwriter-project.png and b/setup/data/hicolor/48x48/mimetypes/application-x-novelwriter-project.png differ diff --git a/setup/data/hicolor/512x512/apps/novelwriter.png b/setup/data/hicolor/512x512/apps/novelwriter.png new file mode 100644 index 00000000..f86f49bb Binary files /dev/null and b/setup/data/hicolor/512x512/apps/novelwriter.png differ diff --git a/setup/data/hicolor/512x512/mimetypes/application-x-novelwriter-project.png b/setup/data/hicolor/512x512/mimetypes/application-x-novelwriter-project.png new file mode 100644 index 00000000..55c25651 Binary files /dev/null and b/setup/data/hicolor/512x512/mimetypes/application-x-novelwriter-project.png differ diff --git a/setup/data/hicolor/64x64/apps/novelwriter.png b/setup/data/hicolor/64x64/apps/novelwriter.png index 57f5e307..a60b8288 100644 Binary files a/setup/data/hicolor/64x64/apps/novelwriter.png and b/setup/data/hicolor/64x64/apps/novelwriter.png differ diff --git a/setup/data/hicolor/64x64/mimetypes/application-x-novelwriter-project.png b/setup/data/hicolor/64x64/mimetypes/application-x-novelwriter-project.png index d1382130..7e1a3635 100644 Binary files a/setup/data/hicolor/64x64/mimetypes/application-x-novelwriter-project.png and b/setup/data/hicolor/64x64/mimetypes/application-x-novelwriter-project.png differ diff --git a/setup/data/hicolor/scalable/apps/novelwriter.svg b/setup/data/hicolor/scalable/apps/novelwriter.svg index 18be89c1..a161cd19 100644 --- a/setup/data/hicolor/scalable/apps/novelwriter.svg +++ b/setup/data/hicolor/scalable/apps/novelwriter.svg @@ -1,184 +1,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - + + + + + + + + diff --git a/setup/data/hicolor/scalable/mimetypes/application-x-novelwriter-project.svg b/setup/data/hicolor/scalable/mimetypes/application-x-novelwriter-project.svg index 08546d15..dc577083 100644 --- a/setup/data/hicolor/scalable/mimetypes/application-x-novelwriter-project.svg +++ b/setup/data/hicolor/scalable/mimetypes/application-x-novelwriter-project.svg @@ -1,207 +1,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - + + + + + + + diff --git a/setup/data/novelwriter.png b/setup/data/novelwriter.png index 3d3fce1d..669a1624 100644 Binary files a/setup/data/novelwriter.png and b/setup/data/novelwriter.png differ diff --git a/setup/icons/novelwriter.ico b/setup/icons/novelwriter.ico index 24de4e24..fccc8bf9 100644 Binary files a/setup/icons/novelwriter.ico and b/setup/icons/novelwriter.ico differ diff --git a/setup/icons/novelwriter.svg b/setup/icons/novelwriter.svg index 18be89c1..a161cd19 100644 --- a/setup/icons/novelwriter.svg +++ b/setup/icons/novelwriter.svg @@ -1,184 +1,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - + + + + + + + + diff --git a/setup/icons/x-novelwriter-project.ico b/setup/icons/x-novelwriter-project.ico index c4937b3b..752d71e3 100644 Binary files a/setup/icons/x-novelwriter-project.ico and b/setup/icons/x-novelwriter-project.ico differ diff --git a/setup/icons/x-novelwriter-project.svg b/setup/icons/x-novelwriter-project.svg index 08546d15..dc577083 100644 --- a/setup/icons/x-novelwriter-project.svg +++ b/setup/icons/x-novelwriter-project.svg @@ -1,207 +1,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - + + + + + + + diff --git a/setup/macos/build.sh b/setup/macos/build.sh index 9a933972..dbc9834e 100755 --- a/setup/macos/build.sh +++ b/setup/macos/build.sh @@ -62,6 +62,14 @@ fi echo "Content of current dir:" ls -lah . +# Create icon +echo "Creating icon ..." +pushd "$SRC_DIR/setup/macos" || exit 1 +iconutil -c icns $SRC_DIR/setup/macos/novelwriter.iconset +echo "Content of current dir:" +ls -lah . + +popd || exit 1 popd || exit 1 pushd "$BUILD_DIR"/ || exit 1 diff --git a/setup/macos/generate_icns.sh b/setup/macos/generate_icns.sh deleted file mode 100755 index 0ca1d9c0..00000000 --- a/setup/macos/generate_icns.sh +++ /dev/null @@ -1,70 +0,0 @@ -#! /usr/bin/env bash - -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) - -function generate_linux () { - echo "Generating on Linux ..." - if ! command -v png2icns &> /dev/null - then - echo "png2icns cound not be found, it is required. Please install a package like icnsutils or libicns." - exit - fi - - if ! command -v convert $> /dev/null - then - echo "convert could not be found, it is required. please install a imagemagick package." - exit - fi - - mkdir -p $SCRIPT_DIR/icons - - sizes=( 16 32 64 128 256 ) - for base in "${sizes[@]}"; do - let basex2=${base}*2 - size="${base}x${base}" - echo "Copying files for $size" - double=${basex2}x${basex2} - cp $SCRIPT_DIR/../data/hicolor/${size}/apps/novelwriter.png $SCRIPT_DIR/icons/icon_${size}.png - echo "Resizing ${size}@2x to $double from $size" - convert $SCRIPT_DIR/icons/icon_${size}.png -resize $double $SCRIPT_DIR/icons/icon_${size}@2x.png - done - - png2icns $SCRIPT_DIR/novelwriter.icns $SCRIPT_DIR/icons/icon_*.png - - rm -r $SCRIPT_DIR/icons - - echo "Done" -} - -function generate_macos () { - echo "Generating on MacOs ..." - mkdir -p $SCRIPT_DIR/icons - - echo "Building Iconset ..." - sizes=( 16 32 64 128 256 ) - for base in "${sizes[@]}"; do - let basex2=${base}*2 - size="${base}x${base}" - echo "Copying files for $size" - double=${basex2}x${basex2} - cp $SCRIPT_DIR/../data/hicolor/${size}/apps/novelwriter.png $SCRIPT_DIR/icons/icon_${size}.png - cp $SCRIPT_DIR/../data/hicolor/${size}/apps/novelwriter.png $SCRIPT_DIR/icons/icon_${size}@2x.png - echo "Resizing ${size}@2x to $double from $size" - sips -Z $basex2 $SCRIPT_DIR/icons/icon_${size}@2x.png - done - - rm -rf $SCRIPT_DIR/novelwriter.iconset - mv $SCRIPT_DIR/icons $SCRIPT_DIR/novelwriter.iconset - - echo "Generating icns ..." - iconutil -c icns $SCRIPT_DIR/novelwriter.iconset - - echo "Done" -} - -unameOut="$(uname -s)" -case "$unameOut" in - Linux*) generate_linux;; - Darwin*) generate_macos;; - *) echo "Unsupported OS" -esac diff --git a/setup/macos/novelwriter.icns b/setup/macos/novelwriter.icns deleted file mode 100644 index 884347bf..00000000 Binary files a/setup/macos/novelwriter.icns and /dev/null differ diff --git a/setup/macos/novelwriter.iconset/icon_128x128.png b/setup/macos/novelwriter.iconset/icon_128x128.png new file mode 100644 index 00000000..37018293 Binary files /dev/null and b/setup/macos/novelwriter.iconset/icon_128x128.png differ diff --git a/setup/macos/novelwriter.iconset/icon_128x128@2x.png b/setup/macos/novelwriter.iconset/icon_128x128@2x.png new file mode 100644 index 00000000..317ac312 Binary files /dev/null and b/setup/macos/novelwriter.iconset/icon_128x128@2x.png differ diff --git a/setup/macos/novelwriter.iconset/icon_16x16.png b/setup/macos/novelwriter.iconset/icon_16x16.png new file mode 100644 index 00000000..c9776183 Binary files /dev/null and b/setup/macos/novelwriter.iconset/icon_16x16.png differ diff --git a/setup/macos/novelwriter.iconset/icon_16x16@2x.png b/setup/macos/novelwriter.iconset/icon_16x16@2x.png new file mode 100644 index 00000000..aeeda556 Binary files /dev/null and b/setup/macos/novelwriter.iconset/icon_16x16@2x.png differ diff --git a/setup/macos/novelwriter.iconset/icon_256x256.png b/setup/macos/novelwriter.iconset/icon_256x256.png new file mode 100644 index 00000000..b9444f9d Binary files /dev/null and b/setup/macos/novelwriter.iconset/icon_256x256.png differ diff --git a/setup/macos/novelwriter.iconset/icon_256x256@2x.png b/setup/macos/novelwriter.iconset/icon_256x256@2x.png new file mode 100644 index 00000000..f93ad86e Binary files /dev/null and b/setup/macos/novelwriter.iconset/icon_256x256@2x.png differ diff --git a/setup/macos/novelwriter.iconset/icon_32x32.png b/setup/macos/novelwriter.iconset/icon_32x32.png new file mode 100644 index 00000000..f5f1b41f Binary files /dev/null and b/setup/macos/novelwriter.iconset/icon_32x32.png differ diff --git a/setup/macos/novelwriter.iconset/icon_32x32@2x.png b/setup/macos/novelwriter.iconset/icon_32x32@2x.png new file mode 100644 index 00000000..640771f3 Binary files /dev/null and b/setup/macos/novelwriter.iconset/icon_32x32@2x.png differ diff --git a/setup/macos/novelwriter.iconset/icon_512x512.png b/setup/macos/novelwriter.iconset/icon_512x512.png new file mode 100644 index 00000000..ab819662 Binary files /dev/null and b/setup/macos/novelwriter.iconset/icon_512x512.png differ diff --git a/setup/macos/novelwriter.iconset/icon_512x512@2x.png b/setup/macos/novelwriter.iconset/icon_512x512@2x.png new file mode 100644 index 00000000..b8bc6c13 Binary files /dev/null and b/setup/macos/novelwriter.iconset/icon_512x512@2x.png differ diff --git a/setup/novelwriter.png b/setup/novelwriter.png index a9f2b5bc..79503238 100644 Binary files a/setup/novelwriter.png and b/setup/novelwriter.png differ diff --git a/setup/novelwriter_text.png b/setup/novelwriter_text.png index e7f169cd..084ffbf2 100644 Binary files a/setup/novelwriter_text.png and b/setup/novelwriter_text.png differ