Merge branch 'develop'
This commit is contained in:
commit
24e783e644
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "tabs",
|
"name": "tabs",
|
||||||
"version": "0.6.2",
|
"version": "0.6.3",
|
||||||
"description": "Persistent and separate browser tabs in one window.",
|
"description": "Persistent and separate browser tabs in one window.",
|
||||||
"author": {
|
"author": {
|
||||||
"name": "Alice Gaudon",
|
"name": "Alice Gaudon",
|
||||||
|
@ -5,6 +5,7 @@ import {app, BrowserWindow, ipcMain, Menu, shell, Tray} from "electron";
|
|||||||
import Meta from "./Meta";
|
import Meta from "./Meta";
|
||||||
import Config from "./Config";
|
import Config from "./Config";
|
||||||
import Service from "./Service";
|
import Service from "./Service";
|
||||||
|
import { autoUpdater } from "electron-updater";
|
||||||
|
|
||||||
const resourcesDir = path.resolve(__dirname, '../resources');
|
const resourcesDir = path.resolve(__dirname, '../resources');
|
||||||
const iconPath = path.resolve(resourcesDir, 'logo.png');
|
const iconPath = path.resolve(resourcesDir, 'logo.png');
|
||||||
@ -36,6 +37,11 @@ function toggleMainWindow() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function createWindow() {
|
function createWindow() {
|
||||||
|
// Check for updates on windows and mac
|
||||||
|
if (process.platform === 'win32' || process.platform === 'darwin') {
|
||||||
|
autoUpdater.checkForUpdatesAndNotify();
|
||||||
|
}
|
||||||
|
|
||||||
// System tray
|
// System tray
|
||||||
console.log('Loading system Tray');
|
console.log('Loading system Tray');
|
||||||
tray = new Tray(iconPath);
|
tray = new Tray(iconPath);
|
||||||
|
Loading…
Reference in New Issue
Block a user