OS X changes

This commit is contained in:
Scott E. Graves
2018-12-13 19:05:00 -06:00
parent 8618bf9965
commit 9b2f12200c
5 changed files with 73 additions and 75 deletions

View File

@@ -74,9 +74,8 @@ function createWindow() {
mountedData = {}; mountedData = {};
}); });
if ((os.platform() === 'win32') || (os.platform() === 'linux')) { const appPath = (os.platform() === 'win32') ? path.resolve(path.join(app.getAppPath(), '..\\..\\repertory-ui.exe')) :
const appPath = (os.platform() === 'win32') ? (os.platform() === 'darwin') ? app.getAppPath() :
path.resolve(path.join(app.getAppPath(), '..\\..\\repertory-ui.exe')) :
process.env.APPIMAGE; process.env.APPIMAGE;
const autoLauncher = new AutoLaunch({ const autoLauncher = new AutoLaunch({
@@ -84,7 +83,7 @@ function createWindow() {
path: appPath, path: appPath,
}); });
const image = nativeImage.createFromPath(path.join(__dirname, '/build/logo.png')); const image = nativeImage.createFromPath(path.join(__dirname, (os.platform() === 'darwin') ? '/build/icon.icns' : '/build/logo.png'));
trayContextMenu = Menu.buildFromTemplate([ trayContextMenu = Menu.buildFromTemplate([
{ {
label: 'Visible', type: 'checkbox', click(item) { label: 'Visible', type: 'checkbox', click(item) {
@@ -123,7 +122,7 @@ function createWindow() {
type: 'separator' type: 'separator'
}, },
{ {
label: 'Exit and Unmount', click(item) { label: 'Exit and Unmount', click() {
closeApplication(); closeApplication();
} }
} }
@@ -153,7 +152,6 @@ function createWindow() {
.catch(() => { .catch(() => {
closeApplication(); closeApplication();
}); });
}
} }
const instanceLock = app.requestSingleInstanceLock(); const instanceLock = app.requestSingleInstanceLock();

View File

@@ -129,10 +129,10 @@
"./helpers.js" "./helpers.js"
], ],
"linux": { "linux": {
"icon": "./build/icon.icns" "icon": "./build/logo.png"
}, },
"mac": { "mac": {
"icon": "./build/icon.icns" "icon": "./build/icon_color.icns"
}, },
"win": { "win": {
"icon": "./build/icon.ico" "icon": "./build/icon.ico"

BIN
public/icon_color.icns Normal file

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB