Skip to content

Commit

Permalink
Merge pull request #396 from cosmos/matt/348-menu-bar
Browse files Browse the repository at this point in the history
Matt/348 - Native menu bar
  • Loading branch information
nylira authored Jan 26, 2018
2 parents 04676c0 + f424cd6 commit 39b4cd6
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 2 deletions.
5 changes: 3 additions & 2 deletions app/src/main/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'

let { app, BrowserWindow, Menu } = require('electron')
let { app, BrowserWindow } = require('electron')
let fs = require('fs-extra')
let { join } = require('path')
let { spawn } = require('child_process')
Expand All @@ -12,6 +12,7 @@ let toml = require('toml')
let axios = require('axios')
let pkg = require('../../../package.json')
let relayServer = require('./relayServer.js')
let addMenu = require('./menu.js')

let started = false
let shuttingDown = false
Expand Down Expand Up @@ -139,7 +140,7 @@ function createWindow () {
webContents.on('will-navigate', handleRedirect)
webContents.on('new-window', handleRedirect)

Menu.setApplicationMenu(null)
if (!WIN) addMenu()
}

function startProcess (name, args, env) {
Expand Down
25 changes: 25 additions & 0 deletions app/src/main/menu.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
const { app, Menu } = require('electron')

module.exports = function () {
let template = [
{
label: 'Cosmos',
submenu: [
{ label: 'About Cosmos UI', selector: 'orderFrontStandardAboutPanel:' },
{ type: 'separator' },
{ label: 'Quit', accelerator: 'Command+Q', click: () => app.quit() }
]
},
{
label: 'Edit',
submenu: [
{ label: 'Cut', accelerator: 'CmdOrCtrl+X', selector: 'cut:' },
{ label: 'Copy', accelerator: 'CmdOrCtrl+C', selector: 'copy:' },
{ label: 'Paste', accelerator: 'CmdOrCtrl+V', selector: 'paste:' }
]
}
]

let menu = Menu.buildFromTemplate(template)
Menu.setApplicationMenu(menu)
}

0 comments on commit 39b4cd6

Please sign in to comment.