Skip to content

Commit 916200d

Browse files
authored
Merge pull request #335 from nexB/326-menu-shortcuts
326 menu shortcuts
2 parents 915bccb + c64fd97 commit 916200d

File tree

4 files changed

+17
-13
lines changed

4 files changed

+17
-13
lines changed

build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
APP_NAME = 'ScanCode-Workbench'
2929
APP_BUNDLE_ID = 'com.electron.scancode-workbench'
3030
VERSION = '3.0.0b1'
31-
ELECTRON_VERSION = '3.0.3'
31+
ELECTRON_VERSION = '3.1.1'
3232

3333
#######################
3434
ARCH = 'x64'

main.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,25 +130,29 @@ function getTemplate() {
130130
submenu: [
131131
{
132132
label: 'Table View',
133-
accelerator: 'CmdOrCtrl+T',
133+
accelerator: process.platform === 'darwin' ?
134+
'Cmd+Shift+T' : 'Ctrl+Shift+T',
134135
click: sendEventToRenderer('table-view')
135136
},
136137
{
137138
label: 'Chart Summary View',
138-
accelerator: 'Shift+CmdOrCtrl+D',
139+
accelerator: process.platform === 'darwin' ?
140+
'Cmd+Shift+D' : 'Ctrl+Shift+D',
139141
click: sendEventToRenderer('chart-summary-view')
140142
},
141143
{
142144
label: 'Conclusion Summary View',
143-
accelerator: 'Shift+CmdOrCtrl+C',
145+
accelerator: process.platform === 'darwin' ?
146+
'Cmd+Shift+C' : 'Ctrl+Shift+C',
144147
click: sendEventToRenderer('conclusion-summary-view')
145148
},
146149
{
147150
type: 'separator'
148151
},
149152
{
150153
label: 'Reload',
151-
accelerator: 'CmdOrCtrl+R',
154+
accelerator: process.platform === 'darwin' ?
155+
'Cmd+R' : 'Ctrl+R',
152156
click: (item, focusedWindow) => {
153157
if (focusedWindow) {
154158
focusedWindow.reload();
@@ -169,7 +173,7 @@ function getTemplate() {
169173
{
170174
label: 'Toggle Developer Tools',
171175
accelerator: process.platform === 'darwin' ?
172-
'Alt+Command+I' : 'Ctrl+Shift+I',
176+
'Alt+Command+I' : 'Alt+Ctrl+I',
173177
click: (item, focusedWindow) => {
174178
if (focusedWindow) {
175179
focusedWindow.toggleDevTools();

npm-shrinkwrap.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"asar": "^0.11.0",
2929
"chai": "^3.5.0",
3030
"chai-subset": "^1.5.0",
31-
"electron": "3.0.3",
31+
"electron": "3.1.1",
3232
"electron-packager": "^12.2.0",
3333
"electron-rebuild": "^1.8.2",
3434
"eslint": "^4.16.0",

0 commit comments

Comments
 (0)