diff options
Diffstat (limited to 'src/lib/Menu.js')
-rw-r--r-- | src/lib/Menu.js | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 8e2d8bdca..563db087b 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js | |||
@@ -952,7 +952,7 @@ class FranzMenu { | |||
952 | }, | 952 | }, |
953 | ); | 953 | ); |
954 | 954 | ||
955 | services.allDisplayed.forEach((service, i) => | 955 | for (const [i, service] of services.allDisplayed.entries()) { |
956 | menu.push({ | 956 | menu.push({ |
957 | label: this._getServiceName(service), | 957 | label: this._getServiceName(service), |
958 | accelerator: i < 9 ? `${cmdOrCtrlShortcutKey()}+${i + 1}` : null, | 958 | accelerator: i < 9 ? `${cmdOrCtrlShortcutKey()}+${i + 1}` : null, |
@@ -965,8 +965,8 @@ class FranzMenu { | |||
965 | app.mainWindow.restore(); | 965 | app.mainWindow.restore(); |
966 | } | 966 | } |
967 | }, | 967 | }, |
968 | }), | 968 | }); |
969 | ); | 969 | } |
970 | 970 | ||
971 | if ( | 971 | if ( |
972 | services.active && | 972 | services.active && |
@@ -1018,23 +1018,23 @@ class FranzMenu { | |||
1018 | }); | 1018 | }); |
1019 | } | 1019 | } |
1020 | 1020 | ||
1021 | menu.push({ | 1021 | menu.push( |
1022 | type: 'separator', | 1022 | { |
1023 | }); | 1023 | type: 'separator', |
1024 | |||
1025 | // Default workspace | ||
1026 | menu.push({ | ||
1027 | label: intl.formatMessage(menuItems.defaultWorkspace), | ||
1028 | accelerator: `${cmdOrCtrlShortcutKey()}+${altKey()}+0`, | ||
1029 | type: 'radio', | ||
1030 | checked: !activeWorkspace, | ||
1031 | click: () => { | ||
1032 | workspaceActions.deactivate(); | ||
1033 | }, | 1024 | }, |
1034 | }); | 1025 | { |
1026 | label: intl.formatMessage(menuItems.defaultWorkspace), | ||
1027 | accelerator: `${cmdOrCtrlShortcutKey()}+${altKey()}+0`, | ||
1028 | type: 'radio', | ||
1029 | checked: !activeWorkspace, | ||
1030 | click: () => { | ||
1031 | workspaceActions.deactivate(); | ||
1032 | }, | ||
1033 | }, | ||
1034 | ); | ||
1035 | 1035 | ||
1036 | // Workspace items | 1036 | // Workspace items |
1037 | workspaces.forEach((workspace, i) => | 1037 | for (const [i, workspace] of workspaces.entries()) { |
1038 | menu.push({ | 1038 | menu.push({ |
1039 | label: workspace.name, | 1039 | label: workspace.name, |
1040 | accelerator: | 1040 | accelerator: |
@@ -1044,8 +1044,8 @@ class FranzMenu { | |||
1044 | click: () => { | 1044 | click: () => { |
1045 | workspaceActions.activate({ workspace }); | 1045 | workspaceActions.activate({ workspace }); |
1046 | }, | 1046 | }, |
1047 | }), | 1047 | }); |
1048 | ); | 1048 | } |
1049 | 1049 | ||
1050 | return menu; | 1050 | return menu; |
1051 | } | 1051 | } |