build: icons update

fairdataihub · Dec 11, 2023 · c2c48c2 · c2c48c2
1 parent c26869f
commit c2c48c2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/electron-builder.yml b/electron-builder.yml
@@ -28,6 +28,7 @@ nsis:
   uninstallDisplayName: ${productName}
   createDesktopShortcut: always
 mac:
+  icon: 'assets/menu-icon/soda_icon.png'
   entitlementsInherit: ./entitlements.mac.inherit.plist
   notarize: true
   extraResources:

diff --git a/resources/soda_icon.png b/resources/soda_icon.png
diff --git a/src/main/index.js b/src/main/index.js
@@ -4,7 +4,7 @@ import { join } from 'path'
 import { electronApp, optimizer, is } from '@electron-toolkit/utils'
 import { autoUpdater } from "electron-updater";
 import { trackEvent, trackKombuchaEvent } from "./analytics"
-import icon from '../../resources/icon.png?asset'
+import icon from '../../resources/soda_icon.png?asset'
 import ElectronLog from "electron-log"
 import axios from "axios"
 import fp from "find-free-port"
@@ -564,8 +564,20 @@ const initialize = () => {
     trackEvent("Success", "App Launched - OS", os.platform() + "-" + os.release());
     trackEvent("Success", "App Launched - SODA", app.getVersion());
 
+    console.log(__dirname)
+
 
     function createWindow() {
+
+      let iconPath = ""
+      if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
+        iconPath = process.env['ELECTRON_RENDERER_URL'] + "/public/menu-icon/soda_icon.png"
+      } else {
+        iconPath = join(__dirname, '../renderer/public/menu-icon/soda_icon.png')
+      }
+
+      console.log(iconPath)
+
       // Create the browser window.
       mainWindow = new BrowserWindow({
         show: false,
@@ -577,7 +589,7 @@ const initialize = () => {
         show: false,
         nodeIntegration: true,
         autoHideMenuBar: true,
-        ...(process.platform === 'linux' ? { icon } : {}),
+        icon: iconPath,
         webPreferences: {
           preload: join(__dirname, '../preload/index.js'),
           sandbox: false,