diff options
| author |  Dominik Guzei <dominik.guzei@gmail.com> | 2019-06-05 13:24:41 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2019-06-05 13:24:41 +0200 |
| commit | 02f6c5f5ced1c5401c9da64a478b2367d4b9e32c (patch) | |
| tree | 8a520a195140442062550cf414ffb8dac135f30e /src | |
| parent | fix(App): Fix logout when access token becomes invalid (diff) | |
| parent | fix(Windows): Add Workspaces menu & fix Window menu (diff) | |
| download | ferdium-app-02f6c5f5ced1c5401c9da64a478b2367d4b9e32c.tar.gz ferdium-app-02f6c5f5ced1c5401c9da64a478b2367d4b9e32c.tar.zst ferdium-app-02f6c5f5ced1c5401c9da64a478b2367d4b9e32c.zip | |
Merge pull request #1467 from meetfranz/fix/windows-close-window-shortcut
Fix close window shortcut
Diffstat (limited to 'src')
| -rw-r--r-- | src/assets/images/tray/win32/tray-unread.ico | bin | 1150 -> 39006 bytes | |||
| -rw-r--r-- | src/assets/images/tray/win32/tray-unread@2x.ico | bin | 5430 -> 0 bytes | |||
| -rw-r--r-- | src/assets/images/tray/win32/tray.ico | bin | 1150 -> 33292 bytes | |||
| -rw-r--r-- | src/assets/images/tray/win32/tray@2x.ico | bin | 5430 -> 0 bytes | |||
| -rw-r--r-- | src/lib/Menu.js | 5 |
5 files changed, 5 insertions, 0 deletions
diff --git a/src/assets/images/tray/win32/tray-unread.ico b/src/assets/images/tray/win32/tray-unread.ico index a59428cfb..507845120 100644 --- a/src/assets/images/tray/win32/tray-unread.ico +++ b/src/assets/images/tray/win32/tray-unread.ico | |||
| Binary files differ | |||
diff --git a/src/assets/images/tray/win32/tray-unread@2x.ico b/src/assets/images/tray/win32/tray-unread@2x.ico deleted file mode 100644 index f6fe65093..000000000 --- a/src/assets/images/tray/win32/tray-unread@2x.ico +++ /dev/null | |||
| Binary files differ | |||
diff --git a/src/assets/images/tray/win32/tray.ico b/src/assets/images/tray/win32/tray.ico index d3aa25d68..1f0057a8c 100644 --- a/src/assets/images/tray/win32/tray.ico +++ b/src/assets/images/tray/win32/tray.ico | |||
| Binary files differ | |||
diff --git a/src/assets/images/tray/win32/tray@2x.ico b/src/assets/images/tray/win32/tray@2x.ico deleted file mode 100644 index c1b7a73a5..000000000 --- a/src/assets/images/tray/win32/tray@2x.ico +++ /dev/null | |||
| Binary files differ | |||
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index da2540274..061c83160 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
| @@ -500,6 +500,11 @@ const _titleBarTemplateFactory = intl => [ | |||
| 500 | submenu: [], | 500 | submenu: [], |
| 501 | }, | 501 | }, |
| 502 | { | 502 | { |
| 503 | label: intl.formatMessage(menuItems.workspaces), | ||
| 504 | submenu: [], | ||
| 505 | visible: workspaceStore.isFeatureEnabled, | ||
| 506 | }, | ||
| 507 | { | ||
| 503 | label: intl.formatMessage(menuItems.window), | 508 | label: intl.formatMessage(menuItems.window), |
| 504 | submenu: [ | 509 | submenu: [ |
| 505 | { | 510 | { |