diff options
139 files changed, 187 insertions, 45 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 06743eb420..7c410e9686 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,10 +25,12 @@ Line wrap the file at 100 chars. Th ## [Unreleased] ### Added - Add reconnect button to the desktop app +- Add monochrome option for the tray icon on Windows and Linux. ### Changed - Change project copyright and company name from Amagicom AB to Mullvad VPN AB - Only reconnect when settings change if a relevant tunnel protocol is used. +- Adjust padding of tray icon on Windows and Linux to better match other icons. ## [2020.1-beta1] - 2020-02-05 @@ -564,6 +564,14 @@ The GUI has a specific settings file that is configured for each user. The path | Windows | `%LOCALAPPDATA%\Mullvad VPN\gui_settings.json` | | Android | Present in Android's `logcat` | +## Generating menubar icons +How to modify and generate menubar icons are described +[here](./gui/assets/images/menubar%20icons/README.md). + +## Locales and translations +Instructions for how to handle locales and translations are found +[here](./gui/locales/README.md). + ## Audits, pentests and external security reviews Mullvad has used external pentesting companies to carry out security audits of this VPN app. Read diff --git a/gui/assets/images/menubar icons/README.md b/gui/assets/images/menubar icons/README.md new file mode 100644 index 0000000000..818d0b6029 --- /dev/null +++ b/gui/assets/images/menubar icons/README.md @@ -0,0 +1,17 @@ +This directory contains the images for the menubar/traybar. The content consists of: + * SVG files for the colored version of each frame + * png/ico files which are created from the svg files. These should not be edited or replaced + manually. + +## Build script +The png/ico files are generated using the script `gui/scripts/build-menubar-icons.sh` which can be +run from the `gui`-directory using +```sh +./scripts/build-menubar-icons.sh +``` + +The script crates all menubar images for all platforms including the monochrome ones. + +### Dependencies +Imagemagick is required for the script to run. + diff --git a/gui/assets/images/menubar icons/darwin/lock-1.png b/gui/assets/images/menubar icons/darwin/lock-1.png Binary files differnew file mode 100644 index 0000000000..9982de6fd7 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-1.png diff --git a/gui/assets/images/menubar icons/darwin/lock-10.png b/gui/assets/images/menubar icons/darwin/lock-10.png Binary files differnew file mode 100644 index 0000000000..c84966ee03 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-10.png diff --git a/gui/assets/images/menubar icons/darwin/lock-10@2x.png b/gui/assets/images/menubar icons/darwin/lock-10@2x.png Binary files differnew file mode 100644 index 0000000000..390323435e --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-10@2x.png diff --git a/gui/assets/images/menubar icons/darwin/lock-10Template.png b/gui/assets/images/menubar icons/darwin/lock-10Template.png Binary files differnew file mode 100644 index 0000000000..0473040c88 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-10Template.png diff --git a/gui/assets/images/menubar icons/darwin/lock-10Template@2x.png b/gui/assets/images/menubar icons/darwin/lock-10Template@2x.png Binary files differnew file mode 100644 index 0000000000..02d23e306c --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-10Template@2x.png diff --git a/gui/assets/images/menubar icons/darwin/lock-1@2x.png b/gui/assets/images/menubar icons/darwin/lock-1@2x.png Binary files differnew file mode 100644 index 0000000000..ac4975a141 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-1@2x.png diff --git a/gui/assets/images/menubar icons/darwin/lock-1Template.png b/gui/assets/images/menubar icons/darwin/lock-1Template.png Binary files differnew file mode 100644 index 0000000000..db5905657d --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-1Template.png diff --git a/gui/assets/images/menubar icons/darwin/lock-1Template@2x.png b/gui/assets/images/menubar icons/darwin/lock-1Template@2x.png Binary files differnew file mode 100644 index 0000000000..39b77e3361 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-1Template@2x.png diff --git a/gui/assets/images/menubar icons/darwin/lock-2.png b/gui/assets/images/menubar icons/darwin/lock-2.png Binary files differnew file mode 100644 index 0000000000..a62875eb14 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-2.png diff --git a/gui/assets/images/menubar icons/darwin/lock-2@2x.png b/gui/assets/images/menubar icons/darwin/lock-2@2x.png Binary files differnew file mode 100644 index 0000000000..15d645f8f5 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-2@2x.png diff --git a/gui/assets/images/menubar icons/darwin/lock-2Template.png b/gui/assets/images/menubar icons/darwin/lock-2Template.png Binary files differnew file mode 100644 index 0000000000..f9a8270227 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-2Template.png diff --git a/gui/assets/images/menubar icons/darwin/lock-2Template@2x.png b/gui/assets/images/menubar icons/darwin/lock-2Template@2x.png Binary files differnew file mode 100644 index 0000000000..0f9d49ec93 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-2Template@2x.png diff --git a/gui/assets/images/menubar icons/darwin/lock-3.png b/gui/assets/images/menubar icons/darwin/lock-3.png Binary files differnew file mode 100644 index 0000000000..c7590c1b59 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-3.png diff --git a/gui/assets/images/menubar icons/darwin/lock-3@2x.png b/gui/assets/images/menubar icons/darwin/lock-3@2x.png Binary files differnew file mode 100644 index 0000000000..e8403ea999 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-3@2x.png diff --git a/gui/assets/images/menubar icons/darwin/lock-3Template.png b/gui/assets/images/menubar icons/darwin/lock-3Template.png Binary files differnew file mode 100644 index 0000000000..4c8c21de02 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-3Template.png diff --git a/gui/assets/images/menubar icons/darwin/lock-3Template@2x.png b/gui/assets/images/menubar icons/darwin/lock-3Template@2x.png Binary files differnew file mode 100644 index 0000000000..1fa05af764 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-3Template@2x.png diff --git a/gui/assets/images/menubar icons/darwin/lock-4.png b/gui/assets/images/menubar icons/darwin/lock-4.png Binary files differnew file mode 100644 index 0000000000..aa97f2a442 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-4.png diff --git a/gui/assets/images/menubar icons/darwin/lock-4@2x.png b/gui/assets/images/menubar icons/darwin/lock-4@2x.png Binary files differnew file mode 100644 index 0000000000..7ec8cda048 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-4@2x.png diff --git a/gui/assets/images/menubar icons/darwin/lock-4Template.png b/gui/assets/images/menubar icons/darwin/lock-4Template.png Binary files differnew file mode 100644 index 0000000000..aab6eb5505 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-4Template.png diff --git a/gui/assets/images/menubar icons/darwin/lock-4Template@2x.png b/gui/assets/images/menubar icons/darwin/lock-4Template@2x.png Binary files differnew file mode 100644 index 0000000000..6870f7fb1a --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-4Template@2x.png diff --git a/gui/assets/images/menubar icons/darwin/lock-5.png b/gui/assets/images/menubar icons/darwin/lock-5.png Binary files differnew file mode 100644 index 0000000000..26db606626 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-5.png diff --git a/gui/assets/images/menubar icons/darwin/lock-5@2x.png b/gui/assets/images/menubar icons/darwin/lock-5@2x.png Binary files differnew file mode 100644 index 0000000000..410cdb415b --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-5@2x.png diff --git a/gui/assets/images/menubar icons/darwin/lock-5Template.png b/gui/assets/images/menubar icons/darwin/lock-5Template.png Binary files differnew file mode 100644 index 0000000000..a4a23bdeb7 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-5Template.png diff --git a/gui/assets/images/menubar icons/darwin/lock-5Template@2x.png b/gui/assets/images/menubar icons/darwin/lock-5Template@2x.png Binary files differnew file mode 100644 index 0000000000..97b93cdab0 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-5Template@2x.png diff --git a/gui/assets/images/menubar icons/darwin/lock-6.png b/gui/assets/images/menubar icons/darwin/lock-6.png Binary files differnew file mode 100644 index 0000000000..ebc5a3c5d5 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-6.png diff --git a/gui/assets/images/menubar icons/darwin/lock-6@2x.png b/gui/assets/images/menubar icons/darwin/lock-6@2x.png Binary files differnew file mode 100644 index 0000000000..8ad3e9a9b1 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-6@2x.png diff --git a/gui/assets/images/menubar icons/darwin/lock-6Template.png b/gui/assets/images/menubar icons/darwin/lock-6Template.png Binary files differnew file mode 100644 index 0000000000..6766e24687 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-6Template.png diff --git a/gui/assets/images/menubar icons/darwin/lock-6Template@2x.png b/gui/assets/images/menubar icons/darwin/lock-6Template@2x.png Binary files differnew file mode 100644 index 0000000000..4b3e19d29c --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-6Template@2x.png diff --git a/gui/assets/images/menubar icons/darwin/lock-7.png b/gui/assets/images/menubar icons/darwin/lock-7.png Binary files differnew file mode 100644 index 0000000000..c5b650c0bb --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-7.png diff --git a/gui/assets/images/menubar icons/darwin/lock-7@2x.png b/gui/assets/images/menubar icons/darwin/lock-7@2x.png Binary files differnew file mode 100644 index 0000000000..36ca209ce4 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-7@2x.png diff --git a/gui/assets/images/menubar icons/darwin/lock-7Template.png b/gui/assets/images/menubar icons/darwin/lock-7Template.png Binary files differnew file mode 100644 index 0000000000..ef1a451b24 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-7Template.png diff --git a/gui/assets/images/menubar icons/darwin/lock-7Template@2x.png b/gui/assets/images/menubar icons/darwin/lock-7Template@2x.png Binary files differnew file mode 100644 index 0000000000..5e4c937185 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-7Template@2x.png diff --git a/gui/assets/images/menubar icons/darwin/lock-8.png b/gui/assets/images/menubar icons/darwin/lock-8.png Binary files differnew file mode 100644 index 0000000000..0bf01822af --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-8.png diff --git a/gui/assets/images/menubar icons/darwin/lock-8@2x.png b/gui/assets/images/menubar icons/darwin/lock-8@2x.png Binary files differnew file mode 100644 index 0000000000..79affd7f8d --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-8@2x.png diff --git a/gui/assets/images/menubar icons/darwin/lock-8Template.png b/gui/assets/images/menubar icons/darwin/lock-8Template.png Binary files differnew file mode 100644 index 0000000000..9cc1f1edc0 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-8Template.png diff --git a/gui/assets/images/menubar icons/darwin/lock-8Template@2x.png b/gui/assets/images/menubar icons/darwin/lock-8Template@2x.png Binary files differnew file mode 100644 index 0000000000..430b2098dc --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-8Template@2x.png diff --git a/gui/assets/images/menubar icons/darwin/lock-9.png b/gui/assets/images/menubar icons/darwin/lock-9.png Binary files differnew file mode 100644 index 0000000000..6e2cd4eb55 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-9.png diff --git a/gui/assets/images/menubar icons/darwin/lock-9@2x.png b/gui/assets/images/menubar icons/darwin/lock-9@2x.png Binary files differnew file mode 100644 index 0000000000..1ba3c5ff99 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-9@2x.png diff --git a/gui/assets/images/menubar icons/darwin/lock-9Template.png b/gui/assets/images/menubar icons/darwin/lock-9Template.png Binary files differnew file mode 100644 index 0000000000..644073a009 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-9Template.png diff --git a/gui/assets/images/menubar icons/darwin/lock-9Template@2x.png b/gui/assets/images/menubar icons/darwin/lock-9Template@2x.png Binary files differnew file mode 100644 index 0000000000..dcfe02f3b6 --- /dev/null +++ b/gui/assets/images/menubar icons/darwin/lock-9Template@2x.png diff --git a/gui/assets/images/menubar icons/linux/lock-1.png b/gui/assets/images/menubar icons/linux/lock-1.png Binary files differnew file mode 100644 index 0000000000..bcd2fcd780 --- /dev/null +++ b/gui/assets/images/menubar icons/linux/lock-1.png diff --git a/gui/assets/images/menubar icons/linux/lock-10.png b/gui/assets/images/menubar icons/linux/lock-10.png Binary files differnew file mode 100644 index 0000000000..2fa3137d24 --- /dev/null +++ b/gui/assets/images/menubar icons/linux/lock-10.png diff --git a/gui/assets/images/menubar icons/linux/lock-10_white.png b/gui/assets/images/menubar icons/linux/lock-10_white.png Binary files differnew file mode 100644 index 0000000000..5925dc0fab --- /dev/null +++ b/gui/assets/images/menubar icons/linux/lock-10_white.png diff --git a/gui/assets/images/menubar icons/linux/lock-1_white.png b/gui/assets/images/menubar icons/linux/lock-1_white.png Binary files differnew file mode 100644 index 0000000000..3174325cd6 --- /dev/null +++ b/gui/assets/images/menubar icons/linux/lock-1_white.png diff --git a/gui/assets/images/menubar icons/linux/lock-2.png b/gui/assets/images/menubar icons/linux/lock-2.png Binary files differnew file mode 100644 index 0000000000..2e2bce923b --- /dev/null +++ b/gui/assets/images/menubar icons/linux/lock-2.png diff --git a/gui/assets/images/menubar icons/linux/lock-2_white.png b/gui/assets/images/menubar icons/linux/lock-2_white.png Binary files differnew file mode 100644 index 0000000000..b0aefec4cd --- /dev/null +++ b/gui/assets/images/menubar icons/linux/lock-2_white.png diff --git a/gui/assets/images/menubar icons/linux/lock-3.png b/gui/assets/images/menubar icons/linux/lock-3.png Binary files differnew file mode 100644 index 0000000000..e1da7d5609 --- /dev/null +++ b/gui/assets/images/menubar icons/linux/lock-3.png diff --git a/gui/assets/images/menubar icons/linux/lock-3_white.png b/gui/assets/images/menubar icons/linux/lock-3_white.png Binary files differnew file mode 100644 index 0000000000..077bb466c0 --- /dev/null +++ b/gui/assets/images/menubar icons/linux/lock-3_white.png diff --git a/gui/assets/images/menubar icons/linux/lock-4.png b/gui/assets/images/menubar icons/linux/lock-4.png Binary files differnew file mode 100644 index 0000000000..d97e9db7a4 --- /dev/null +++ b/gui/assets/images/menubar icons/linux/lock-4.png diff --git a/gui/assets/images/menubar icons/linux/lock-4_white.png b/gui/assets/images/menubar icons/linux/lock-4_white.png Binary files differnew file mode 100644 index 0000000000..0466dd7c63 --- /dev/null +++ b/gui/assets/images/menubar icons/linux/lock-4_white.png diff --git a/gui/assets/images/menubar icons/linux/lock-5.png b/gui/assets/images/menubar icons/linux/lock-5.png Binary files differnew file mode 100644 index 0000000000..e2b3377923 --- /dev/null +++ b/gui/assets/images/menubar icons/linux/lock-5.png diff --git a/gui/assets/images/menubar icons/linux/lock-5_white.png b/gui/assets/images/menubar icons/linux/lock-5_white.png Binary files differnew file mode 100644 index 0000000000..0e6cb89e41 --- /dev/null +++ b/gui/assets/images/menubar icons/linux/lock-5_white.png diff --git a/gui/assets/images/menubar icons/linux/lock-6.png b/gui/assets/images/menubar icons/linux/lock-6.png Binary files differnew file mode 100644 index 0000000000..3302c8a649 --- /dev/null +++ b/gui/assets/images/menubar icons/linux/lock-6.png diff --git a/gui/assets/images/menubar icons/linux/lock-6_white.png b/gui/assets/images/menubar icons/linux/lock-6_white.png Binary files differnew file mode 100644 index 0000000000..8bb7017430 --- /dev/null +++ b/gui/assets/images/menubar icons/linux/lock-6_white.png diff --git a/gui/assets/images/menubar icons/linux/lock-7.png b/gui/assets/images/menubar icons/linux/lock-7.png Binary files differnew file mode 100644 index 0000000000..11b248ef03 --- /dev/null +++ b/gui/assets/images/menubar icons/linux/lock-7.png diff --git a/gui/assets/images/menubar icons/linux/lock-7_white.png b/gui/assets/images/menubar icons/linux/lock-7_white.png Binary files differnew file mode 100644 index 0000000000..a31abd0c13 --- /dev/null +++ b/gui/assets/images/menubar icons/linux/lock-7_white.png diff --git a/gui/assets/images/menubar icons/linux/lock-8.png b/gui/assets/images/menubar icons/linux/lock-8.png Binary files differnew file mode 100644 index 0000000000..642a1c47b5 --- /dev/null +++ b/gui/assets/images/menubar icons/linux/lock-8.png diff --git a/gui/assets/images/menubar icons/linux/lock-8_white.png b/gui/assets/images/menubar icons/linux/lock-8_white.png Binary files differnew file mode 100644 index 0000000000..6a06797a35 --- /dev/null +++ b/gui/assets/images/menubar icons/linux/lock-8_white.png diff --git a/gui/assets/images/menubar icons/linux/lock-9.png b/gui/assets/images/menubar icons/linux/lock-9.png Binary files differnew file mode 100644 index 0000000000..9b88a35809 --- /dev/null +++ b/gui/assets/images/menubar icons/linux/lock-9.png diff --git a/gui/assets/images/menubar icons/linux/lock-9_white.png b/gui/assets/images/menubar icons/linux/lock-9_white.png Binary files differnew file mode 100644 index 0000000000..cd2d468760 --- /dev/null +++ b/gui/assets/images/menubar icons/linux/lock-9_white.png diff --git a/gui/assets/images/menubar icons/lock-1.png b/gui/assets/images/menubar icons/lock-1.png Binary files differdeleted file mode 100644 index b20bc19515..0000000000 --- a/gui/assets/images/menubar icons/lock-1.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-10.png b/gui/assets/images/menubar icons/lock-10.png Binary files differdeleted file mode 100644 index 530e756c56..0000000000 --- a/gui/assets/images/menubar icons/lock-10.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-10@2x.png b/gui/assets/images/menubar icons/lock-10@2x.png Binary files differdeleted file mode 100644 index af73aa8c7b..0000000000 --- a/gui/assets/images/menubar icons/lock-10@2x.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-10Template.png b/gui/assets/images/menubar icons/lock-10Template.png Binary files differdeleted file mode 100644 index d11893684c..0000000000 --- a/gui/assets/images/menubar icons/lock-10Template.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-10Template@2x.png b/gui/assets/images/menubar icons/lock-10Template@2x.png Binary files differdeleted file mode 100644 index 71a918649c..0000000000 --- a/gui/assets/images/menubar icons/lock-10Template@2x.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-1@2x.png b/gui/assets/images/menubar icons/lock-1@2x.png Binary files differdeleted file mode 100644 index 1c512d12bd..0000000000 --- a/gui/assets/images/menubar icons/lock-1@2x.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-1Template.png b/gui/assets/images/menubar icons/lock-1Template.png Binary files differdeleted file mode 100644 index b20bc19515..0000000000 --- a/gui/assets/images/menubar icons/lock-1Template.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-1Template@2x.png b/gui/assets/images/menubar icons/lock-1Template@2x.png Binary files differdeleted file mode 100644 index 1c512d12bd..0000000000 --- a/gui/assets/images/menubar icons/lock-1Template@2x.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-2.png b/gui/assets/images/menubar icons/lock-2.png Binary files differdeleted file mode 100644 index d98d05d951..0000000000 --- a/gui/assets/images/menubar icons/lock-2.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-2@2x.png b/gui/assets/images/menubar icons/lock-2@2x.png Binary files differdeleted file mode 100644 index c92dec19ec..0000000000 --- a/gui/assets/images/menubar icons/lock-2@2x.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-2Template.png b/gui/assets/images/menubar icons/lock-2Template.png Binary files differdeleted file mode 100644 index d98d05d951..0000000000 --- a/gui/assets/images/menubar icons/lock-2Template.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-2Template@2x.png b/gui/assets/images/menubar icons/lock-2Template@2x.png Binary files differdeleted file mode 100644 index c92dec19ec..0000000000 --- a/gui/assets/images/menubar icons/lock-2Template@2x.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-3.png b/gui/assets/images/menubar icons/lock-3.png Binary files differdeleted file mode 100644 index 871f8402bf..0000000000 --- a/gui/assets/images/menubar icons/lock-3.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-3@2x.png b/gui/assets/images/menubar icons/lock-3@2x.png Binary files differdeleted file mode 100644 index d961af45f3..0000000000 --- a/gui/assets/images/menubar icons/lock-3@2x.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-3Template.png b/gui/assets/images/menubar icons/lock-3Template.png Binary files differdeleted file mode 100644 index 871f8402bf..0000000000 --- a/gui/assets/images/menubar icons/lock-3Template.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-3Template@2x.png b/gui/assets/images/menubar icons/lock-3Template@2x.png Binary files differdeleted file mode 100644 index d961af45f3..0000000000 --- a/gui/assets/images/menubar icons/lock-3Template@2x.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-4.png b/gui/assets/images/menubar icons/lock-4.png Binary files differdeleted file mode 100644 index 6fcb60c663..0000000000 --- a/gui/assets/images/menubar icons/lock-4.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-4@2x.png b/gui/assets/images/menubar icons/lock-4@2x.png Binary files differdeleted file mode 100644 index f67b4c0921..0000000000 --- a/gui/assets/images/menubar icons/lock-4@2x.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-4Template.png b/gui/assets/images/menubar icons/lock-4Template.png Binary files differdeleted file mode 100644 index 6fcb60c663..0000000000 --- a/gui/assets/images/menubar icons/lock-4Template.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-4Template@2x.png b/gui/assets/images/menubar icons/lock-4Template@2x.png Binary files differdeleted file mode 100644 index f67b4c0921..0000000000 --- a/gui/assets/images/menubar icons/lock-4Template@2x.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-5.png b/gui/assets/images/menubar icons/lock-5.png Binary files differdeleted file mode 100644 index 43d02ab1e0..0000000000 --- a/gui/assets/images/menubar icons/lock-5.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-5@2x.png b/gui/assets/images/menubar icons/lock-5@2x.png Binary files differdeleted file mode 100644 index 1f05adf802..0000000000 --- a/gui/assets/images/menubar icons/lock-5@2x.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-5Template.png b/gui/assets/images/menubar icons/lock-5Template.png Binary files differdeleted file mode 100644 index 43d02ab1e0..0000000000 --- a/gui/assets/images/menubar icons/lock-5Template.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-5Template@2x.png b/gui/assets/images/menubar icons/lock-5Template@2x.png Binary files differdeleted file mode 100644 index 1f05adf802..0000000000 --- a/gui/assets/images/menubar icons/lock-5Template@2x.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-6.png b/gui/assets/images/menubar icons/lock-6.png Binary files differdeleted file mode 100644 index e282ff8dad..0000000000 --- a/gui/assets/images/menubar icons/lock-6.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-6@2x.png b/gui/assets/images/menubar icons/lock-6@2x.png Binary files differdeleted file mode 100644 index f76ab999f1..0000000000 --- a/gui/assets/images/menubar icons/lock-6@2x.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-6Template.png b/gui/assets/images/menubar icons/lock-6Template.png Binary files differdeleted file mode 100644 index e282ff8dad..0000000000 --- a/gui/assets/images/menubar icons/lock-6Template.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-6Template@2x.png b/gui/assets/images/menubar icons/lock-6Template@2x.png Binary files differdeleted file mode 100644 index f76ab999f1..0000000000 --- a/gui/assets/images/menubar icons/lock-6Template@2x.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-7.png b/gui/assets/images/menubar icons/lock-7.png Binary files differdeleted file mode 100644 index 1299817a53..0000000000 --- a/gui/assets/images/menubar icons/lock-7.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-7@2x.png b/gui/assets/images/menubar icons/lock-7@2x.png Binary files differdeleted file mode 100644 index f3a1428ad4..0000000000 --- a/gui/assets/images/menubar icons/lock-7@2x.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-7Template.png b/gui/assets/images/menubar icons/lock-7Template.png Binary files differdeleted file mode 100644 index 1299817a53..0000000000 --- a/gui/assets/images/menubar icons/lock-7Template.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-7Template@2x.png b/gui/assets/images/menubar icons/lock-7Template@2x.png Binary files differdeleted file mode 100644 index f3a1428ad4..0000000000 --- a/gui/assets/images/menubar icons/lock-7Template@2x.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-8.png b/gui/assets/images/menubar icons/lock-8.png Binary files differdeleted file mode 100644 index 161e4f5e82..0000000000 --- a/gui/assets/images/menubar icons/lock-8.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-8@2x.png b/gui/assets/images/menubar icons/lock-8@2x.png Binary files differdeleted file mode 100644 index 5b12910e4a..0000000000 --- a/gui/assets/images/menubar icons/lock-8@2x.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-8Template.png b/gui/assets/images/menubar icons/lock-8Template.png Binary files differdeleted file mode 100644 index 161e4f5e82..0000000000 --- a/gui/assets/images/menubar icons/lock-8Template.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-8Template@2x.png b/gui/assets/images/menubar icons/lock-8Template@2x.png Binary files differdeleted file mode 100644 index 5b12910e4a..0000000000 --- a/gui/assets/images/menubar icons/lock-8Template@2x.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-9.png b/gui/assets/images/menubar icons/lock-9.png Binary files differdeleted file mode 100644 index c823aa87a1..0000000000 --- a/gui/assets/images/menubar icons/lock-9.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-9@2x.png b/gui/assets/images/menubar icons/lock-9@2x.png Binary files differdeleted file mode 100644 index e4dc28a192..0000000000 --- a/gui/assets/images/menubar icons/lock-9@2x.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-9Template.png b/gui/assets/images/menubar icons/lock-9Template.png Binary files differdeleted file mode 100644 index c823aa87a1..0000000000 --- a/gui/assets/images/menubar icons/lock-9Template.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/lock-9Template@2x.png b/gui/assets/images/menubar icons/lock-9Template@2x.png Binary files differdeleted file mode 100644 index e4dc28a192..0000000000 --- a/gui/assets/images/menubar icons/lock-9Template@2x.png +++ /dev/null diff --git a/gui/assets/images/menubar icons/svg/lock-1.svg b/gui/assets/images/menubar icons/svg/lock-1.svg new file mode 100644 index 0000000000..7c94a9fb63 --- /dev/null +++ b/gui/assets/images/menubar icons/svg/lock-1.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"> + <g fill="#D0021B" fill-rule="evenodd"> + <rect width="12" height="9" y="7" rx="1"/> + <path d="M14 7.01c0 .546.444.99 1 .99.552 0 1-.453 1-.997V.997c0-.55-.453-.997-.997-.997H8.997C8.447 0 8 .453 8 .997v6.006a1 1 0 0 0 2 .006V2h4v5.01z"/> + </g> +</svg> diff --git a/gui/assets/images/menubar icons/svg/lock-10.svg b/gui/assets/images/menubar icons/svg/lock-10.svg new file mode 100644 index 0000000000..4ef080db45 --- /dev/null +++ b/gui/assets/images/menubar icons/svg/lock-10.svg @@ -0,0 +1,7 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"> + <g fill-rule="evenodd" transform="translate(2 0)"> + <rect fill="#44AD4D" width="12" height="9" y="7" rx="1"/> + <path d="M7.99999548,7.01 C7.99999548,7.556 8.444,8 8.99999548,8 C9.552,8 9.99999548,7.547 9.99999548,7.003 L9.99999548,0.997 C9.99999548,0.447 9.547,0 9.003,0 L2.997,0 C2.447,0 1.99999548,0.453 1.99999548,0.997 L1.99999548,7.003 C1.9989282,7.36026559 2.18853675,7.69096441 2.49740192,7.8705254 C2.8062671,8.0500864 3.18746495,8.05123 3.49740192,7.8735254 C3.8073389,7.69582081 3.9989282,7.36626559 3.99999548,7.009 L3.99999548,2 L7.99999548,2 L7.99999548,7.01 Z" fill="#44AD4D"/> + <circle fill="#D0021B" cx="6" cy="11.5" r="2.92047599"/> + </g> +</svg> diff --git a/gui/assets/images/menubar icons/svg/lock-10_2.svg b/gui/assets/images/menubar icons/svg/lock-10_2.svg new file mode 100644 index 0000000000..045e06d770 --- /dev/null +++ b/gui/assets/images/menubar icons/svg/lock-10_2.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"> + <g fill="#44AD4D" fill-rule="evenodd" transform="translate(2 0)"> + <path d="M11,7 C11.5522847,7 12,7.44771525 12,8 L12,15 C12,15.5522847 11.5522847,16 11,16 L1,16 C0.44771525,16 6.76353751e-17,15.5522847 0,15 L0,8 C-6.76353751e-17,7.44771525 0.44771525,7 1,7 L11,7 Z M6,8.57952401 C4.38706565,8.57952401 3.07952401,9.88706565 3.07952401,11.5 C3.07952401,13.1129344 4.38706565,14.420476 6,14.420476 C7.61293435,14.420476 8.92047599,13.1129344 8.92047599,11.5 C8.92047599,9.88706565 7.61293435,8.57952401 6,8.57952401 Z"/> + <path d="M7.999991,7.01 C7.999991,7.556 8.444,8 8.999991,8 C9.552,8 9.999991,7.547 9.999991,7.003 L9.999991,0.997 C9.999991,0.447 9.547,0 9.003,0 L2.997,0 C2.447,0 1.999991,0.453 1.999991,0.997 L1.999991,7.003 C1.9989282,7.36026559 2.18853675,7.69096441 2.49740192,7.8705254 C2.8062671,8.0500864 3.18746495,8.05123 3.49740192,7.8735254 C3.8073389,7.69582081 3.9989282,7.36626559 3.999991,7.009 L3.999991,2 L7.999991,2 L7.999991,7.01 Z"/> + </g> +</svg> diff --git a/gui/assets/images/menubar icons/svg/lock-2.svg b/gui/assets/images/menubar icons/svg/lock-2.svg new file mode 100644 index 0000000000..dd558c319e --- /dev/null +++ b/gui/assets/images/menubar icons/svg/lock-2.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"> + <g fill="#D0021B" fill-rule="evenodd"> + <rect width="12" height="9" x=".5" y="7" rx="1"/> + <path d="M13.5 7.01c0 .546.444.99 1 .99.552 0 1-.453 1-.997V.997A.993.993 0 0 0 14.497 0H9.503C8.949 0 8.5.453 8.5.997v6.006a1 1 0 0 0 2 .006V2h3v5.01z"/> + </g> +</svg> diff --git a/gui/assets/images/menubar icons/svg/lock-3.svg b/gui/assets/images/menubar icons/svg/lock-3.svg new file mode 100644 index 0000000000..16f1a9bc07 --- /dev/null +++ b/gui/assets/images/menubar icons/svg/lock-3.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"> + <g fill="#D0021B" fill-rule="evenodd" transform="translate(1 0)"> + <rect width="12" height="9" y="7" rx="1"/> + <path d="M12 7.01c0 .546.444.99 1 .99.552 0 1-.453 1-.997V.997A.999.999 0 0 0 13.01 0H8.99A.998.998 0 0 0 8 .997v6.006a1 1 0 0 0 2 .006V2h2v5.01z"/> + </g> +</svg> diff --git a/gui/assets/images/menubar icons/svg/lock-4.svg b/gui/assets/images/menubar icons/svg/lock-4.svg new file mode 100644 index 0000000000..75f736b495 --- /dev/null +++ b/gui/assets/images/menubar icons/svg/lock-4.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"> + <g fill="#D0021B" fill-rule="evenodd" transform="translate(1 0)"> + <rect width="12" height="9" x=".5" y="7" rx="1"/> + <path d="M11.5 7.01c0 .546.444.99 1 .99.552 0 1-.453 1-.997V.997a.996.996 0 0 0-1-.997h-3c-.552 0-1 .453-1 .997v6.006a1 1 0 0 0 2 .006V2h1v5.01z"/> + </g> +</svg> diff --git a/gui/assets/images/menubar icons/svg/lock-5.svg b/gui/assets/images/menubar icons/svg/lock-5.svg new file mode 100644 index 0000000000..63c554275d --- /dev/null +++ b/gui/assets/images/menubar icons/svg/lock-5.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"> + <g fill="#B42424" fill-rule="evenodd" transform="translate(2 0)"> + <rect width="12" height="9" y="7" rx="1"/> + <path d="M8 7.01c0 .546.444.99 1 .99.552 0 1-.453 1-.997V.997A.998.998 0 0 0 8.99 0H7.01C6.451 0 6 .453 6 .997v6.006a1 1 0 0 0 2 .006V2v5.01z"/> + </g> +</svg> diff --git a/gui/assets/images/menubar icons/svg/lock-6.svg b/gui/assets/images/menubar icons/svg/lock-6.svg new file mode 100644 index 0000000000..298fd30a3b --- /dev/null +++ b/gui/assets/images/menubar icons/svg/lock-6.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"> + <g fill="#98472F" fill-rule="evenodd" transform="translate(2 0)"> + <rect width="12" height="9" y="7" rx="1"/> + <path d="M8 7.01c0 .546.444.99 1 .99.552 0 1-.453 1-.997V.997A.996.996 0 0 0 9 0H6c-.552 0-1 .453-1 .997v6.006a1 1 0 0 0 2 .006V2h1v5.01z"/> + </g> +</svg> diff --git a/gui/assets/images/menubar icons/svg/lock-7.svg b/gui/assets/images/menubar icons/svg/lock-7.svg new file mode 100644 index 0000000000..2dd85296e5 --- /dev/null +++ b/gui/assets/images/menubar icons/svg/lock-7.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"> + <g fill="#7C6838" fill-rule="evenodd" transform="translate(2 0)"> + <rect width="12" height="9" y="7" rx="1"/> + <path d="M8 7.01c0 .546.444.99 1 .99.552 0 1-.453 1-.997V.997A.999.999 0 0 0 9.01 0H4.99A.998.998 0 0 0 4 .997v6.006a1 1 0 0 0 2 .006V2h2v5.01z"/> + </g> +</svg> diff --git a/gui/assets/images/menubar icons/svg/lock-8.svg b/gui/assets/images/menubar icons/svg/lock-8.svg new file mode 100644 index 0000000000..338b0f3b02 --- /dev/null +++ b/gui/assets/images/menubar icons/svg/lock-8.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"> + <g fill="#5F8A43" fill-rule="evenodd" transform="translate(2 0)"> + <rect width="12" height="9" y="7" rx="1"/> + <path d="M8 7.01c0 .546.444.99 1 .99.552 0 1-.453 1-.997V.997A.993.993 0 0 0 8.997 0H4.003C3.449 0 3 .453 3 .997v6.006a1 1 0 0 0 2 .006V2h3v5.01z"/> + </g> +</svg> diff --git a/gui/assets/images/menubar icons/svg/lock-9.svg b/gui/assets/images/menubar icons/svg/lock-9.svg new file mode 100644 index 0000000000..12976ce500 --- /dev/null +++ b/gui/assets/images/menubar icons/svg/lock-9.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"> + <g fill="#44AD4D" fill-rule="evenodd" transform="translate(2 0)"> + <rect width="12" height="9" y="7" rx="1"/> + <path d="M8 7.01c0 .546.444.99 1 .99.552 0 1-.453 1-.997V.997C10 .447 9.547 0 9.003 0H2.997C2.447 0 2 .453 2 .997v6.006a1 1 0 0 0 2 .006V2h4v5.01z"/> + </g> +</svg> diff --git a/gui/assets/images/menubar icons/win32/lock-1.ico b/gui/assets/images/menubar icons/win32/lock-1.ico Binary files differnew file mode 100644 index 0000000000..64f3a23fdb --- /dev/null +++ b/gui/assets/images/menubar icons/win32/lock-1.ico diff --git a/gui/assets/images/menubar icons/win32/lock-10.ico b/gui/assets/images/menubar icons/win32/lock-10.ico Binary files differnew file mode 100644 index 0000000000..ed21f2ab12 --- /dev/null +++ b/gui/assets/images/menubar icons/win32/lock-10.ico diff --git a/gui/assets/images/menubar icons/win32/lock-10_white.ico b/gui/assets/images/menubar icons/win32/lock-10_white.ico Binary files differnew file mode 100644 index 0000000000..87894468a2 --- /dev/null +++ b/gui/assets/images/menubar icons/win32/lock-10_white.ico diff --git a/gui/assets/images/menubar icons/win32/lock-1_white.ico b/gui/assets/images/menubar icons/win32/lock-1_white.ico Binary files differnew file mode 100644 index 0000000000..dd2384f989 --- /dev/null +++ b/gui/assets/images/menubar icons/win32/lock-1_white.ico diff --git a/gui/assets/images/menubar icons/win32/lock-2.ico b/gui/assets/images/menubar icons/win32/lock-2.ico Binary files differnew file mode 100644 index 0000000000..82ea6fefd3 --- /dev/null +++ b/gui/assets/images/menubar icons/win32/lock-2.ico diff --git a/gui/assets/images/menubar icons/win32/lock-2_white.ico b/gui/assets/images/menubar icons/win32/lock-2_white.ico Binary files differnew file mode 100644 index 0000000000..39eaee28e1 --- /dev/null +++ b/gui/assets/images/menubar icons/win32/lock-2_white.ico diff --git a/gui/assets/images/menubar icons/win32/lock-3.ico b/gui/assets/images/menubar icons/win32/lock-3.ico Binary files differnew file mode 100644 index 0000000000..4ff7bc330b --- /dev/null +++ b/gui/assets/images/menubar icons/win32/lock-3.ico diff --git a/gui/assets/images/menubar icons/win32/lock-3_white.ico b/gui/assets/images/menubar icons/win32/lock-3_white.ico Binary files differnew file mode 100644 index 0000000000..1349c46408 --- /dev/null +++ b/gui/assets/images/menubar icons/win32/lock-3_white.ico diff --git a/gui/assets/images/menubar icons/win32/lock-4.ico b/gui/assets/images/menubar icons/win32/lock-4.ico Binary files differnew file mode 100644 index 0000000000..7a52b04679 --- /dev/null +++ b/gui/assets/images/menubar icons/win32/lock-4.ico diff --git a/gui/assets/images/menubar icons/win32/lock-4_white.ico b/gui/assets/images/menubar icons/win32/lock-4_white.ico Binary files differnew file mode 100644 index 0000000000..bfbdbfff50 --- /dev/null +++ b/gui/assets/images/menubar icons/win32/lock-4_white.ico diff --git a/gui/assets/images/menubar icons/win32/lock-5.ico b/gui/assets/images/menubar icons/win32/lock-5.ico Binary files differnew file mode 100644 index 0000000000..5115aea230 --- /dev/null +++ b/gui/assets/images/menubar icons/win32/lock-5.ico diff --git a/gui/assets/images/menubar icons/win32/lock-5_white.ico b/gui/assets/images/menubar icons/win32/lock-5_white.ico Binary files differnew file mode 100644 index 0000000000..1c6c8ca780 --- /dev/null +++ b/gui/assets/images/menubar icons/win32/lock-5_white.ico diff --git a/gui/assets/images/menubar icons/win32/lock-6.ico b/gui/assets/images/menubar icons/win32/lock-6.ico Binary files differnew file mode 100644 index 0000000000..eeda42adda --- /dev/null +++ b/gui/assets/images/menubar icons/win32/lock-6.ico diff --git a/gui/assets/images/menubar icons/win32/lock-6_white.ico b/gui/assets/images/menubar icons/win32/lock-6_white.ico Binary files differnew file mode 100644 index 0000000000..5e336f4d88 --- /dev/null +++ b/gui/assets/images/menubar icons/win32/lock-6_white.ico diff --git a/gui/assets/images/menubar icons/win32/lock-7.ico b/gui/assets/images/menubar icons/win32/lock-7.ico Binary files differnew file mode 100644 index 0000000000..da90f3b810 --- /dev/null +++ b/gui/assets/images/menubar icons/win32/lock-7.ico diff --git a/gui/assets/images/menubar icons/win32/lock-7_white.ico b/gui/assets/images/menubar icons/win32/lock-7_white.ico Binary files differnew file mode 100644 index 0000000000..da1a4657f8 --- /dev/null +++ b/gui/assets/images/menubar icons/win32/lock-7_white.ico diff --git a/gui/assets/images/menubar icons/win32/lock-8.ico b/gui/assets/images/menubar icons/win32/lock-8.ico Binary files differnew file mode 100644 index 0000000000..9bd9167ce7 --- /dev/null +++ b/gui/assets/images/menubar icons/win32/lock-8.ico diff --git a/gui/assets/images/menubar icons/win32/lock-8_white.ico b/gui/assets/images/menubar icons/win32/lock-8_white.ico Binary files differnew file mode 100644 index 0000000000..6f61fea3c4 --- /dev/null +++ b/gui/assets/images/menubar icons/win32/lock-8_white.ico diff --git a/gui/assets/images/menubar icons/win32/lock-9.ico b/gui/assets/images/menubar icons/win32/lock-9.ico Binary files differnew file mode 100644 index 0000000000..5f72d70861 --- /dev/null +++ b/gui/assets/images/menubar icons/win32/lock-9.ico diff --git a/gui/assets/images/menubar icons/win32/lock-9_white.ico b/gui/assets/images/menubar icons/win32/lock-9_white.ico Binary files differnew file mode 100644 index 0000000000..b7c186c12a --- /dev/null +++ b/gui/assets/images/menubar icons/win32/lock-9_white.ico diff --git a/gui/scripts/build-menubar-icons.sh b/gui/scripts/build-menubar-icons.sh new file mode 100755 index 0000000000..f886b089af --- /dev/null +++ b/gui/scripts/build-menubar-icons.sh @@ -0,0 +1,62 @@ +#!/usr/bin/env sh + +if ! command -v convert > /dev/null; then + echo >&2 "convert (imagemagick) is required to run this script" + exit 1 +fi + +MENUBAR_PATH="assets/images/menubar icons" + +MACOS="$MENUBAR_PATH/darwin" +WINDOWS="$MENUBAR_PATH/win32" +LINUX="$MENUBAR_PATH/linux" + +WINDOWS_SIZES="-define icon:auto-resize=48,32,16" + +MAKE_BLACK='s/#[0-9a-fA-f]{6}/#000000/g' +MAKE_WHITE='s/#[0-9a-fA-f]{6}/#FFFFFF/g' + +COMPRESSION_OPTIONS="-define png:compression-filter=5 -define png:compression-level=9 \ + -define png:compression-strategy=1 -define png:exclude-chunk=all -strip" +OPTIONS="-background transparent -density 1200 $COMPRESSION_OPTIONS" + +function resize() { + WITHOUT_PADDING=$[$1 - ($2 * 2)] + echo "-resize ${WITHOUT_PADDING}x$WITHOUT_PADDING -gravity center -extent ${1}x$1" +} + +function generate() { + IN="$MENUBAR_PATH/svg/$1.svg" + IN_MONO="$MENUBAR_PATH/svg/$2.svg" + OUT="$1" + + # MacOS colored + convert $OPTIONS $(resize 22 3) "$IN" "$MACOS/$OUT.png" + convert $OPTIONS $(resize 44 6) "$IN" "$MACOS/$OUT@2x.png" + + # MacOS monochrome + sed -E $MAKE_BLACK "$IN_MONO" | convert $OPTIONS $(resize 22 3) - "$MACOS/${OUT}Template.png" + sed -E $MAKE_BLACK "$IN_MONO" | convert $OPTIONS $(resize 44 6) - "$MACOS/${OUT}Template@2x.png" + + # Linux colored + convert $OPTIONS $(resize 32 4) "$IN" "$LINUX/$OUT.png" + + # Linux white + sed -E $MAKE_WHITE "$IN_MONO" | convert $OPTIONS $(resize 32 4) - "$LINUX/${OUT}_white.png" + + # Windows colored + convert $OPTIONS $(resize 64 3) "$IN" $WINDOWS_SIZES "$WINDOWS/$OUT.ico" + + # Windows white + sed -E $MAKE_WHITE "$IN_MONO" \ + | convert $OPTIONS $(resize 64 2) - $WINDOWS_SIZES "$WINDOWS/${OUT}_white.ico" +} + +mkdir -p "$MENUBAR_PATH/darwin" "$MENUBAR_PATH/win32" "$MENUBAR_PATH/linux" + +for i in {1..9}; do + generate lock-$i lock-$i +done + +generate lock-10 lock-10_2 + diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts index 6663a5574e..4df3b4c7a2 100644 --- a/gui/src/main/index.ts +++ b/gui/src/main/index.ts @@ -319,7 +319,7 @@ class ApplicationMain { const trayIconController = new TrayIconController( tray, 'unsecured', - process.platform === 'darwin' && this.guiSettings.monochromaticIcon, + this.guiSettings.monochromaticIcon, ); this.registerWindowListener(windowController); @@ -330,10 +330,7 @@ class ApplicationMain { this.trayIconController = trayIconController; this.guiSettings.onChange = (newState, oldState) => { - if ( - process.platform === 'darwin' && - oldState.monochromaticIcon !== newState.monochromaticIcon - ) { + if (oldState.monochromaticIcon !== newState.monochromaticIcon) { if (this.trayIconController) { this.trayIconController.useMonochromaticIcon = newState.monochromaticIcon; } diff --git a/gui/src/main/tray-icon-controller.ts b/gui/src/main/tray-icon-controller.ts index f3333a2636..bb1d4f5868 100644 --- a/gui/src/main/tray-icon-controller.ts +++ b/gui/src/main/tray-icon-controller.ts @@ -7,7 +7,6 @@ export type TrayIconType = 'unsecured' | 'securing' | 'secured'; export default class TrayIconController { private animation?: KeyframeAnimation; private iconImages: NativeImage[] = []; - private monochromaticIconImages: NativeImage[] = []; constructor( tray: Tray, @@ -19,7 +18,7 @@ export default class TrayIconController { const initialFrame = this.targetFrame(); const animation = new KeyframeAnimation(); animation.speed = 100; - animation.onFrame = (frameNumber) => tray.setImage(this.imageForFrame(frameNumber)); + animation.onFrame = (frameNumber) => tray.setImage(this.iconImages[frameNumber]); animation.play({ start: initialFrame, end: initialFrame }); this.animation = animation; @@ -38,6 +37,7 @@ export default class TrayIconController { set useMonochromaticIcon(useMonochromaticIcon: boolean) { this.useMonochromaticIconValue = useMonochromaticIcon; + this.loadImages(); if (this.animation && !this.animation.isRunning) { this.animation.play({ end: this.targetFrame() }); @@ -58,16 +58,19 @@ export default class TrayIconController { } private loadImages() { - const basePath = path.resolve(path.join(__dirname, '../../assets/images/menubar icons')); const frames = Array.from({ length: 10 }, (_, i) => i + 1); + this.iconImages = frames.map((frame) => nativeImage.createFromPath(this.getImagePath(frame))); + } - this.iconImages = frames.map((frame) => - nativeImage.createFromPath(path.join(basePath, `lock-${frame}.png`)), - ); + private getImagePath(frame: number) { + const basePath = path.resolve(path.join(__dirname, '../../assets/images/menubar icons')); + const extension = process.platform === 'win32' ? 'ico' : 'png'; + let suffix = ''; + if (this.useMonochromaticIconValue) { + suffix = process.platform === 'darwin' ? 'Template' : '_white'; + } - this.monochromaticIconImages = frames.map((frame) => - nativeImage.createFromPath(path.join(basePath, `lock-${frame}Template.png`)), - ); + return path.join(basePath, process.platform, `lock-${frame}${suffix}.${extension}`); } private targetFrame(): number { @@ -80,10 +83,4 @@ export default class TrayIconController { return 8; } } - - private imageForFrame(frame: number): NativeImage { - return this.useMonochromaticIconValue - ? this.monochromaticIconImages[frame] - : this.iconImages[frame]; - } } diff --git a/gui/src/renderer/components/Preferences.tsx b/gui/src/renderer/components/Preferences.tsx index 715d51e40f..d2d1709abc 100644 --- a/gui/src/renderer/components/Preferences.tsx +++ b/gui/src/renderer/components/Preferences.tsx @@ -21,7 +21,6 @@ export interface IProps { enableSystemNotifications: boolean; monochromaticIcon: boolean; startMinimized: boolean; - enableMonochromaticIconToggle: boolean; enableStartMinimizedToggle: boolean; setAutoStart: (autoStart: boolean) => void; setEnableSystemNotifications: (flag: boolean) => void; @@ -120,29 +119,23 @@ export default class Preferences extends Component<IProps> { </Cell.FooterText> </Cell.Footer> - {this.props.enableMonochromaticIconToggle ? ( - <React.Fragment> - <Cell.Container> - <Cell.Label> - {messages.pgettext('preferences-view', 'Monochromatic tray icon')} - </Cell.Label> - <Cell.Switch - isOn={this.props.monochromaticIcon} - onChange={this.props.setMonochromaticIcon} - /> - </Cell.Container> - <Cell.Footer> - <Cell.FooterText> - {messages.pgettext( - 'preferences-view', - 'Use a monochromatic tray icon instead of a colored one.', - )} - </Cell.FooterText> - </Cell.Footer> - </React.Fragment> - ) : ( - undefined - )} + <Cell.Container> + <Cell.Label> + {messages.pgettext('preferences-view', 'Monochromatic tray icon')} + </Cell.Label> + <Cell.Switch + isOn={this.props.monochromaticIcon} + onChange={this.props.setMonochromaticIcon} + /> + </Cell.Container> + <Cell.Footer> + <Cell.FooterText> + {messages.pgettext( + 'preferences-view', + 'Use a monochromatic tray icon instead of a colored one.', + )} + </Cell.FooterText> + </Cell.Footer> {this.props.enableStartMinimizedToggle ? ( <React.Fragment> diff --git a/gui/src/renderer/containers/PreferencesPage.tsx b/gui/src/renderer/containers/PreferencesPage.tsx index 497da2166c..e1b674e0dd 100644 --- a/gui/src/renderer/containers/PreferencesPage.tsx +++ b/gui/src/renderer/containers/PreferencesPage.tsx @@ -44,7 +44,6 @@ const mapDispatchToProps = (dispatch: ReduxDispatch, props: IAppContext) => { setMonochromaticIcon: (monochromaticIcon: boolean) => { props.app.setMonochromaticIcon(monochromaticIcon); }, - enableMonochromaticIconToggle: process.platform === 'darwin', }; }; |
