Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-27 18:12:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(monorepo/electron): reintroduce app icons

Browse Source
This commit is contained in:
Elian Doran 2025-04-19 10:21:59 +03:00
parent 084578befe
commit ee422ee514
No known key found for this signature in database
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
_regroup/images/app-icons/icon.icns → apps/desktop/assets/app-icon/icon.icns
View File

0
_regroup/images/app-icons/icon.ico → apps/desktop/assets/app-icon/icon.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 112 KiB

0
_regroup/images/app-icons/win/setup-banner.gif → apps/desktop/assets/setup-icon/setup-banner.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

0
_regroup/images/app-icons/win/setup.ico → apps/desktop/assets/setup-icon/setup.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 109 KiB

After

Width:  |  Height:  |  Size: 109 KiB

14
apps/desktop/forge.config.cjs
View File

@ -7,7 +7,7 @@ const BIN_PATH = path.normalize("./bin/electron-forge");
const extraResourcesForPlatform = getExtraResourcesForPlatform(); const extraResourcesForPlatform = getExtraResourcesForPlatform();
const baseLinuxMakerConfigOptions = { const baseLinuxMakerConfigOptions = {
icon: "./images/app-icons/png/128x128.png", icon: "./assets/app-icon/png/128x128.png",
desktopTemplate: path.resolve(path.join(BIN_PATH, "desktop.ejs")), desktopTemplate: path.resolve(path.join(BIN_PATH, "desktop.ejs")),
categories: ["Office", "Utility"] categories: ["Office", "Utility"]
}; };
@ -24,7 +24,7 @@ module.exports = {
name: APP_NAME, name: APP_NAME,
overwrite: true, overwrite: true,
asar: true, asar: true,
icon: "./images/app-icons/icon", icon: "./assets/app-icon/icon",
osxSign: {}, osxSign: {},
osxNotarize: { osxNotarize: {
appleId: process.env.APPLE_ID, appleId: process.env.APPLE_ID,
@ -127,15 +127,15 @@ module.exports = {
name: "@electron-forge/maker-squirrel", name: "@electron-forge/maker-squirrel",
config: { config: {
iconUrl: "https://raw.githubusercontent.com/TriliumNext/Notes/develop/images/app-icons/icon.ico", iconUrl: "https://raw.githubusercontent.com/TriliumNext/Notes/develop/images/app-icons/icon.ico",
setupIcon: "./images/app-icons/win/setup.ico", setupIcon: "./assets/setup-icon/setup.ico",
loadingGif: "./images/app-icons/win/setup-banner.gif", loadingGif: "./assets/setup-icon/setup-banner.gif",
windowsSign: windowsSignConfiguration windowsSign: windowsSignConfiguration
} }
}, },
{ {
name: "@electron-forge/maker-dmg", name: "@electron-forge/maker-dmg",
config: { config: {
icon: "./images/app-icons/icon.icns" icon: "./assets/app-icon/icon.icns"
} }
}, },
{ {
@ -143,7 +143,7 @@ module.exports = {
config: { config: {
options: { options: {
iconUrl: "https://raw.githubusercontent.com/TriliumNext/Notes/develop/images/app-icons/icon.ico", iconUrl: "https://raw.githubusercontent.com/TriliumNext/Notes/develop/images/app-icons/icon.ico",
icon: "./images/app-icons/icon.ico" icon: "./assets/app-icon/icon.ico"
} }
} }
} }
@ -196,7 +196,7 @@ function getExtraResourcesForPlatform() {
resources.push(...getScriptRessources()) resources.push(...getScriptRessources())
break; break;
case "linux": case "linux":
resources.push(...getScriptRessources(), "images/app-icons/png/256x256.png"); resources.push(...getScriptRessources(), "assets/app-icon/png/256x256.png");
break; break;
default: default:
break; break;