Fixed icon paths after build

This commit is contained in:
2022-07-07 11:28:51 +02:00
parent f8c2d56c8f
commit f6d1ed0477
4 changed files with 13 additions and 6 deletions

View File

@@ -34,7 +34,9 @@
], ],
"extraResources": [ "extraResources": [
"dependencies/template.blend", "dependencies/template.blend",
"dependencies/blenderScript.py" "dependencies/blenderScript.py",
"assets/icon.png",
"assets/render_finished_icon.png"
], ],
"win": { "win": {
"icon": "assets/icon.png", "icon": "assets/icon.png",

View File

@@ -1,4 +1,4 @@
import { blenderPath, blenderScriptPath, dataPath, templatePath } from "./paths"; import { blenderPath, blenderScriptPath, dataPath, templatePath, finsishedIconPath } from "./paths";
import {spawn} from "child_process"; import {spawn} from "child_process";
import logger from "./logger"; import logger from "./logger";
import { setBlenderLoading, setBlenderStatus } from "./ui/menu"; import { setBlenderLoading, setBlenderStatus } from "./ui/menu";
@@ -120,7 +120,7 @@ function startBlender() {
// TODO: only show notification if not in do not disturb mode, currently not working. Details: https://github.com/felixrieseberg/macos-notification-state/issues/30 // TODO: only show notification if not in do not disturb mode, currently not working. Details: https://github.com/felixrieseberg/macos-notification-state/issues/30
new Notification("Render Finished", { new Notification("Render Finished", {
body: "Rendering finished successfully!", body: "Rendering finished successfully!",
icon: "../assets/render_finished_icon.png" icon: finsishedIconPath
}).onclick = function() { }).onclick = function() {
ipcRenderer.send("openApp"); ipcRenderer.send("openApp");
} }

View File

@@ -19,3 +19,5 @@ export function platformCharacter() {
export const blenderPath = path.join(appPath, "dependencies", platformFolder, "blender", "blender"); export const blenderPath = path.join(appPath, "dependencies", platformFolder, "blender", "blender");
export const templatePath = path.join(appPath, "dependencies", "template.blend"); export const templatePath = path.join(appPath, "dependencies", "template.blend");
export const blenderScriptPath = path.join(appPath, "dependencies", "blenderScript.py"); export const blenderScriptPath = path.join(appPath, "dependencies", "blenderScript.py");
export const finsishedIconPath = path.join(appPath, "assets", "render_finished_icon.png");

View File

@@ -9,6 +9,9 @@ logger.transports.console.format = "{h}:{i}:{s} {text}";
logger.transports.file.getFile(); logger.transports.file.getFile();
logger.transports.file.resolvePath = () => path.join(app.getPath('userData'), "logs", "start.log"); logger.transports.file.resolvePath = () => path.join(app.getPath('userData'), "logs", "start.log");
const appIconPath = path.join(app.getAppPath().replace("app.asar", ""), "assets", "icon.png");
const finsishedIconPath = path.join(app.getAppPath().replace("app.asar", ""), "assets", "render_finished_icon.png");
autoUpdater.autoDownload = false; autoUpdater.autoDownload = false;
autoUpdater.checkForUpdatesAndNotify(); autoUpdater.checkForUpdatesAndNotify();
@@ -116,7 +119,7 @@ const createWindow = () => {
const progress = parseFloat(arg); const progress = parseFloat(arg);
mainWindow.setProgressBar(progress); mainWindow.setProgressBar(progress);
if(progress === 1 && !mainWindow.isFocused()) { if(progress === 1 && !mainWindow.isFocused()) {
mainWindow.setOverlayIcon(path.join(__dirname, '../assets/render_finished_icon.png') as unknown as NativeImage, 'Rendering Complete'); mainWindow.setOverlayIcon(finsishedIconPath as unknown as NativeImage, 'Rendering Complete');
mainWindow.flashFrame(true); mainWindow.flashFrame(true);
} }
}); });
@@ -134,7 +137,7 @@ const createWindow = () => {
mainWindow.show(); mainWindow.show();
}); });
mainWindow.setIcon(path.join(__dirname, '../assets/icon.png')); mainWindow.setIcon(appIconPath);
}; };
// This method will be called when Electron has finished // This method will be called when Electron has finished