From be559bebdd4e9b288b6942374d8b37bce7545881 Mon Sep 17 00:00:00 2001 From: YULIUS KURNIAWAN KRISTIANTO Date: Thu, 29 Mar 2018 04:07:03 +0700 Subject: [PATCH 01/11] alternative quit APP by click CTRL+Q --- src/main/menu/setupBarMenu.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/menu/setupBarMenu.js b/src/main/menu/setupBarMenu.js index 14c4e74db..f77b75d97 100644 --- a/src/main/menu/setupBarMenu.js +++ b/src/main/menu/setupBarMenu.js @@ -42,6 +42,11 @@ export default () => { } }, }, + { + label: 'Close', + accelerator: 'CmdOrCtrl+Q', + role: 'quit' + }, { label: 'Frequently Asked Questions', click: () => { -- 2.45.3 From 5205bb5c2cd0f1f78587f210402b5ece8042d3ba Mon Sep 17 00:00:00 2001 From: YULIUS KURNIAWAN KRISTIANTO Date: Thu, 29 Mar 2018 04:09:39 +0700 Subject: [PATCH 02/11] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f689a27b9..54148fbd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,7 +44,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). * LBRY URLs not working on Linux ([#1120](https://github.com/lbryio/lbry-app/issues/1120)) * Fix Windows notifications not showing ([#1145](https://github.com/lbryio/lbry-app/pull/1145)) * Fix export issues ([#1163](https://github.com/lbryio/lbry-app/pull/1163)) - + * Fix Keyboard Shortcut to Quit APP ([#1163](https://github.com/lbryio/lbry-app/pull/1198)) ## [0.20.0] - 2018-01-30 -- 2.45.3 From f2af163682223c6967b0f2222c7d97c34aa3a78e Mon Sep 17 00:00:00 2001 From: YULIUS KURNIAWAN KRISTIANTO Date: Thu, 29 Mar 2018 04:29:58 +0700 Subject: [PATCH 03/11] Update setupBarMenu.js --- src/main/menu/setupBarMenu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/menu/setupBarMenu.js b/src/main/menu/setupBarMenu.js index f77b75d97..c9f931882 100644 --- a/src/main/menu/setupBarMenu.js +++ b/src/main/menu/setupBarMenu.js @@ -45,7 +45,7 @@ export default () => { { label: 'Close', accelerator: 'CmdOrCtrl+Q', - role: 'quit' + role: 'quit', }, { label: 'Frequently Asked Questions', -- 2.45.3 From 97d47e0ed2075bdae0f6492b8b06d3bf83520fd6 Mon Sep 17 00:00:00 2001 From: YULIUS KURNIAWAN KRISTIANTO Date: Thu, 29 Mar 2018 05:42:08 +0700 Subject: [PATCH 04/11] fix formating 1 --- src/main/menu/setupBarMenu.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/menu/setupBarMenu.js b/src/main/menu/setupBarMenu.js index c9f931882..a126f0ff4 100644 --- a/src/main/menu/setupBarMenu.js +++ b/src/main/menu/setupBarMenu.js @@ -42,11 +42,11 @@ export default () => { } }, }, - { - label: 'Close', - accelerator: 'CmdOrCtrl+Q', - role: 'quit', - }, + { + label: 'Close', + accelerator: 'CmdOrCtrl+Q', + role: 'quit', + }, { label: 'Frequently Asked Questions', click: () => { -- 2.45.3 From e70d8f23488207123cfff009fdfafdb1e069f574 Mon Sep 17 00:00:00 2001 From: YULIUS KURNIAWAN KRISTIANTO Date: Thu, 29 Mar 2018 05:51:50 +0700 Subject: [PATCH 05/11] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54148fbd5..d27f762c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,7 +44,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). * LBRY URLs not working on Linux ([#1120](https://github.com/lbryio/lbry-app/issues/1120)) * Fix Windows notifications not showing ([#1145](https://github.com/lbryio/lbry-app/pull/1145)) * Fix export issues ([#1163](https://github.com/lbryio/lbry-app/pull/1163)) - * Fix Keyboard Shortcut to Quit APP ([#1163](https://github.com/lbryio/lbry-app/pull/1198)) + * Fix Keyboard Shortcut to Quit APP ([#1163](https://github.com/lbryio/lbry-app/pull/1202)) ## [0.20.0] - 2018-01-30 -- 2.45.3 From 6db06a0d194333a59f6854717688c7a3bb9c5bd1 Mon Sep 17 00:00:00 2001 From: YULIUS KURNIAWAN KRISTIANTO Date: Fri, 30 Mar 2018 23:18:46 +0700 Subject: [PATCH 06/11] update review changes --- src/main/menu/setupBarMenu.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/menu/setupBarMenu.js b/src/main/menu/setupBarMenu.js index a126f0ff4..bd7cb55ff 100644 --- a/src/main/menu/setupBarMenu.js +++ b/src/main/menu/setupBarMenu.js @@ -1,6 +1,7 @@ import { app, Menu, shell } from 'electron'; export default () => { + const newLocal = 'quit'; const template = [ { label: 'Edit', @@ -27,7 +28,11 @@ export default () => { }, { role: 'window', - submenu: [{ role: 'minimize' }, { role: 'close' }], + submenu: [ + { role: 'minimize' }, + { role: 'close' }, + { role: 'quit', accelerator: 'CmdOrCtrl+Q' }, + ], }, { role: 'help', @@ -42,11 +47,6 @@ export default () => { } }, }, - { - label: 'Close', - accelerator: 'CmdOrCtrl+Q', - role: 'quit', - }, { label: 'Frequently Asked Questions', click: () => { -- 2.45.3 From b50606bff14c319072608a70ed9bc2f99fa75084 Mon Sep 17 00:00:00 2001 From: YULIUS KURNIAWAN KRISTIANTO Date: Fri, 30 Mar 2018 23:25:38 +0700 Subject: [PATCH 07/11] delete unused var --- src/main/menu/setupBarMenu.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/menu/setupBarMenu.js b/src/main/menu/setupBarMenu.js index bd7cb55ff..fadefaa29 100644 --- a/src/main/menu/setupBarMenu.js +++ b/src/main/menu/setupBarMenu.js @@ -1,7 +1,6 @@ import { app, Menu, shell } from 'electron'; export default () => { - const newLocal = 'quit'; const template = [ { label: 'Edit', -- 2.45.3 From 572d68d880d2d216d74df66662600e59d439a54e Mon Sep 17 00:00:00 2001 From: YULIUS KURNIAWAN KRISTIANTO Date: Fri, 30 Mar 2018 23:27:02 +0700 Subject: [PATCH 08/11] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d27f762c3..32fee0dc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/). +## [Unreleased] + * Add keyboard shortcut to quit the app on Windows ([#1202](https://github.com/lbryio/lbry-app/pull/1202)) + ## [0.21.2] - 2018-03-22 -- 2.45.3 From 4b5279500ad87b3ffd3e45851e91de461258b845 Mon Sep 17 00:00:00 2001 From: YULIUS KURNIAWAN KRISTIANTO Date: Fri, 30 Mar 2018 23:38:05 +0700 Subject: [PATCH 09/11] Update CHANGELOG.md based on igassman requested changes comment --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32fee0dc7..97f714f31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/). ## [Unreleased] + +### Added * Add keyboard shortcut to quit the app on Windows ([#1202](https://github.com/lbryio/lbry-app/pull/1202)) ## [0.21.2] - 2018-03-22 -- 2.45.3 From 0a4f78190d4ce5bca47b848a76f78b98cb5d1c99 Mon Sep 17 00:00:00 2001 From: YULIUS KURNIAWAN KRISTIANTO Date: Sat, 31 Mar 2018 01:14:13 +0700 Subject: [PATCH 10/11] added file menu item --- src/main/menu/setupBarMenu.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/menu/setupBarMenu.js b/src/main/menu/setupBarMenu.js index fadefaa29..08fc9fab2 100644 --- a/src/main/menu/setupBarMenu.js +++ b/src/main/menu/setupBarMenu.js @@ -2,6 +2,10 @@ import { app, Menu, shell } from 'electron'; export default () => { const template = [ + { + label: 'File', + submenu: [{ role: 'quit', accelerator: 'CmdOrCtrl+Q' }], + }, { label: 'Edit', submenu: [ @@ -27,11 +31,7 @@ export default () => { }, { role: 'window', - submenu: [ - { role: 'minimize' }, - { role: 'close' }, - { role: 'quit', accelerator: 'CmdOrCtrl+Q' }, - ], + submenu: [{ role: 'minimize' }, { role: 'close' }], }, { role: 'help', -- 2.45.3 From 97fbef8fc9182107ad8450ed53605423a94197c3 Mon Sep 17 00:00:00 2001 From: YULIUS KURNIAWAN KRISTIANTO Date: Sat, 31 Mar 2018 01:23:23 +0700 Subject: [PATCH 11/11] Update CHANGELOG.md --- CHANGELOG.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 97f714f31..9e908a395 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,9 +49,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). * LBRY URLs not working on Linux ([#1120](https://github.com/lbryio/lbry-app/issues/1120)) * Fix Windows notifications not showing ([#1145](https://github.com/lbryio/lbry-app/pull/1145)) * Fix export issues ([#1163](https://github.com/lbryio/lbry-app/pull/1163)) - * Fix Keyboard Shortcut to Quit APP ([#1163](https://github.com/lbryio/lbry-app/pull/1202)) - - + ## [0.20.0] - 2018-01-30 ### Added -- 2.45.3