preferences menu item

This commit is contained in:
Matthias Kretschmann 2019-05-16 22:25:19 +02:00
parent ef09f70388
commit ee2f1d4d96
Signed by: m
GPG Key ID: 606EEEF3C479A91F
4 changed files with 174 additions and 136 deletions

View File

@ -16,6 +16,7 @@
"dist": "npm run build && npm run package"
},
"repository": "https://github.com/kremalicious/ocean-balance.git",
"homepage": "https://github.com/kremalicious/ocean-balance",
"author": "Matthias Kretschmann",
"license": "MIT",
"dependencies": {

View File

@ -1,7 +1,7 @@
import React, { PureComponent } from 'react'
import PropTypes from 'prop-types'
import { Router, Location } from '@reach/router'
import { webFrame } from 'electron'
import { Router, Location, navigate } from '@reach/router'
import { webFrame, ipcRenderer } from 'electron'
import posed, { PoseGroup } from 'react-pose'
import Titlebar from './components/Titlebar'
import Home from './screens/Home'
@ -35,6 +35,12 @@ PosedRouter.propTypes = {
}
export default class App extends PureComponent {
componentDidMount() {
ipcRenderer.on('goTo', (evt, route) => {
navigate(route)
})
}
render() {
return (
<>

View File

@ -1,6 +1,7 @@
const path = require('path')
const { app, BrowserWindow, systemPreferences } = require('electron')
const { touchBarWrapper } = require('react-touchbar-electron')
const buildMenu = require('./menu')
let mainWindow
@ -106,11 +107,13 @@ const createWindow = async () => {
switchTheme()
// Load menubar menu items
require('./menu.js')
buildMenu(mainWindow)
touchBarWrapper(mainWindow)
}
module.exports = { mainWindow }
app.on('ready', () => {
createWindow()

View File

@ -1,155 +1,183 @@
const { app, Menu } = require('electron')
const { openUrl } = require('./app/util/openUrl')
const { homepage } = require('../package.json')
const template = [
{
label: 'Edit',
submenu: [
{
role: 'undo'
},
{
role: 'redo'
},
const buildMenu = mainWindow => {
const template = [
{
label: 'Edit',
submenu: [
{
role: 'undo'
},
{
role: 'redo'
},
{
type: 'separator'
},
{
role: 'cut'
},
{
role: 'copy'
},
{
role: 'paste'
},
{
role: 'pasteandmatchstyle'
},
{
role: 'delete'
},
{
role: 'selectall'
}
]
},
{
label: 'View',
submenu: [
{
role: 'reload'
},
{
role: 'forcereload'
},
{
role: 'toggledevtools'
},
{
type: 'separator'
},
{
role: 'togglefullscreen'
}
]
},
{
role: 'window',
submenu: [
{
role: 'minimize'
},
{
role: 'close'
}
]
},
{
role: 'help',
submenu: [
{
label: 'Learn More',
click() {
openUrl(homepage)
}
}
]
}
]
if (process.platform === 'darwin') {
template.unshift({
label: app.getName(),
submenu: [
{
role: 'about'
},
{
type: 'separator'
},
{
label: 'Preferences...',
accelerator: 'CmdOrCtrl+,',
click() {
mainWindow.webContents.send('goTo', '/preferences')
}
},
{
type: 'separator'
},
{
role: 'services',
submenu: []
},
{
type: 'separator'
},
{
role: 'hide'
},
{
role: 'hideothers'
},
{
role: 'unhide'
},
{
type: 'separator'
},
{
role: 'quit'
}
]
})
// Edit menu
template[1].submenu.push(
{
type: 'separator'
},
{
role: 'cut'
},
{
role: 'copy'
},
{
role: 'paste'
},
{
role: 'pasteandmatchstyle'
},
{
role: 'delete'
},
{
role: 'selectall'
label: 'Speech',
submenu: [
{
role: 'startspeaking'
},
{
role: 'stopspeaking'
}
]
}
]
},
{
label: 'View',
submenu: [
{
role: 'reload'
},
{
role: 'forcereload'
},
{
role: 'toggledevtools'
},
{
type: 'separator'
},
{
role: 'togglefullscreen'
}
]
},
{
role: 'window',
submenu: [
)
// Window menu
template[3].submenu = [
{
role: 'minimize'
},
{
role: 'close'
}
]
},
{
role: 'help',
submenu: [
role: 'zoom'
},
{
label: 'Learn More',
click() {
openUrl('https://electron.atom.io')
}
role: 'close'
},
{
type: 'separator'
},
{
role: 'front'
}
]
}
]
if (process.platform === 'darwin') {
template.unshift({
label: app.getName(),
submenu: [
if (process.platform !== 'darwin') {
template[0].submenu.push(
{ type: 'separator' },
{
role: 'about'
},
{
type: 'separator'
},
{
role: 'services',
submenu: []
},
{
type: 'separator'
},
{
role: 'hide'
},
{
role: 'hideothers'
},
{
role: 'unhide'
},
{
type: 'separator'
},
{
role: 'quit'
}
]
})
// Edit menu
template[1].submenu.push(
{
type: 'separator'
},
{
label: 'Speech',
submenu: [
{
role: 'startspeaking'
},
{
role: 'stopspeaking'
label: 'Preferences...',
accelerator: 'CmdOrCtrl+,',
click() {
mainWindow.webContents.send('goTo', '/preferences')
}
]
}
)
}
)
}
// Window menu
template[3].submenu = [
{
role: 'close'
},
{
role: 'minimize'
},
{
role: 'zoom'
},
{
type: 'separator'
},
{
role: 'front'
}
]
const menu = Menu.buildFromTemplate(template)
Menu.setApplicationMenu(menu)
}
const menu = Menu.buildFromTemplate(template)
Menu.setApplicationMenu(menu)
module.exports = buildMenu