diff --git a/src/main/apis/app/system/index.ts b/src/main/apis/app/system/index.ts index 5642022d..87eb8997 100644 --- a/src/main/apis/app/system/index.ts +++ b/src/main/apis/app/system/index.ts @@ -19,38 +19,161 @@ import { handleCopyUrl } from '~/main/utils/common' let contextMenu: Menu | null let menu: Menu | null let tray: Tray | null -export function createContextMenu () { +export function createContextMenu() { const picBeds = getPicBeds() - const submenu = picBeds.filter(item => item.visible).map(item => { - return { - label: item.name, - type: 'radio', - checked: db.get('picBed.current') === item.type, - click () { - picgo.saveConfig({ - 'picBed.current': item.type, - 'picBed.uploader': item.type - }) - if (windowManager.has(IWindowList.SETTING_WINDOW)) { - windowManager.get(IWindowList.SETTING_WINDOW)!.webContents.send('syncPicBed') + if (process.platform === "darwin" || process.platform === "win32") { + const submenu = picBeds.filter(item => item.visible).map(item => { + return { + label: item.name, + type: 'radio', + checked: db.get('picBed.current') === item.type, + click() { + picgo.saveConfig({ + 'picBed.current': item.type, + 'picBed.uploader': item.type + }) + if (windowManager.has(IWindowList.SETTING_WINDOW)) { + windowManager.get(IWindowList.SETTING_WINDOW)!.webContents.send('syncPicBed') + } } } - } - }) - contextMenu = Menu.buildFromTemplate([ - { - label: '关于', - click () { - dialog.showMessageBox({ - title: 'PicGo', - message: 'PicGo', - detail: `Version: ${pkg.version}\nAuthor: Molunerfinn\nGithub: https://github.com/Molunerfinn/PicGo` - }) + }) + contextMenu = Menu.buildFromTemplate([ + { + label: '关于', + click() { + dialog.showMessageBox({ + title: 'PicGo', + message: 'PicGo', + detail: `Version: ${pkg.version}\nAuthor: Molunerfinn\nGithub: https://github.com/Molunerfinn/PicGo` + }) + } + }, + { + label: '打开详细窗口', + click() { + const settingWindow = windowManager.get(IWindowList.SETTING_WINDOW) + settingWindow!.show() + settingWindow!.focus() + if (windowManager.has(IWindowList.MINI_WINDOW)) { + windowManager.get(IWindowList.MINI_WINDOW)!.hide() + } + } + }, + { + label: '选择默认图床', + type: 'submenu', + // @ts-ignore + submenu + }, + // @ts-ignore + { + label: '打开更新助手', + type: 'checkbox', + checked: db.get('settings.showUpdateTip'), + click() { + const value = db.get('settings.showUpdateTip') + db.set('settings.showUpdateTip', !value) + } + }, + { + label: '重启应用', + click() { + app.relaunch() + app.exit(0) + } + }, + // @ts-ignore + { + role: 'quit', + label: '退出' } - }, - { - label: '打开详细窗口', - click () { + ]) + } + else if (process.platform === "linux") { + // TODO 图床选择功能 + // 由于在Linux难以像在Mac和Windows上那样在点击时构造ContextMenu， + // 暂时取消这个选单，避免引起和设置中启用的图床不一致 + + // TODO 重启应用功能 + // 目前的实现无法正常工作 + + contextMenu = Menu.buildFromTemplate([ + { + label: '打开详细窗口', + click() { + const settingWindow = windowManager.get(IWindowList.SETTING_WINDOW) + settingWindow!.show() + settingWindow!.focus() + if (windowManager.has(IWindowList.MINI_WINDOW)) { + windowManager.get(IWindowList.MINI_WINDOW)!.hide() + } + } + }, + // @ts-ignore + { + label: '打开更新助手', + type: 'checkbox', + checked: db.get('settings.showUpdateTip'), + click() { + const value = db.get('settings.showUpdateTip') + db.set('settings.showUpdateTip', !value) + } + }, + { + label: '关于应用', + click() { + dialog.showMessageBox({ + title: 'PicGo', + message: 'PicGo', + buttons: ['Ok'], + detail: `Version: ${pkg.version}\nAuthor: Molunerfinn\nGithub: https://github.com/Molunerfinn/PicGo`, + }); + } + }, + // @ts-ignore + { + role: 'quit', + label: '退出' + } + ]) + } +} + +export function createTray() { + const menubarPic = process.platform === 'darwin' ? `${__static}/menubar.png` : `${__static}/menubar-nodarwin.png` + tray = new Tray(menubarPic) + // click事件在Mac和Windows上可以触发（在Ubuntu上无法触发，Unity不支持） + if (process.platform === "darwin" || process.platform === "win32") { + tray.on('right-click', () => { + if (windowManager.has(IWindowList.TRAY_WINDOW)) { + windowManager.get(IWindowList.TRAY_WINDOW)!.hide() + } + createContextMenu() + tray!.popUpContextMenu(contextMenu!) + }) + tray.on('click', (event, bounds) => { + if (process.platform === 'darwin') { + toggleWindow(bounds) + setTimeout(() => { + let img = clipboard.readImage() + let obj: ImgInfo[] = [] + if (!img.isEmpty()) { + // 从剪贴板来的图片默认转为png + // @ts-ignore + const imgUrl = 'data:image/png;base64,' + Buffer.from(img.toPNG(), 'binary').toString('base64') + obj.push({ + width: img.getSize().width, + height: img.getSize().height, + imgUrl + }) + } + windowManager.get(IWindowList.TRAY_WINDOW)!.webContents.send('clipboardFiles', obj) + }, 0) + } else { + if (windowManager.has(IWindowList.TRAY_WINDOW)) { + windowManager.get(IWindowList.TRAY_WINDOW)!.hide() + } const settingWindow = windowManager.get(IWindowList.SETTING_WINDOW) settingWindow!.show() settingWindow!.focus() @@ -58,119 +181,55 @@ export function createContextMenu () { windowManager.get(IWindowList.MINI_WINDOW)!.hide() } } - }, - { - label: '选择默认图床', - type: 'submenu', - // @ts-ignore - submenu - }, - // @ts-ignore - { - label: '打开更新助手', - type: 'checkbox', - checked: db.get('settings.showUpdateTip'), - click () { - const value = db.get('settings.showUpdateTip') - db.set('settings.showUpdateTip', !value) - } - }, - { - label: '重启应用', - click () { - app.relaunch() - app.exit(0) - } - }, - // @ts-ignore - { - role: 'quit', - label: '退出' - } - ]) -} + }) -export function createTray () { - const menubarPic = process.platform === 'darwin' ? `${__static}/menubar.png` : `${__static}/menubar-nodarwin.png` - tray = new Tray(menubarPic) - tray.on('right-click', () => { - if (windowManager.has(IWindowList.TRAY_WINDOW)) { - windowManager.get(IWindowList.TRAY_WINDOW)!.hide() - } - createContextMenu() - tray!.popUpContextMenu(contextMenu!) - }) - tray.on('click', (event, bounds) => { - if (process.platform === 'darwin') { - toggleWindow(bounds) - setTimeout(() => { - let img = clipboard.readImage() - let obj: ImgInfo[] = [] - if (!img.isEmpty()) { - // 从剪贴板来的图片默认转为png - // @ts-ignore - const imgUrl = 'data:image/png;base64,' + Buffer.from(img.toPNG(), 'binary').toString('base64') - obj.push({ - width: img.getSize().width, - height: img.getSize().height, - imgUrl + tray.on('drag-enter', () => { + if (systemPreferences.isDarkMode()) { + tray!.setImage(`${__static}/upload-dark.png`) + } else { + tray!.setImage(`${__static}/upload.png`) + } + }) + + tray.on('drag-end', () => { + tray!.setImage(`${__static}/menubar.png`) + }) + + tray.on('drop-files', async (event: Event, files: string[]) => { + const pasteStyle = db.get('settings.pasteStyle') || 'markdown' + const trayWindow = windowManager.get(IWindowList.TRAY_WINDOW)! + const imgs = await uploader + .setWebContents(trayWindow.webContents) + .upload(files) + if (imgs !== false) { + const pasteText: string[] = [] + for (let i = 0; i < imgs.length; i++) { + pasteText.push(pasteTemplate(pasteStyle, imgs[i])) + const notification = new Notification({ + title: '上传成功', + body: imgs[i].imgUrl!, + icon: files[i] }) + setTimeout(() => { + notification.show() + }, i * 100) + db.insert('uploaded', imgs[i]) } - windowManager.get(IWindowList.TRAY_WINDOW)!.webContents.send('clipboardFiles', obj) - }, 0) - } else { - if (windowManager.has(IWindowList.TRAY_WINDOW)) { - windowManager.get(IWindowList.TRAY_WINDOW)!.hide() + handleCopyUrl(pasteText.join('\n')) + trayWindow.webContents.send('dragFiles', imgs) } - const settingWindow = windowManager.get(IWindowList.SETTING_WINDOW) - settingWindow!.show() - settingWindow!.focus() - if (windowManager.has(IWindowList.MINI_WINDOW)) { - windowManager.get(IWindowList.MINI_WINDOW)!.hide() - } - } - }) - - tray.on('drag-enter', () => { - if (systemPreferences.isDarkMode()) { - tray!.setImage(`${__static}/upload-dark.png`) - } else { - tray!.setImage(`${__static}/upload.png`) - } - }) - - tray.on('drag-end', () => { - tray!.setImage(`${__static}/menubar.png`) - }) - - tray.on('drop-files', async (event: Event, files: string[]) => { - const pasteStyle = db.get('settings.pasteStyle') || 'markdown' - const trayWindow = windowManager.get(IWindowList.TRAY_WINDOW)! - const imgs = await uploader - .setWebContents(trayWindow.webContents) - .upload(files) - if (imgs !== false) { - const pasteText: string[] = [] - for (let i = 0; i < imgs.length; i++) { - pasteText.push(pasteTemplate(pasteStyle, imgs[i])) - const notification = new Notification({ - title: '上传成功', - body: imgs[i].imgUrl!, - icon: files[i] - }) - setTimeout(() => { - notification.show() - }, i * 100) - db.insert('uploaded', imgs[i]) - } - handleCopyUrl(pasteText.join('\n')) - trayWindow.webContents.send('dragFiles', imgs) - } - }) - // toggleWindow() + }) + // toggleWindow() + } + // click事件在Ubuntu上无法触发，Unity不支持（在Mac和Windows上可以触发） + // 需要使用 setContextMenu 设置菜单 + else if (process.platform === "linux") { + createContextMenu() + tray!.setContextMenu(contextMenu) + } } -export function createMenu () { +export function createMenu() { if (process.env.NODE_ENV !== 'development') { const template = [{ label: 'Edit', @@ -185,7 +244,7 @@ export function createMenu () { { label: 'Quit', accelerator: 'CmdOrCtrl+Q', - click () { + click() { app.quit() } } diff --git a/src/main/lifeCycle/index.ts b/src/main/lifeCycle/index.ts index 7650b6e1..df2b05df 100644 --- a/src/main/lifeCycle/index.ts +++ b/src/main/lifeCycle/index.ts @@ -56,9 +56,7 @@ class LifeCycle { } windowManager.create(IWindowList.TRAY_WINDOW) windowManager.create(IWindowList.SETTING_WINDOW) - if (process.platform === 'darwin' || process.platform === 'win32') { - createTray() - } + createTray() db.set('needReload', false) updateChecker() // 不需要阻塞 diff --git a/src/renderer/layouts/Main.vue b/src/renderer/layouts/Main.vue index e75cb936..3a839d9b 100644 --- a/src/renderer/layouts/Main.vue +++ b/src/renderer/layouts/Main.vue @@ -271,7 +271,11 @@ export default class extends Vue { } closeWindow () { const window = BrowserWindow.getFocusedWindow() - window!.close() + if (process.platform === 'linux') { + window!.hide() + } else { + window!.close() + } } buildMenu () { const _this = this