Merge pull request #1243 from miikka/1240-local-shortcut

Make the settings keyboard shortcut local instead of global

Author: christianbundy

index.js

@@ -94,6 +94,16 @@ electron.app.on('ready', () => {
           click: () => {
             browserWindow.webContents.send('goForward')
           }
+        },
+        {
+          type: 'separator'
+        },
+        {
+          label: 'Settings',
+          accelerator: 'CmdOrCtrl+,',
+          click: () => {
+            browserWindow.webContents.send('goToSettings')
+          }
         }
       ]
     })

lib/main-window.js

@@ -63,10 +63,6 @@ module.exports = function (config) {
   const includeParticipating = api.settings.obs.get('patchwork.includeParticipating', false)
   const autoDeleteBlocked = api.settings.obs.get('patchwork.autoDeleteBlocked', false)
 
-  electron.remote.globalShortcut.register('CmdOrCtrl+,', () => {
-    toggleView('/settings')
-  })
-
   // prompt to setup profile on first use
   onceTrue(api.sbot.obs.connection, (ssb) => {
     ssb.latestSequence(api.keys.sync.id(), (err, key) => {
@@ -146,6 +142,8 @@ module.exports = function (config) {
   electron.ipcRenderer.on('goForward', views.goForward)
   electron.ipcRenderer.on('goBack', views.goBack)
 
+  electron.ipcRenderer.on('goToSettings', () => api.app.navigate('/settings'))
+
   document.head.appendChild(
     h('style', {
       innerHTML: computed(api.settings.obs.get('patchwork.theme', 'light'), themeName => {
@@ -254,8 +252,6 @@ module.exports = function (config) {
     views.html
   ])
 
-  const toggleView = view => { if (views.currentView() === view) { views.goBack() } else { navigate(view) } }
-
   const previewElement = api.app.linkPreview(container, 500)
 
   catchLinks(container, (href, external, anchor) => {