feat: add app icons

Fabio286 · Apr 11, 2023 · 1062f7f · 1062f7f
1 parent 2265a3e
commit 1062f7f
Show file tree

Hide file tree

Showing 24 changed files with 259 additions and 764 deletions.
diff --git a/assets/appx/Square150x150Logo.png b/assets/appx/Square150x150Logo.png
diff --git a/assets/appx/Square44x44Logo.png b/assets/appx/Square44x44Logo.png
diff --git a/assets/appx/Square44x44Logo.targetsize-256_altform-unplated.png b/assets/appx/Square44x44Logo.targetsize-256_altform-unplated.png
diff --git a/assets/appx/StoreLogo.png b/assets/appx/StoreLogo.png
diff --git a/assets/appx/Wide310x150Logo.png b/assets/appx/Wide310x150Logo.png
diff --git a/assets/icon.ico b/assets/icon.ico
diff --git a/assets/linux/128x128.png b/assets/linux/128x128.png
diff --git a/assets/linux/16x16.png b/assets/linux/16x16.png
diff --git a/assets/linux/256x256.png b/assets/linux/256x256.png
diff --git a/assets/linux/32x32.png b/assets/linux/32x32.png
diff --git a/assets/linux/64x64.png b/assets/linux/64x64.png
diff --git a/assets/mizar-64.png b/assets/mizar-64.png
diff --git 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
@@ -19,6 +19,7 @@
                </select>
             </div>
             <div class="creditsBox">
+               <img :src="appLogo" width="128">
                <div>
                   {{ appName }} v{{ appVersion }}
                </div>
@@ -56,6 +57,7 @@ const emit = defineEmits(['hide-settings', 'create-port']);
 const { t } = useI18n();
 
 const appAuthor = 'Fabio Di Stasio';
+const appLogo = require('../images/mizar.svg');
 const localLocale: Ref<AvailableLocale> = ref(null);
 
 const locales = computed(() => {

diff --git a/src/renderer/i18n/en-US.ts b/src/renderer/i18n/en-US.ts
@@ -60,7 +60,7 @@ export const enUS = {
       socketOpen: 'Socket #{number} on {host}:{port} open',
       socketClosed: 'Socket #{number} on {host}:{port} closed',
       socketMessage: 'Socket #{number} on {host}:{port} message #{mNumber}',
-      socketReply: 'Socket #{number} on {host}:{port} reply #{reply}',
+      socketReply: 'Socket #{number} on {host}:{port} reply: {reply}',
       logOnSocket: 'Socket #{number} on {host}:{port}: {message}',
       loadingMessages: 'Loading messages',
       messagesLoaded: 'Messages loaded: {mNumber}',

diff --git a/src/renderer/images/logo-16.png b/src/renderer/images/logo-16.png
diff --git a/src/renderer/images/logo-32.png b/src/renderer/images/logo-32.png
diff --git a/src/renderer/images/logo-64.png b/src/renderer/images/logo-64.png
diff --git a/src/renderer/images/logo-dark.svg b/src/renderer/images/logo-dark.svg