mirror of
https://github.com/yuruotong1/autoMate.git
synced 2026-03-22 13:07:17 +08:00
✨ 添加(ui/autoMate/src/main/shortCut.ts):添加注册搜索快捷键功能
🔨 移除(ui/autoMate/src/main/code/ignoreMouseEvents.ts, ui/autoMate/src/main/code/index.ts, ui/autoMate/src/main/code/ipc.ts, ui/autoMate/src/main/code/shortCut.ts, ui/autoMate/src/main/code/window.ts, ui/autoMate/src/main/config/index.ts, ui/autoMate/src/main/config/window.ts):删除不再使用的文件
This commit is contained in:
@@ -1,6 +0,0 @@
|
|||||||
import { BrowserWindow, IpcMainEvent, ipcMain } from "electron"
|
|
||||||
|
|
||||||
export default (win: BrowserWindow) => {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
import { app } from 'electron'
|
|
||||||
import { createWindow } from './window'
|
|
||||||
import * as ipc from './ipc'
|
|
||||||
import { registerShortCut } from './shortCut'
|
|
||||||
import ignoreMouseEvents from './ignoreMouseEvents'
|
|
||||||
|
|
||||||
|
|
||||||
app.whenReady().then(() => {
|
|
||||||
const win = createWindow()
|
|
||||||
ipc.registerIpc(win)
|
|
||||||
registerShortCut(win)
|
|
||||||
ignoreMouseEvents(win)
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
import {ipcMain, BrowserWindow} from "electron";
|
|
||||||
import { createConfigWindow } from "../config";
|
|
||||||
export const registerIpc = (win: BrowserWindow)=>{
|
|
||||||
ipcMain.on('hideWindow', () => {
|
|
||||||
win.hide()
|
|
||||||
})
|
|
||||||
|
|
||||||
ipcMain.on('openConfigWindow', () => {
|
|
||||||
createConfigWindow()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
import { BrowserWindow, IpcMainInvokeEvent } from "electron"
|
|
||||||
import { ipcMain } from "electron"
|
|
||||||
const { app, globalShortcut } = require('electron')
|
|
||||||
|
|
||||||
const config = {
|
|
||||||
search: ""
|
|
||||||
}
|
|
||||||
export const registerShortCut = (win: BrowserWindow) => {
|
|
||||||
|
|
||||||
ipcMain.handle("shortCut", (_event: IpcMainInvokeEvent, type: 'search', shortCut: string) => {
|
|
||||||
// react 严格模式会执行两次,可能会导致快捷键重复注册,这里在注册前会删除旧快捷键,也用户注册过快捷键想修改成其他快捷键
|
|
||||||
if (config.search) globalShortcut.unregister(config.search)
|
|
||||||
config.search = shortCut
|
|
||||||
switch(type){
|
|
||||||
case 'search':
|
|
||||||
return registerSearchShortCut(shortCut, win)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function registerSearchShortCut(shortCut: string, win: BrowserWindow){
|
|
||||||
const res = globalShortcut.register(shortCut, () => {
|
|
||||||
win.isVisible() ? win.hide() : win.show()
|
|
||||||
})
|
|
||||||
return res
|
|
||||||
}
|
|
||||||
app.on('will-quit', () => {
|
|
||||||
// Unregister all shortcuts.
|
|
||||||
globalShortcut.unregisterAll()
|
|
||||||
})
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
|
|
||||||
import { BrowserWindow, shell } from 'electron'
|
|
||||||
import { is } from '@electron-toolkit/utils'
|
|
||||||
import icon from '../../../resources/icon.png?asset'
|
|
||||||
import { join } from 'path'
|
|
||||||
|
|
||||||
export function createWindow(): BrowserWindow { // Create the browser window.
|
|
||||||
const win = new BrowserWindow({
|
|
||||||
width: 500,
|
|
||||||
height: 350,
|
|
||||||
center: true,
|
|
||||||
show: false,
|
|
||||||
frame: false,
|
|
||||||
transparent: true,
|
|
||||||
// alwaysOnTop: true,
|
|
||||||
autoHideMenuBar: true,
|
|
||||||
...(process.platform === 'linux' ? { icon } : {}),
|
|
||||||
webPreferences: {
|
|
||||||
preload: join(__dirname, '../preload/index.js'),
|
|
||||||
sandbox: false
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
win.webContents.openDevTools()
|
|
||||||
win.on('ready-to-show', () => {
|
|
||||||
win.show()
|
|
||||||
})
|
|
||||||
|
|
||||||
win.webContents.setWindowOpenHandler((details) => {
|
|
||||||
shell.openExternal(details.url)
|
|
||||||
return { action: 'deny' }
|
|
||||||
})
|
|
||||||
|
|
||||||
// HMR for renderer base on electron-vite cli.
|
|
||||||
// Load the remote URL for development or the local html file for production.
|
|
||||||
if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
|
|
||||||
win.loadURL(process.env['ELECTRON_RENDERER_URL'])
|
|
||||||
} else {
|
|
||||||
win.loadFile(join(__dirname, '../renderer/index.html'))
|
|
||||||
}
|
|
||||||
|
|
||||||
return win
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
import { BrowserWindow } from "electron"
|
|
||||||
import { createWindow } from "./window"
|
|
||||||
let win = null as null|BrowserWindow
|
|
||||||
const createConfigWindow=()=>{
|
|
||||||
// 解决重复创建窗口
|
|
||||||
if(!win) win = createWindow()
|
|
||||||
// 窗口关闭时,将win置为null,可再次打开
|
|
||||||
win.on("closed", ()=>{
|
|
||||||
win = null
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export { createConfigWindow }
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
|
|
||||||
import { BrowserWindow, shell } from 'electron'
|
|
||||||
import { is } from '@electron-toolkit/utils'
|
|
||||||
import icon from '../../../resources/icon.png?asset'
|
|
||||||
import { join } from 'path'
|
|
||||||
import url from 'node:url'
|
|
||||||
|
|
||||||
export function createWindow(): BrowserWindow { // Create the browser window.
|
|
||||||
const win = new BrowserWindow({
|
|
||||||
width: 1250,
|
|
||||||
height: 750,
|
|
||||||
center: true,
|
|
||||||
show: false,
|
|
||||||
frame: true,
|
|
||||||
transparent: false,
|
|
||||||
// alwaysOnTop: true,
|
|
||||||
autoHideMenuBar: true,
|
|
||||||
...(process.platform === 'linux' ? { icon } : {}),
|
|
||||||
webPreferences: {
|
|
||||||
preload: join(__dirname, '../preload/index.js'),
|
|
||||||
sandbox: false
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
win.webContents.openDevTools()
|
|
||||||
win.on('ready-to-show', () => {
|
|
||||||
win.show()
|
|
||||||
})
|
|
||||||
|
|
||||||
win.webContents.setWindowOpenHandler((details) => {
|
|
||||||
shell.openExternal(details.url)
|
|
||||||
return { action: 'deny' }
|
|
||||||
})
|
|
||||||
|
|
||||||
// HMR for renderer base on electron-vite cli.
|
|
||||||
// Load the remote URL for development or the local html file for production.
|
|
||||||
if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
|
|
||||||
// win.loadURL(process.env['ELECTRON_RENDERER_URL'] + "/#config/category/contentList")
|
|
||||||
win.loadURL(process.env['ELECTRON_RENDERER_URL'] + "/#config/category/contentList")
|
|
||||||
} else {
|
|
||||||
win.loadURL(
|
|
||||||
url.format({
|
|
||||||
pathname: join(__dirname, '../renderer/index.html'),
|
|
||||||
protocol: 'file',
|
|
||||||
slashes: true,
|
|
||||||
hash: 'config/category/contentList'
|
|
||||||
})
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
return win
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
import { app, ipcMain } from 'electron'
|
import { app, ipcMain } from 'electron'
|
||||||
import { electronApp, optimizer } from '@electron-toolkit/utils'
|
import { electronApp, optimizer } from '@electron-toolkit/utils'
|
||||||
// import "./code"
|
|
||||||
import "./db"
|
import "./db"
|
||||||
import "./windows"
|
import "./windows"
|
||||||
import "./ipc"
|
import "./ipc"
|
||||||
|
import "./shortCut"
|
||||||
|
|
||||||
// This method will be called when Electron has finished
|
// This method will be called when Electron has finished
|
||||||
// initialization and is ready to create browser windows.
|
// initialization and is ready to create browser windows.
|
||||||
|
|||||||
31
ui/autoMate/src/main/shortCut.ts
Normal file
31
ui/autoMate/src/main/shortCut.ts
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
import { BrowserWindow, IpcMainInvokeEvent } from "electron"
|
||||||
|
import { ipcMain } from "electron"
|
||||||
|
import { getWindowByName } from "./windows"
|
||||||
|
const { app, globalShortcut } = require('electron')
|
||||||
|
|
||||||
|
const config = {
|
||||||
|
search: ""
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
ipcMain.handle("shortCut", (_event: IpcMainInvokeEvent, type: 'search', shortCut: string) => {
|
||||||
|
// react 严格模式会执行两次,可能会导致快捷键重复注册,这里在注册前会删除旧快捷键,也用户注册过快捷键想修改成其他快捷键
|
||||||
|
if (config.search) globalShortcut.unregister(config.search)
|
||||||
|
config.search = shortCut
|
||||||
|
switch(type){
|
||||||
|
case 'search':
|
||||||
|
return registerSearchShortCut(getWindowByName('search'), shortCut)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
function registerSearchShortCut(win: BrowserWindow, shortCut: string){
|
||||||
|
const res = globalShortcut.register(shortCut, () => {
|
||||||
|
win.isVisible() ? win.hide() : win.show()
|
||||||
|
})
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
app.on('will-quit', () => {
|
||||||
|
// Unregister all shortcuts.
|
||||||
|
globalShortcut.unregisterAll()
|
||||||
|
})
|
||||||
Reference in New Issue
Block a user