Merge pull request #1016 from MathewtheCoder/altair-1006-settings-dia…

…log-keybinding

Added keyboard shortcut for displaying settings dialog.

packages/altair-electron/src/menu.js

@@ -51,6 +51,11 @@ const createMenu = (actions) => {
       submenu: [
         { role: "about" },
         { label: 'Check for Updates...', click: actions.checkForUpdates },
+        {
+          label: 'Preferences',
+          accelerator: 'Cmd+,',
+          click: actions.showSettings
+        },
         { type: "separator" },
         { role: "services", submenu: [] },
         { type: "separator" },

packages/altair-electron/src/window.js

@@ -38,6 +38,9 @@ const actions = {
   showDocs: () => {
     instance.webContents.send('show-docs', true);
   },
+  showSettings: () => {
+    instance.webContents.send('show-settings', true);
+  },
   checkForUpdates,
 };
 
@@ -153,7 +156,7 @@ const createWindow = () => {
     contents.on('new-window', (event, navigationUrl) => {
       // Ask the operating system to open this event's url in the default browser.
       event.preventDefault();
-  
+
       shell.openExternalSync(navigationUrl);
     })
   });

src/app/services/electron-app/electron-app.service.ts

@@ -11,6 +11,7 @@ import * as fromRoot from '../../reducers';
 
 import * as queryActions from '../../actions/query/query';
 import * as docsActions from '../../actions/docs/docs';
+import * as windowsMetaActions from '../../actions/windows-meta/windows-meta';
 import { debug } from 'app/utils/logger';
 
 @Injectable()
@@ -69,7 +70,9 @@ export class ElectronAppService {
       this.ipc.on('show-docs', () => {
         this.zone.run(() => this.store.dispatch(new docsActions.ToggleDocsViewAction(this.activeWindowId)));
       });
-
+      this.ipc.on('show-settings', () => {
+        this.zone.run(() => this.store.dispatch(new windowsMetaActions.ShowSettingsDialogAction({ value: true })));
+      });
       debug.log('Electron app connected.');
 
       this.ipc.send('get-file-opened');