Use webpack to build
This commit is contained in:
12
src/main.js
12
src/main.js
@@ -7,9 +7,10 @@ const Menu = electron.Menu;
|
||||
const Tray = electron.Tray;
|
||||
const ipc = electron.ipcMain;
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
|
||||
var settings = require('./common/settings');
|
||||
var appMenu = require('./menus/app');
|
||||
var appMenu = require('./main/menus/app');
|
||||
|
||||
var argv = require('yargs').argv;
|
||||
|
||||
@@ -38,6 +39,7 @@ try {
|
||||
}
|
||||
}
|
||||
catch (e) {
|
||||
config = settings.loadDefault();
|
||||
console.log('Failed to read or upgrade config.json');
|
||||
}
|
||||
|
||||
@@ -83,9 +85,9 @@ app.on('before-quit', function() {
|
||||
app.on('ready', function() {
|
||||
// set up tray icon to show balloon
|
||||
if (process.platform === 'win32') {
|
||||
trayIcon = new Tray(__dirname + '/resources/tray.png');
|
||||
trayIcon = new Tray(path.resolve(__dirname, 'resources/tray.png'));
|
||||
trayIcon.setToolTip(app.getName());
|
||||
var tray_menu = require('./menus/tray').createDefault();
|
||||
var tray_menu = require('./main/menus/tray').createDefault();
|
||||
trayIcon.setContextMenu(tray_menu);
|
||||
trayIcon.on('click', function() {
|
||||
mainWindow.focus();
|
||||
@@ -95,7 +97,7 @@ app.on('ready', function() {
|
||||
});
|
||||
ipc.on('notified', function(event, arg) {
|
||||
trayIcon.displayBalloon({
|
||||
icon: __dirname + '/resources/appicon.png',
|
||||
icon: path.resolve(__dirname, 'resources/appicon.png'),
|
||||
title: arg.title,
|
||||
content: arg.options.body
|
||||
});
|
||||
@@ -112,7 +114,7 @@ app.on('ready', function() {
|
||||
// follow Electron's defaults
|
||||
window_options = {};
|
||||
}
|
||||
window_options.icon = __dirname + '/resources/appicon.png';
|
||||
window_options.icon = path.resolve(__dirname, 'resources/appicon.png');
|
||||
mainWindow = new BrowserWindow(window_options);
|
||||
if (window_options.maximized) {
|
||||
mainWindow.maximize();
|
||||
|
Reference in New Issue
Block a user