diff --git a/README.md b/README.md index df614ecd..c62f3294 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ PicGo目前支持了`微博图床`，`七牛图床`，`腾讯云COS v4版本`， 支持macOS、windows 64位（v1.3.0以上）系统，未来将支持linux。 -支持快捷键`command+shift+p`（macOS）或者`control+shift+p`（windows）用以支持快捷上传剪贴板里的图片（第一张）。 +支持快捷键`command+shift+p`（macOS）或者`control+shift+p`（windows）用以支持快捷上传剪贴板里的图片（第一张）。PicGo v1.4.0版本及以上支持自定义快捷键啦，使用方法见[配置手册](https://github.com/Molunerfinn/PicGo/wiki/%E8%AF%A6%E7%BB%86%E7%AA%97%E5%8F%A3%E7%9A%84%E4%BD%BF%E7%94%A8#%E8%87%AA%E5%AE%9A%E4%B9%89%E5%BF%AB%E6%8D%B7%E9%94%AE)。 点击此处下载[应用](https://github.com/Molunerfinn/PicGo/releases)，macOS用户请下载最新版本的`dmg`文件，windows用户请下载最新版本的`exe`文件。**如果是国内用户下载github release文件速度很慢的话，推荐使用[Free Download Manager](http://www.freedownloadmanager.org/download.htm)来下载，速度会快。** diff --git a/src/main/utils/updateChecker.js b/src/main/utils/updateChecker.js index e436ec0e..8b88976c 100644 --- a/src/main/utils/updateChecker.js +++ b/src/main/utils/updateChecker.js @@ -22,7 +22,7 @@ const checkVersion = async () => { type: 'info', title: '发现新版本', buttons: ['Yes', 'No'], - message: '发现新版本，是否去下载最新的版本？', + message: '发现新版本，更新了很多功能，是否去下载最新的版本？', checkboxLabel: '以后不再提醒', checkboxChecked: false }, (res, checkboxChecked) => { diff --git a/src/renderer/App.vue b/src/renderer/App.vue index bab3111e..7a35a11b 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -20,4 +20,8 @@ #app overflow-x hidden user-select none + .el-button-group + width 100% + .el-button + width 50% diff --git a/src/renderer/components/SettingView/Qiniu.vue b/src/renderer/components/SettingView/Qiniu.vue index cca0348d..94707b63 100644 --- a/src/renderer/components/SettingView/Qiniu.vue +++ b/src/renderer/components/SettingView/Qiniu.vue @@ -59,7 +59,10 @@ - 确定 + + 确定 + 设为默认图床 + @@ -122,9 +125,6 @@ export default { line-height 22px padding-bottom 0 color #eee - .el-button - width 100% - border-radius 19px .el-input__inner border-radius 19px .el-radio-group diff --git a/src/renderer/components/SettingView/TcYun.vue b/src/renderer/components/SettingView/TcYun.vue index 0dd1518c..f1f062c7 100644 --- a/src/renderer/components/SettingView/TcYun.vue +++ b/src/renderer/components/SettingView/TcYun.vue @@ -57,7 +57,10 @@ - 确定 + + 确定 + 设为默认图床 + @@ -120,9 +123,6 @@ export default { line-height 22px padding-bottom 0 color #eee - .el-button - width 100% - border-radius 19px .el-input__inner border-radius 19px .el-radio-group diff --git a/src/renderer/components/SettingView/UpYun.vue b/src/renderer/components/SettingView/UpYun.vue index 36e8a421..69cd6867 100644 --- a/src/renderer/components/SettingView/UpYun.vue +++ b/src/renderer/components/SettingView/UpYun.vue @@ -49,7 +49,10 @@ - 确定 + + 确定 + 设为默认图床 + @@ -110,9 +113,6 @@ export default { line-height 22px padding-bottom 0 color #eee - .el-button - width 100% - border-radius 19px .el-input__inner border-radius 19px .el-radio-group diff --git a/src/renderer/components/SettingView/Upload.vue b/src/renderer/components/SettingView/Upload.vue index 7c6503f8..93ecaf74 100644 --- a/src/renderer/components/SettingView/Upload.vue +++ b/src/renderer/components/SettingView/Upload.vue @@ -25,19 +25,27 @@ :status="showError ? 'exception' : ''" >
-
- 链接格式 +
+
+ 链接格式 +
+ + + Markdown + + + + + +
+
+
+ 快捷上传 +
+ 剪贴板图片上传
- - - Markdown - - - - -
@@ -114,6 +122,9 @@ export default { handlePasteStyleChange (val) { this.$db.read().set('picBed.pasteStyle', val) .write() + }, + uploadClipboardFiles () { + this.$electron.ipcRenderer.send('uploadClipboardFilesFromUploadPage') } } } diff --git a/src/renderer/components/SettingView/Weibo.vue b/src/renderer/components/SettingView/Weibo.vue index 564a0f42..7edb40b8 100644 --- a/src/renderer/components/SettingView/Weibo.vue +++ b/src/renderer/components/SettingView/Weibo.vue @@ -51,7 +51,10 @@ - 确定 + + 确定 + 设为默认图床 + @@ -129,8 +132,10 @@ export default { line-height 22px padding-bottom 0 color #eee - .el-button + .el-button-group width 100% + .el-button + width 50% .el-input__inner border-radius 19px .el-radio-group diff --git a/src/renderer/components/mixin.js b/src/renderer/components/mixin.js index 0427f228..295c0096 100644 --- a/src/renderer/components/mixin.js +++ b/src/renderer/components/mixin.js @@ -1,7 +1,13 @@ +import db from '../../datastore' export default { mounted () { this.disableDragEvent() }, + data () { + return { + defaultPicBed: db.read().get('picBed.current').value() + } + }, methods: { disableDragEvent () { window.addEventListener('dragenter', this.disableDrag, false) @@ -15,6 +21,17 @@ export default { e.dataTransfer.effectAllowed = 'none' e.dataTransfer.dropEffect = 'none' } + }, + setDefaultPicBed (type) { + db.read().set('picBed.current', type).write() + this.defaultPicBed = type + this.$electron.ipcRenderer.send('updateDefaultPicBed') + const successNotification = new window.Notification('设置默认图床', { + body: '设置成功' + }) + successNotification.onclick = () => { + return true + } } }, beforeDestroy () {