diff --git a/src/main/index.js b/src/main/index.js
index aa96463..dbf3eca 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -27,6 +27,7 @@ import {
updateShortKeyFromVersion212
} from './migrate/shortKeyUpdateHelper'
import {
+ shortKeyUpdater,
initShortKeyRegister
} from './utils/shortKeyRegister'
if (process.platform === 'darwin') {
@@ -451,13 +452,8 @@ ipcMain.on('uploadChoosedFiles', async (evt, files) => {
return uploadChoosedFiles(evt.sender, files)
})
-ipcMain.on('updateShortKey', (evt, oldKey) => {
- globalShortcut.unregisterAll()
- for (let key in oldKey) {
- globalShortcut.register(db.read().get('settings.shortKey').value()[key], () => {
- return shortKeyHash[key]()
- })
- }
+ipcMain.on('updateShortKey', (evt, item) => {
+ shortKeyUpdater(globalShortcut, item)
const notification = new Notification({
title: '操作成功',
body: '你的快捷键已经修改成功'
@@ -510,9 +506,13 @@ ipcMain.on('getPicBeds', (evt) => {
evt.returnValue = picBeds
})
-const shortKeyHash = {
- upload: uploadClipboardFiles
-}
+ipcMain.on('updateShortKey', (evt, val) => {
+ // console.log(val)
+})
+
+// const shortKeyHash = {
+// upload: uploadClipboardFiles
+// }
const gotTheLock = app.requestSingleInstanceLock()
diff --git a/src/main/migrate/shortKeyUpdateHelper.js b/src/main/migrate/shortKeyUpdateHelper.js
index 96d294b..fa31508 100644
--- a/src/main/migrate/shortKeyUpdateHelper.js
+++ b/src/main/migrate/shortKeyUpdateHelper.js
@@ -1,17 +1,16 @@
// from v2.1.2
const updateShortKeyFromVersion212 = (db, shortKeyConfig) => {
let needUpgrade = false
- Object.keys(shortKeyConfig).forEach(item => {
- if (typeof shortKeyConfig[item] === 'string') {
- needUpgrade = true
- shortKeyConfig[item] = {
- enable: true,
- key: shortKeyConfig[item],
- name: `picgo:${item}`,
- lable: '快捷上传'
- }
+ if (shortKeyConfig.upload) {
+ needUpgrade = true
+ shortKeyConfig['picgo:upload'] = {
+ enable: true,
+ key: shortKeyConfig.upload,
+ name: 'picgo:upload',
+ label: '快捷上传'
}
- })
+ delete shortKeyConfig.upload
+ }
if (needUpgrade) {
db.read().set('settings.shortKey', shortKeyConfig).write()
return shortKeyConfig
diff --git a/src/main/utils/shortKeyRegister.js b/src/main/utils/shortKeyRegister.js
index 4f3e20c..00819cf 100644
--- a/src/main/utils/shortKeyRegister.js
+++ b/src/main/utils/shortKeyRegister.js
@@ -11,6 +11,16 @@ const shortKeyHandler = (name) => {
}
}
+const shortKeyUpdater = (globalShortcut, item) => {
+ if (item.enable === false) {
+ globalShortcut.unregister(item.key)
+ } else {
+ globalShortcut.register(item.key, () => {
+ shortKeyHandler(item.name)
+ })
+ }
+}
+
// 初始化阶段的注册
const initShortKeyRegister = (globalShortcut, shortKeys) => {
let errorList = []
@@ -28,5 +38,6 @@ const initShortKeyRegister = (globalShortcut, shortKeys) => {
}
export {
+ shortKeyUpdater,
initShortKeyRegister
}
diff --git a/src/renderer/components/ShortKeyForm.vue b/src/renderer/components/ShortKeyForm.vue
new file mode 100644
index 0000000..9a8c758
--- /dev/null
+++ b/src/renderer/components/ShortKeyForm.vue
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
diff --git a/src/renderer/pages/PicGoSetting.vue b/src/renderer/pages/PicGoSetting.vue
index 44bc4cb..2dd970a 100644
--- a/src/renderer/pages/PicGoSetting.vue
+++ b/src/renderer/pages/PicGoSetting.vue
@@ -22,9 +22,9 @@
点击设置
- 点击设置
+ 点击设置
+
+
+ 快捷键设置
+
+
+
+
+
+
+ {{ scope.row.label ? scope.row.label : scope.row.name }}
+
+
+
+
+
+
+
+ {{ scope.row.enable ? '已启用' : '已禁用' }}
+
+
+
+
+
+ {{ calcOrigin(scope.row.name) }}
+
+
+
+
+
+ {{ scope.row.enable ? '禁用' : '启用' }}
+
+
+ 编辑
+
+
+
+
+
+
+