diff --git a/src/services/icon@2x.png b/build-resources/icon@2x.png similarity index 100% rename from src/services/icon@2x.png rename to build-resources/icon@2x.png diff --git a/src/services/icon@3x.png b/build-resources/icon@3x.png similarity index 100% rename from src/services/icon@3x.png rename to build-resources/icon@3x.png diff --git a/src/services/icon@4x.png b/build-resources/icon@4x.png similarity index 100% rename from src/services/icon@4x.png rename to build-resources/icon@4x.png diff --git a/src/services/icon@5x.png b/build-resources/icon@5x.png similarity index 100% rename from src/services/icon@5x.png rename to build-resources/icon@5x.png diff --git a/src/services/menubar.png b/build-resources/menubar.png similarity index 100% rename from src/services/menubar.png rename to build-resources/menubar.png diff --git a/src/services/menubar@2x.png b/build-resources/menubar@2x.png similarity index 100% rename from src/services/menubar@2x.png rename to build-resources/menubar@2x.png diff --git a/src/services/menubarTemplate.png b/build-resources/menubarTemplate.png similarity index 100% rename from src/services/menubarTemplate.png rename to build-resources/menubarTemplate.png diff --git a/src/services/menubarTemplate@2x.png b/build-resources/menubarTemplate@2x.png similarity index 100% rename from src/services/menubarTemplate@2x.png rename to build-resources/menubarTemplate@2x.png diff --git a/src/services/overlay-icon.png b/build-resources/overlay-icon.png similarity index 100% rename from src/services/overlay-icon.png rename to build-resources/overlay-icon.png diff --git a/src/services/overlay-icon@2x.png b/build-resources/overlay-icon@2x.png similarity index 100% rename from src/services/overlay-icon@2x.png rename to build-resources/overlay-icon@2x.png diff --git a/src/services/overlay-icon@3x.png b/build-resources/overlay-icon@3x.png similarity index 100% rename from src/services/overlay-icon@3x.png rename to build-resources/overlay-icon@3x.png diff --git a/src/services/overlay-icon@4x.png b/build-resources/overlay-icon@4x.png similarity index 100% rename from src/services/overlay-icon@4x.png rename to build-resources/overlay-icon@4x.png diff --git a/src/services/overlay-icon@5x.png b/build-resources/overlay-icon@5x.png similarity index 100% rename from src/services/overlay-icon@5x.png rename to build-resources/overlay-icon@5x.png diff --git a/src/services/constants/paths.ts b/src/services/constants/paths.ts index d0ec5d26..c492e3c6 100644 --- a/src/services/constants/paths.ts +++ b/src/services/constants/paths.ts @@ -5,13 +5,14 @@ import os from 'os'; const isMac = process.platform === 'darwin'; const sourcePath = path.resolve(__dirname, '..', '..'); +export const buildResourcePath = path.resolve(sourcePath, '..', 'build-resources'); // FIXME: change to electron forge path const REACT_PATH = isDev ? 'http://localhost:3000' : `file://${path.resolve(__dirname, '..', '..', 'build', 'index.html')}`; // .app/Contents/Resources/wiki/ const TIDDLYWIKI_TEMPLATE_FOLDER_PATH = isDev ? path.resolve(sourcePath, '..', 'template', 'wiki') : path.resolve(process.resourcesPath, '..', 'wiki'); const TIDDLERS_PATH = 'tiddlers'; -const ICON_PATH = isDev ? path.resolve(sourcePath, 'icon.png') : `file://${path.resolve(__dirname, '..', 'icon.png')}`; +const ICON_PATH = isDev ? path.resolve(buildResourcePath, 'icon.png') : `file://${path.resolve(__dirname, '..', 'icon.png')}`; const CHROME_ERROR_PATH = 'chrome-error://chromewebdata/'; const DESKTOP_PATH = path.join(os.homedir(), 'Desktop'); const LOG_FOLDER = isDev diff --git a/src/services/icon.png b/src/services/icon.png deleted file mode 100644 index ac7251ce..00000000 Binary files a/src/services/icon.png and /dev/null differ diff --git a/src/services/libs/views.ts b/src/services/libs/views.ts index e5f105e3..01516950 100644 --- a/src/services/libs/views.ts +++ b/src/services/libs/views.ts @@ -2,6 +2,7 @@ import { BrowserView, BrowserWindow, app, session, shell, dialog, ipcMain } from 'electron'; import path from 'path'; import fsExtra from 'fs-extra'; +import { buildResourcePath } from '@/services/constants/paths'; import index18n from './i18n'; import wikiStartup from './wiki/wiki-startup'; import { getPreferences, getPreference } from './preferences'; @@ -517,7 +518,7 @@ export const addView = async (browserWindow: any, workspace: any) => { app.badgeCount = count; if (process.platform === 'win32') { if (count > 0) { - browserWindow.setOverlayIcon(path.resolve(__dirname, '..', 'overlay-icon.png'), `You have ${count} new messages.`); + browserWindow.setOverlayIcon(path.resolve(buildResourcePath, 'overlay-icon.png'), `You have ${count} new messages.`); } else { browserWindow.setOverlayIcon(null, ''); } diff --git a/src/services/windows/main.ts b/src/services/windows/main.ts index 08ee488b..bc2ea51c 100644 --- a/src/services/windows/main.ts +++ b/src/services/windows/main.ts @@ -3,7 +3,7 @@ import windowStateKeeper from 'electron-window-state'; import { menubar, Menubar } from 'menubar'; import path from 'path'; -import { REACT_PATH, isDev as isDevelopment } from '../constants/paths'; +import { REACT_PATH, isDev as isDevelopment, buildResourcePath } from '@/services/constants/paths'; import { getPreference } from '../libs/preferences'; import formatBytes from '../libs/format-bytes'; @@ -32,7 +32,7 @@ export const createAsync = async (): Promise => // https://github.com/atomery/translatium/issues/164 const tray = new Tray(nativeImage.createEmpty()); // icon template is not supported on Windows & Linux - const iconPath = path.resolve(__dirname, '..', process.platform === 'darwin' ? 'menubarTemplate.png' : 'menubar.png'); + const iconPath = path.resolve(buildResourcePath, process.platform === 'darwin' ? 'menubarTemplate.png' : 'menubar.png'); tray.setImage(iconPath); menuBar = menubar({ @@ -159,7 +159,7 @@ export const createAsync = async (): Promise => show: false, // manually set dock icon for AppImage // Snap icon is set correct already so no need to intervene - icon: process.platform === 'linux' && process.env.SNAP == undefined ? path.resolve(__dirname, '..', 'icon.png') : undefined, + icon: process.platform === 'linux' && process.env.SNAP == undefined ? path.resolve(buildResourcePath, 'icon.png') : undefined, webPreferences: { nodeIntegration: false, enableRemoteModule: true,