diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/assets/images/icon-notification.png | bin | 7231 -> 7194 bytes | |||
| -rw-r--r-- | gui/assets/images/logo-icon.svg | 71 | ||||
| -rw-r--r-- | gui/scripts/README.md | 12 | ||||
| -rwxr-xr-x | gui/scripts/build-logo-icons.sh | 14 |
4 files changed, 53 insertions, 44 deletions
diff --git a/gui/assets/images/icon-notification.png b/gui/assets/images/icon-notification.png Binary files differindex 23e028728c..a220894700 100644 --- a/gui/assets/images/icon-notification.png +++ b/gui/assets/images/icon-notification.png diff --git a/gui/assets/images/logo-icon.svg b/gui/assets/images/logo-icon.svg index 10096f2a47..9df70ac22b 100644 --- a/gui/assets/images/logo-icon.svg +++ b/gui/assets/images/logo-icon.svg @@ -1,43 +1,38 @@ -<svg version="1.1" id="brand" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - x="0px" y="0px" viewBox="73.7 73.7 252.6 252.6" style="enable-background:new 0 0 400 400;" xml:space="preserve"> +<?xml version="1.0" encoding="utf-8"?> +<svg version="1.1" id="logo_00000183244726354177486890000003471613280854675596_" + xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 252 252" + style="enable-background:new 0 0 252 252;" xml:space="preserve"> <style type="text/css"> - .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#192E45;} - .st1{fill-rule:evenodd;clip-rule:evenodd;fill:#D0933A;} - .st2{fill-rule:evenodd;clip-rule:evenodd;fill:#FFCC86;} - .st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FDD321;} - .st4{fill:#FFFFFF;} - .st5{fill:#1D2A3A;} + .background{fill-rule:evenodd;clip-rule:evenodd;fill:#192E45;} + .fur{fill-rule:evenodd;clip-rule:evenodd;fill:#D2943B;} + .nose{fill-rule:evenodd;clip-rule:evenodd;fill:#FFCD86;} + .helmet{fill-rule:evenodd;clip-rule:evenodd;fill:#FFD524;} + .lamp-light{fill:#FFFFFF;} + .lamp-ring{fill:#192E45;} </style> -<g id="Logo"> - <path id="bg" class="st0" d="M73.7,200 c0,69.8,56.6,126.3,126.3,126.3 S326.3,269.8,326.3,200 S269.8,73.7,200,73.7 - S73.7,130.2,73.7,200L73.7,200L73.7,200L73.7,200z"/> - <path id="Mullvad_Fur" class="st1" d="M90.6,184.9l9.6-13.4c0,0.1-0.6,19.3-0.6,19.3l2.7-14.5c8,16.2,27.6,38.6,45.5,50.6 - c1.9,1.3,3.5,2.7,4.6,4.1c2.3,0.9,4.6,1.4,6.9,1.8c1.2,0.2,2.5,0.3,3.7,0.4c1.2,0.1,2.5,0.1,3.7,0.1c1.2,0,2.4-0.1,3.6-0.2 - c1.2-0.1,2.4-0.3,3.6-0.5c1.2-0.2,2.4-0.4,3.5-0.8c1.2-0.3,2.3-0.6,3.5-1c1.1-0.3,2.3-0.8,3.4-1.2c1.1-0.5,2.2-0.9,3.3-1.5 - c1.1-0.6,2.2-1.1,3.2-1.7c1.1-0.5,2.1-1.2,3.2-1.8c1.1-0.6,2.1-1.3,3.2-1.9c1.1-0.6,2.1-1.3,3.1-1.9c1-0.7,2.1-1.3,3.1-2 - c1-0.7,2.1-1.3,3.2-2l1-0.6l0.5,0.3l7.2,4.8l-7.3-1.9c-0.7,0.8-1.4,1.6-2.2,2.4c-0.9,0.9-1.9,1.8-2.8,2.7c-1,0.8-2,1.7-3.1,2.4 - c-1.1,0.8-2.1,1.5-3.3,2.2c-2.2,1.4-4.6,2.6-7.1,3.6c-1.2,0.5-2.5,1-3.7,1.4c-1.3,0.4-2.5,0.8-3.8,1.1c-1.3,0.3-2.6,0.6-3.9,0.8 - c-1.3,0.2-2.6,0.3-3.9,0.5c-2.6,0.1-5.3,0.1-7.9-0.3c-1.3-0.2-2.6-0.4-3.9-0.7c-1.3-0.3-2.5-0.7-3.7-1.1c-2.1-0.8-4.2-1.8-6.1-3 - c0,0-6.9,1-4.1,6.2c2.8,5.2,7,4.7,5,10.8c-1.4,3.3-3.4,6.5-5.6,9.5c-4.6,6.2-11.8,11.7-11.1,15c32.7,40.3,106.4,34.7,134.4-1.3 - c-0.4-5.2-8.6-7.7-14.3-20.4c1.6,0.5,4,1.2,4,1.1c0-0.1-6.8-11.1-7.1-12.2l4.4,0.3c0,0-5.8-7.2-6-7.9l5.9-0.8c0,0-7.4-8.5-7.5-9.2 - l7.5,1.2l-8.2-9.9h3.9l-4.6-6.7c-0.8-0.3-1.6-0.5-2.4-0.7c-1-0.3-2-0.6-3-0.9c-11.2-3.5-21.8-6.7-32-13.1 - c-14.3-8.9-27.1-19.8-36.7-28.3l-19.3-9.4c-18.5-1.4-35.9-0.9-46.5,1.2l6.8-11.6l-10.4,12.5c-0.7-0.2-0.9-0.6-0.9-0.6l0.7-15.4 - l-3.3,13.9c-1-0.5-2.2-0.7-3.4-0.7c-4.6,0-8.3,3.7-8.3,8.3c0,4.2,3.1,7.7,7.2,8.2L90.6,184.9L90.6,184.9L90.6,184.9L90.6,184.9z"/> - <path id="Mullvad_Nose" class="st2" d="M102.2,154.5c-1-0.4-2.2-0.7-3.3-0.7c-4.6,0-8.3,3.7-8.3,8.3c0,4,2.9,7.4,6.7,8.2 - c0.1,0,0.1,0,0.2,0c2.5-0.8,7.5-7.5,6.7-11.7C103.9,157.1,103.2,155.7,102.2,154.5L102.2,154.5L102.2,154.5L102.2,154.5z"/> - <path id="Mullvad_Helmet" class="st3" d="M175.1,143.8c-1.5-4.1-1.1-9.4,1-14.4c3-6.9,8.7-11.5,14.1-11.5c1.1,0,2.1,0.2,3.1,0.6 - c3.1-2.8,6.7-5.1,10.7-6.7c22.1-8.8,54.4,6.9,62.7,28.6c4,10.5,2.8,22-0.6,32.5c-2.8,8.6-13,21-9.2,30.4 - c-1.5-0.4-33.1-10.2-41.9-15.8c-14.1-8.8-26.8-19.6-36.3-28l-0.3-0.3L146.3,144c-0.4-0.2-0.8-0.4-1.1-0.6 - C149.8,143.4,167.3,145.5,175.1,143.8"/> - <g id="Helmet_Lamp"> - <path class="st4" d="M184.6,147.4c-0.9,0-1.7-0.2-2.3-0.5c-1.6-0.7-2.8-2-3.6-4c-1.4-3.4-1-8.1,0.9-12.5c2.5-5.7,7.2-9.7,11.5-9.7 - c0.8,0,1.6,0.2,2.4,0.5c2.1,0.9,3.6,3,4.1,6c0.6,3.2,0.1,6.9-1.5,10.4C193.6,143.3,188.8,147.4,184.6,147.4z"/> - <g> - <path class="st5" d="M191,122.3c0.6,0,1.2,0.1,1.8,0.4c1.6,0.7,2.8,2.5,3.2,4.9c0.5,2.9,0.1,6.3-1.4,9.5 - c-2.2,5.1-6.5,8.8-10.1,8.8c-0.6,0-1.2-0.1-1.7-0.3l0,0l0,0c-1.5-0.6-2.3-2-2.7-3.1c-1.2-3-0.9-7.4,0.8-11.4 - C183.2,126,187.4,122.3,191,122.3 M191,119.3c-4.8,0-10.1,4.4-12.9,10.7c-2.1,4.7-2.4,9.8-0.9,13.7c0.9,2.3,2.4,3.9,4.3,4.8 - c0.9,0.4,1.9,0.6,3,0.6c4.8,0,10.1-4.4,12.8-10.7c1.7-3.8,2.2-7.8,1.6-11.3c-0.6-3.5-2.4-6-5-7.1 - C193.1,119.5,192.1,119.3,191,119.3L191,119.3z"/> +<g id="mole"> + <path id="bg" class="background" d="M0,126c0,69.6,56.5,126,126,126s126-56.4,126-126S195.6,0,126,0S0,56.4,0,126L0,126L0,126L0,126z"/> + <g id="body"> + <path id="fur" class="fur" d="M23.9,96.6L16.8,111l9.6-13.4c0,0.1-0.6,19.3-0.6,19.3l2.7-14.5c7.2,13.7,23.1,34.8,45.4,50.5 + c1.7,1.2,3.9,3.3,4.6,4.1c0,0,21.3,10.8,54.1-14.2c0.3-0.2,0.7-0.4,1-0.6l0.5,0.3l7.2,4.8c-2.5-0.7-7.3-1.9-7.3-1.9 + c-15.8,18.2-41.5,21.2-55.3,12c-0.6-0.4-4,1-4.6,3c-0.4,1.1,0,2.3,0.5,3.2c2.8,5.2,7,4.7,5,10.8c-1.4,3.3-3.4,6.5-5.6,9.5 + c-4.6,6.2-11.8,11.7-11.1,15c32.6,40.2,106.1,34.6,134.1-1.3c-0.4-5.2-8.6-7.7-14.3-20.4c1.6,0.5,4,1.2,4,1.1 + c0-0.1-6.8-11.1-7.1-12.2l4.4,0.3c0,0-5.8-7.2-6-7.9l5.9-0.8c0,0-7.4-8.5-7.5-9.2l7.5,1.2l-8.2-9.9h3.9l-4.6-6.7l-37.3-14.7 + c-14.3-8.9-27-19.8-36.6-28.2l-19.3-9.4C63.3,79.4,46,79.9,35.4,82l6.8-11.6l-9.9,11.8C31.7,82,31,81.8,31,81.8l0.7-15l-3.3,14 + L23.9,96.6z"/> + <path id="nose" class="nose" d="M28.4,80.8c-4.9-2.3-10.6,1-11.6,5.5c-1.2,4.3,1.8,9.6,7.1,10.3C28.9,93.5,33.2,85.5,28.4,80.8z"/> + </g> + <g id="helmet"> + <path id="helmet" class="helmet" d="M101.2,69.9c-1.5-4.1-1.1-9.4,1-14.4c3-6.9,8.7-11.5,14.1-11.5c1.1,0,2.1,0.2,3.1,0.6 + c3.1-2.8,6.7-5.1,10.7-6.7c22-8.8,54.3,6.9,62.6,28.5c4,10.5,2.8,21.9-0.6,32.4c-2.8,8.6-13,21-9.2,30.3 + c-1.5-0.4-32.8-11-41.8-15.8c-14.1-8.8-26.7-19.6-36.2-27.9l-0.3-0.3l-32-15.2c-0.4-0.2-0.8-0.4-1.1-0.6 + C75.9,69.5,93.4,71.6,101.2,69.9"/> + <g id="lamp"> + + <ellipse id="lamp-light" transform="matrix(0.4007 -0.9162 0.9162 0.4007 12.8553 140.4693)" class="lamp-light" cx="113.8" cy="60.4" rx="13.6" ry="8.1"/> + <path id="lamp-ring" class="lamp-ring" d="M120.1,46.1c-5.3-2.3-12.4,2.2-15.9,10.1s-1.9,16.1,3.4,18.5c5.3,2.3,12.4-2.2,15.9-10.1 + S125.4,48.5,120.1,46.1z M120.6,63.4c-2.8,6.3-8.1,10.1-11.8,8.5c-3.8-1.7-4.6-8.1-1.8-14.5c2.8-6.3,8.1-10.1,11.9-8.5 + C122.6,50.6,123.4,57.1,120.6,63.4z"/> </g> </g> </g> diff --git a/gui/scripts/README.md b/gui/scripts/README.md index cd9b723045..7fd98fb217 100644 --- a/gui/scripts/README.md +++ b/gui/scripts/README.md @@ -1,7 +1,9 @@ This is a folder with the supporting scripts written in Python 3, node, bash. -## Dependency installation notes +## Maps and location translations + +### Dependency installation notes 1. Install GDAL/OGR dependencies, which are required by Fiona python package. @@ -20,7 +22,7 @@ This is a folder with the supporting scripts written in Python 3, node, bash. https://www.gnu.org/software/gettext/ -## Geo data installation notes +### Geo data installation notes Go to http://www.naturalearthdata.com/downloads/50m-cultural-vectors/ and download ZIP files with the following shapes: @@ -52,7 +54,7 @@ unzip ne_50m_admin_1_states_provinces_lines.zip -d ne_50m_admin_1_states_provinc unzip ne_10m_populated_places.zip -d ne_10m_populated_places/ ``` -## Geo data extraction notes +### Geo data extraction notes Run the following script to produce a TopoJSON data used by the app: @@ -68,7 +70,7 @@ npm exec ts-node prepare-rtree.ts At this point all of the data should be saved in `gui/scripts/out` folder. -## App integration notes +### App integration notes Once you've extracted all the geo data, run the integration script that will copy all files ignoring intermediate ones into the `gui/assets/geo` folder: @@ -77,7 +79,7 @@ copy all files ignoring intermediate ones into the `gui/assets/geo` folder: python3 integrate-into-app.py ``` -## Locking Python dependencies +### Locking Python dependencies 1. Freeze dependencies: diff --git a/gui/scripts/build-logo-icons.sh b/gui/scripts/build-logo-icons.sh index 78d8652096..7002d565ee 100755 --- a/gui/scripts/build-logo-icons.sh +++ b/gui/scripts/build-logo-icons.sh @@ -1,12 +1,22 @@ #!/usr/bin/env bash -# Icon guidlines for MacOS: +# This script creates the macOS .icns from the icons in /graphics/macOS/ which need to be updated +# first if the source SVGs have been updated. More info about how to update them can be found in +# the readme. +# +# Icon guidlines for macOS: # https://developer.apple.com/design/human-interface-guidelines/macos/icons-and-images/app-icon/ # +# Icon templates for macOS: +# https://developer.apple.com/design/resources/ +# # Icon guidlines for Windows: # https://docs.microsoft.com/en-us/windows/uwp/design/style/app-icons-and-logos#target-size-app-icon-assets # https://docs.microsoft.com/en-us/windows/win32/uxguide/vis-icons +echo "Press enter to continue if you've followed the instructions in graphics/README.md" +read -r + set -eu if ! command -v convert > /dev/null; then @@ -24,6 +34,8 @@ if ! command -v iconutil > /dev/null; then exit 1 fi + + SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd "$SCRIPT_DIR" |
