aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2018-04-04 21:23:38 +0200
committerLibravatar GitHub <noreply@github.com>2018-04-04 21:23:38 +0200
commit1790b795238c2abe832285197cb88c0833bd98ca (patch)
tree89d4bc3632efc05822c0bec53a883b2d092bfd69 /src/lib
parentFix typo [ci skip] (diff)
parentMerge branch 'master' into release/5.0.0-beta.18 (diff)
downloadferdium-app-1790b795238c2abe832285197cb88c0833bd98ca.tar.gz
ferdium-app-1790b795238c2abe832285197cb88c0833bd98ca.tar.zst
ferdium-app-1790b795238c2abe832285197cb88c0833bd98ca.zip
5.0.0 beta.18v5.0.0-beta.18
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Menu.js15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 5a05e47b3..19b8d5b15 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -415,7 +415,7 @@ const _titleBarTemplateFactory = intl => [
415 label: app.mainWindow.isFullScreen() // label doesn't work, gets overridden by Electron 415 label: app.mainWindow.isFullScreen() // label doesn't work, gets overridden by Electron
416 ? intl.formatMessage(menuItems.exitFullScreen) 416 ? intl.formatMessage(menuItems.exitFullScreen)
417 : intl.formatMessage(menuItems.enterFullScreen), 417 : intl.formatMessage(menuItems.enterFullScreen),
418 accelerator: `${ctrlKey}+F`, 418 accelerator: 'F11',
419 click(menuItem, browserWindow) { 419 click(menuItem, browserWindow) {
420 browserWindow.setFullScreen(!browserWindow.isFullScreen()); 420 browserWindow.setFullScreen(!browserWindow.isFullScreen());
421 }, 421 },
@@ -431,14 +431,14 @@ const _titleBarTemplateFactory = intl => [
431 submenu: [ 431 submenu: [
432 { 432 {
433 label: intl.formatMessage(menuItems.minimize), 433 label: intl.formatMessage(menuItems.minimize),
434 accelerator: 'Alt+M', 434 accelerator: 'Ctrl+M',
435 click(menuItem, browserWindow) { 435 click(menuItem, browserWindow) {
436 browserWindow.minimize(); 436 browserWindow.minimize();
437 }, 437 },
438 }, 438 },
439 { 439 {
440 label: intl.formatMessage(menuItems.close), 440 label: intl.formatMessage(menuItems.close),
441 accelerator: 'Alt+W', 441 accelerator: 'Ctrl+W',
442 click(menuItem, browserWindow) { 442 click(menuItem, browserWindow) {
443 browserWindow.close(); 443 browserWindow.close();
444 }, 444 },
@@ -450,7 +450,7 @@ const _titleBarTemplateFactory = intl => [
450 submenu: [ 450 submenu: [
451 { 451 {
452 label: intl.formatMessage(menuItems.learnMore), 452 label: intl.formatMessage(menuItems.learnMore),
453 click() { shell.openExternal('http://meetfranz.com'); }, 453 click() { shell.openExternal('https://meetfranz.com'); },
454 }, 454 },
455 { 455 {
456 label: intl.formatMessage(menuItems.changelog), 456 label: intl.formatMessage(menuItems.changelog),
@@ -461,7 +461,7 @@ const _titleBarTemplateFactory = intl => [
461 }, 461 },
462 { 462 {
463 label: intl.formatMessage(menuItems.support), 463 label: intl.formatMessage(menuItems.support),
464 click() { shell.openExternal('http://meetfranz.com/support'); }, 464 click() { shell.openExternal('https://meetfranz.com/support'); },
465 }, 465 },
466 { 466 {
467 type: 'separator', 467 type: 'separator',
@@ -643,10 +643,7 @@ export default class FranzMenu {
643 }, 643 },
644 { 644 {
645 label: intl.formatMessage(menuItems.quit), 645 label: intl.formatMessage(menuItems.quit),
646 accelerator: 'Alt+F4', 646 role: 'quit',
647 click: () => {
648 app.quit();
649 },
650 }, 647 },
651 ]; 648 ];
652 649