diff --git a/build/icon.ico b/build/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..4c1cf0ba07ca32eee38aded9ea8cf33a0863600b Binary files /dev/null and b/build/icon.ico differ diff --git a/build/trayTemplate.png b/build/trayTemplate.png new file mode 100644 index 0000000000000000000000000000000000000000..32242e0d1d6b09ad3ae2a20864e77ce4519130a8 Binary files /dev/null and b/build/trayTemplate.png differ diff --git a/electron/main/window/create.ts b/electron/main/window/create.ts index a2f180ef4d30b954f35bb038adaaa89d76657e2b..a06b3b2b3d991918434b45013f86bf6ab7675632 100644 --- a/electron/main/window/create.ts +++ b/electron/main/window/create.ts @@ -13,7 +13,6 @@ import { BrowserWindow, app, ipcMain, Menu } from 'electron'; import { options as allWindow } from './options'; import { updateConf } from '../common/conf'; import { isLinux } from '../common/platform'; -import { iconPath } from './options'; // 存储所有创建的窗口实例,用于全局访问 const windowInstances: Map = new Map(); @@ -121,7 +120,6 @@ function setupWindowOpenHandler(win: BrowserWindow) { width, height, autoHideMenuBar: true, - icon: iconPath, x, y, resizable: true, diff --git a/electron/main/window/options.ts b/electron/main/window/options.ts index 356349cb3677f7aaf0d3e2361892a056c7118e51..3bfe3679133a13cf6426d8af52ac691b345a802b 100644 --- a/electron/main/window/options.ts +++ b/electron/main/window/options.ts @@ -7,9 +7,7 @@ // IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR // PURPOSE. // See the Mulan PSL v2 for more details. -import path from 'path'; import { isLinux } from '../common/platform'; -import electron from 'electron'; export interface allWindowType { [propName: string]: { @@ -48,9 +46,6 @@ const adjustWindowSize = ( return result; }; -export const iconPath = electron.app.isPackaged - ? 'dist/favicon.ico' - : path.join(__dirname, '../../public/app_favicon.ico'); export const options: allWindowType = { mainWindow: { id: 'mainWindow', @@ -64,7 +59,6 @@ export const options: allWindowType = { show: true, alwaysOnTop: false, useContentSize: true, - icon: iconPath, ...getLinuxSpecificOptions(), }), hash: '/', @@ -82,7 +76,6 @@ export const options: allWindowType = { alwaysOnTop: true, useContentSize: true, titleBarStyle: 'hidden', - icon: iconPath, ...getLinuxSpecificOptions(), }), hash: '/chat', diff --git a/electron/main/window/tray.ts b/electron/main/window/tray.ts index 246afec825706ba47057b7e687dd2bba28e99f3c..0747a77d741e5bdc97018a367978f66c84ea27f7 100644 --- a/electron/main/window/tray.ts +++ b/electron/main/window/tray.ts @@ -75,9 +75,9 @@ export function createTray(): Tray { }, ]; const iconPath = - process.platform === 'win32' - ? path.join(__dirname, '../app_favicon.ico') - : path.join(__dirname, '../favicon.ico'); + process.platform === 'darwin' + ? path.join(__dirname, '../trayTemplate.png') + : path.join(__dirname, '../icon.png'); appTray = new Tray(iconPath); const contextMenu = Menu.buildFromTemplate(trayMenus); appTray.setToolTip('EulerCopilot'); diff --git a/package.json b/package.json index a23c463c84d5c213ab127ab6d740c07160730ea0..6319a23d0bf59247188f00f30a5938e9bf5c167a 100644 --- a/package.json +++ b/package.json @@ -86,9 +86,9 @@ "oneClick": false, "allowElevation": true, "allowToChangeInstallationDirectory": true, - "installerIcon": "dist/app_favicon.ico", - "uninstallerIcon": "dist/app_favicon.ico", - "installerHeaderIcon": "dist/app_favicon.ico", + "installerIcon": "build/icon.ico", + "uninstallerIcon": "build/icon.ico", + "installerHeaderIcon": "build/icon.ico", "createDesktopShortcut": true, "createStartMenuShortcut": true, "shortcutName": "EulerCopilot", diff --git a/public/app_favicon.ico b/public/app_favicon.ico deleted file mode 100644 index 71f3ce0b8e3f2596c44e5fa3f6364b58ee335f58..0000000000000000000000000000000000000000 Binary files a/public/app_favicon.ico and /dev/null differ diff --git a/scripts/rollup.config.ts b/scripts/rollup.config.ts index b688d5f4e34dca5847f8db163613c478c79cec29..7761d5ff751630a3b41ebc2eae5fc0893d28a1f5 100644 --- a/scripts/rollup.config.ts +++ b/scripts/rollup.config.ts @@ -44,10 +44,9 @@ export default function (opts: ConfigOptions) { }, }), copy({ - // 复制 favicon.ico 到指定目录 targets: [ - { src: 'public/app_favicon.ico', dest: 'dist' }, - { src: 'public/favicon.ico', dest: 'dist' }, + { src: 'build/trayTemplate.png', dest: 'dist' }, + { src: 'build/icon.png', dest: 'dist' }, ], }), replace({