yexuejc007/rubick
1
0
Fork 0
mirror of https://github.com/rubickCenter/rubick synced 2025-12-24 19:39:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:clouDr-f2e/rubick into dev-tcsnzh

Browse Source
This commit is contained in:
tcsnzh
2021-10-02 11:27:23 +08:00
parent f9559ac1b0 80476aadf7
commit ef6ac06c40
9 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/common/monitor.js
View File

@@ -104,18 +104,10 @@ const touchBar = new TouchBar({
]
})
let intervalObj;
const start = (window) => {
window.on('blur', () => {
clearInterval(intervalObj);
});
window.on('focus', () => {
intervalObj = setInterval(() => {
updateData();
}, 1000);
updateData();
});
updateData();
}
export default {

2
src/renderer/assets/common/win-app.js
View File

@@ -47,7 +47,7 @@ function fileDisplay(filePath){
const appName = filename.split('.')[0];
const keyWords = [appName];
const appDetail = shell.readShortcutLink(filedir);
if (!appDetail.target) return;
if (!appDetail.target || appDetail.target.toLowerCase().indexOf('unin') >= 0) return;
if (isZhRegex.test(appName)) {
const py = translate(appName);

10
src/renderer/pages/search/subpages/settings.vue
View File

@@ -18,15 +18,15 @@
<div class="title">快捷键(需要使用 option/ctrl/shift/command 键修饰)</div>
<div class="settings-item-li">
<div class="label">显示/隐藏快捷键</div>
<div class="value" tabIndex=-1 @keydown="(e) => changeShortCut(e, 'showAndHidden')">{{ config.perf.shortCut.showAndHidden }}</div>
<div class="value" tabIndex=-1 @keyup="(e) => changeShortCut(e, 'showAndHidden')">{{ config.perf.shortCut.showAndHidden }}</div>
</div>
<div class="settings-item-li">
<div class="label">插件分离快捷键</div>
<div class="value" tabIndex=-1 @keydown="(e) => changeShortCut(e, 'separate')">{{ config.perf.shortCut.separate }}</div>
<div class="value" tabIndex=-1 @keyup="(e) => changeShortCut(e, 'separate')">{{ config.perf.shortCut.separate }}</div>
</div>
<div class="settings-item-li">
<div class="label">返回主界面</div>
<div class="value" tabIndex=-1 @keydown="(e) => changeShortCut(e, 'quit')">{{ config.perf.shortCut.quit }}</div>
<div class="value" tabIndex=-1 @keyup="(e) => changeShortCut(e, 'quit')">{{ config.perf.shortCut.quit }}</div>
</div>
</div>
<div class="setting-item">
@@ -88,7 +88,7 @@
v-for="(item, index) in config.global"
class="value"
tabIndex=-1
@keydown="(e) => changeGlobalKey(e, index)"
@keyup="(e) => changeGlobalKey(e, index)"
>
{{ item.key }}
</div>
@@ -171,7 +171,7 @@ export default {
changeGlobalKey(e, index) {
let compose;
if(e.altKey && e.keyCode !== 18){
compose = `Option+${keycodes[e.keyCode].toUpperCase()}`;
compose = `Alt+${keycodes[e.keyCode].toUpperCase()}`;
}
if(e.ctrlKey && e.keyCode !== 17){
compose = `Ctrl+${keycodes[e.keyCode].toUpperCase()}`;