From a5eb3999b6f98ee1a72b06f18df2d9fe9cade0fa Mon Sep 17 00:00:00 2001 From: Stefan Date: Fri, 12 Apr 2019 12:29:03 +0200 Subject: fix(Windows): Replace tray icon with high-res version --- package-lock.json | 18 ++++++++++++++++++ src/assets/images/tray/win32/tray-unread.ico | Bin 1150 -> 39006 bytes src/assets/images/tray/win32/tray-unread@2x.ico | Bin 5430 -> 0 bytes src/assets/images/tray/win32/tray.ico | Bin 1150 -> 33292 bytes src/assets/images/tray/win32/tray@2x.ico | Bin 5430 -> 0 bytes 5 files changed, 18 insertions(+) delete mode 100644 src/assets/images/tray/win32/tray-unread@2x.ico delete mode 100644 src/assets/images/tray/win32/tray@2x.ico diff --git a/package-lock.json b/package-lock.json index f831f3ffa..57650aac0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1948,6 +1948,15 @@ "@meetfranz/theme": "^1.0.13", "react-html-attributes": "^1.4.3", "react-loader": "^2.4.5" + }, + "dependencies": { + "@meetfranz/theme": { + "version": "1.0.13", + "bundled": true, + "requires": { + "color": "^3.1.0" + } + } } }, "@meetfranz/theme": { @@ -1963,6 +1972,15 @@ "@mdi/react": "^1.1.0", "@meetfranz/theme": "^1.0.13", "react-loader": "^2.4.5" + }, + "dependencies": { + "@meetfranz/theme": { + "version": "1.0.13", + "bundled": true, + "requires": { + "color": "^3.1.0" + } + } } }, "@mrmlnc/readdir-enhanced": { diff --git a/src/assets/images/tray/win32/tray-unread.ico b/src/assets/images/tray/win32/tray-unread.ico index a59428cfb..507845120 100644 Binary files a/src/assets/images/tray/win32/tray-unread.ico and b/src/assets/images/tray/win32/tray-unread.ico 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 Binary files a/src/assets/images/tray/win32/tray-unread@2x.ico and /dev/null differ diff --git a/src/assets/images/tray/win32/tray.ico b/src/assets/images/tray/win32/tray.ico index d3aa25d68..1f0057a8c 100644 Binary files a/src/assets/images/tray/win32/tray.ico and b/src/assets/images/tray/win32/tray.ico 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 Binary files a/src/assets/images/tray/win32/tray@2x.ico and /dev/null differ -- cgit v1.2.3-54-g00ecf From 92a61d4870a029182ebe4307bd9763e1faafadd0 Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 4 Jun 2019 14:44:49 +0200 Subject: fix(Windows): Add Workspaces menu & fix Window menu --- src/lib/Menu.js | 5 +++++ 1 file changed, 5 insertions(+) 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 @@ -499,6 +499,11 @@ const _titleBarTemplateFactory = intl => [ label: intl.formatMessage(menuItems.services), submenu: [], }, + { + label: intl.formatMessage(menuItems.workspaces), + submenu: [], + visible: workspaceStore.isFeatureEnabled, + }, { label: intl.formatMessage(menuItems.window), submenu: [ -- cgit v1.2.3-54-g00ecf