Merge branch 'osx-menu' into dev

docs/setup.md

@@ -59,7 +59,7 @@ Below lists menu options (shortcut keys are listed in brackets):
 
 - **File**
   - **About Mattermost** - Shows version information for Mattermost desktop application
-  - **Settings** - Opens setting menu to add new team sites and configure shortcut key options
+  - **Settings** (Ctrl+Comma) - Opens setting menu to add new team sites and configure shortcut key options
   - **Quit** (Ctrl+Q) - Exits the application
 - **Edit**
   - **Undo** (Ctrl+Z) - Reverses previous action
@@ -104,7 +104,7 @@ For OS X 10.11 El Capitan. An older version of OS X has similar way.
 
    You should see a new application called **Mattermost Desktop** open.
 
-4. Click `Mattermost` from the menu at the top of the screen, then click `Settings`
+4. Click `Mattermost` from the menu at the top of the screen, then click `Preferences...`
 
 5. For each Mattermost team you'd like to use, enter its **Name** and **URL** then click **Add**
 

src/main/menus/app.js

@@ -9,8 +9,6 @@ var createTemplate = function(mainWindow) {
   var template = [];
 
   const platformAppMenu = process.platform === 'darwin' ? [{
-    type: 'separator'
-  }, {
     label: 'Hide ' + app_name,
     accelerator: 'Command+H',
     selector: 'hide:'
@@ -37,10 +35,15 @@ var createTemplate = function(mainWindow) {
         });
       }
     }, {
-      label: 'Settings',
+      type: 'separator'
+    }, {
+      label: (process.platform === 'darwin') ? 'Preferences...' : 'Settings',
+      accelerator: 'CmdOrCtrl+,',
       click: function(item, focusedWindow) {
         mainWindow.loadURL('file://' + __dirname + '/browser/settings.html');
       }
+    }, {
+      type: 'separator'
     }, ...platformAppMenu, {
       label: 'Quit',
       accelerator: 'CmdOrCtrl+Q',