diff --git a/assets/appx/Square150x150Logo.png b/assets/appx/Square150x150Logo.png new file mode 100644 index 0000000..bd9d104 Binary files /dev/null and b/assets/appx/Square150x150Logo.png differ diff --git a/assets/appx/Square44x44Logo.png b/assets/appx/Square44x44Logo.png new file mode 100644 index 0000000..0f8bb23 Binary files /dev/null and b/assets/appx/Square44x44Logo.png differ diff --git a/assets/appx/Square44x44Logo.targetsize-256_altform-unplated.png b/assets/appx/Square44x44Logo.targetsize-256_altform-unplated.png new file mode 100644 index 0000000..436034e Binary files /dev/null and b/assets/appx/Square44x44Logo.targetsize-256_altform-unplated.png differ diff --git a/assets/appx/StoreLogo.png b/assets/appx/StoreLogo.png new file mode 100644 index 0000000..7c31d4b Binary files /dev/null and b/assets/appx/StoreLogo.png differ diff --git a/assets/appx/Wide310x150Logo.png b/assets/appx/Wide310x150Logo.png new file mode 100644 index 0000000..1744786 Binary files /dev/null and b/assets/appx/Wide310x150Logo.png differ diff --git a/assets/icon.ico b/assets/icon.ico index 272293e..8a9fd59 100644 Binary files a/assets/icon.ico and b/assets/icon.ico differ diff --git a/assets/linux/128x128.png b/assets/linux/128x128.png new file mode 100644 index 0000000..9840444 Binary files /dev/null and b/assets/linux/128x128.png differ diff --git a/assets/linux/16x16.png b/assets/linux/16x16.png new file mode 100644 index 0000000..e01d9d0 Binary files /dev/null and b/assets/linux/16x16.png differ diff --git a/assets/linux/256x256.png b/assets/linux/256x256.png new file mode 100644 index 0000000..436034e Binary files /dev/null and b/assets/linux/256x256.png differ diff --git a/assets/linux/32x32.png b/assets/linux/32x32.png new file mode 100644 index 0000000..3623d28 Binary files /dev/null and b/assets/linux/32x32.png differ diff --git a/assets/linux/64x64.png b/assets/linux/64x64.png new file mode 100644 index 0000000..15e2189 Binary files /dev/null and b/assets/linux/64x64.png differ diff --git a/assets/mizar-64.png b/assets/mizar-64.png new file mode 100644 index 0000000..15e2189 Binary files /dev/null and b/assets/mizar-64.png differ diff --git a/src/main/main.ts b/src/main/main.ts index fdf3a65..8772553 100644 --- a/src/main/main.ts +++ b/src/main/main.ts @@ -1,15 +1,15 @@ -import { app, BrowserWindow, /* nativeImage, */ ipcMain, Menu } from 'electron'; -// import * as fs from 'fs'; +import { app, BrowserWindow, nativeImage, ipcMain, Menu } from 'electron'; +import * as fs from 'fs'; import * as path from 'path'; import * as Store from 'electron-store'; import { ChildProcess, fork, Serializable } from 'child_process'; import * as windowStateKeeper from 'electron-window-state'; import * as remoteMain from '@electron/remote/main'; - -// import ipcHandlers from './ipc-handlers'; +import { autoUpdater } from 'electron-updater'; Store.initRenderer(); const settingsStore = new Store({ name: 'settings' }); +autoUpdater.allowPrerelease = settingsStore.get('allow_prerelease', true) as boolean; // const appTheme = settingsStore.get('application_theme'); const isDevelopment = process.env.NODE_ENV !== 'production'; const isMacOS = process.platform === 'darwin'; @@ -24,7 +24,7 @@ let mainWindow: BrowserWindow; let mainWindowState: windowStateKeeper.State; async function createMainWindow () { - // const icon = require('../renderer/assets/icons/icon.png'); + const icon = require('../../assets/mizar-64.png'); const window = new BrowserWindow({ width: mainWindowState.width, height: mainWindowState.height, @@ -34,7 +34,7 @@ async function createMainWindow () { minHeight: 500, show: !isWindows, title: 'Mizar TCP Tester', - // icon: nativeImage.createFromDataURL(icon.default), + icon: nativeImage.createFromDataURL(icon.default), webPreferences: { nodeIntegration: true, contextIsolation: false, diff --git a/src/renderer/components/ModalSettings.vue b/src/renderer/components/ModalSettings.vue index a155161..e9c08ed 100644 --- a/src/renderer/components/ModalSettings.vue +++ b/src/renderer/components/ModalSettings.vue @@ -19,6 +19,7 @@