Skip to content

Commit 35f3546

Browse files
committed
fix: text of hotkey button remains empty after switching language
1 parent 711874f commit 35f3546

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

UIFunc.py

+9-8
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828

2929

3030
os.environ['QT_ENABLE_HIGHDPI_SCALING'] = "1"
31-
if platform.system() == 'Windows':
32-
HOT_KEYS = ['F3', 'F4', 'F5', 'F6', 'F7', 'F8', 'F9', 'F10', 'F11', 'F12',
33-
'XButton1', 'XButton2', 'Middle']
34-
else:
35-
HOT_KEYS = ['F3', 'F4', 'F5', 'F6', 'F7', 'F8', 'F9', 'F10', 'F11', 'F12',
36-
'Middle']
31+
# if platform.system() == 'Windows':
32+
# HOT_KEYS = ['F3', 'F4', 'F5', 'F6', 'F7', 'F8', 'F9', 'F10', 'F11', 'F12',
33+
# 'XButton1', 'XButton2', 'Middle']
34+
# else:
35+
# HOT_KEYS = ['F3', 'F4', 'F5', 'F6', 'F7', 'F8', 'F9', 'F10', 'F11', 'F12',
36+
# 'Middle']
3737

3838
logger.remove()
3939
if sys.stdout is not None:
@@ -250,8 +250,9 @@ def on_record_event(event: ScriptEvent):
250250
self.keys_pool.remove(key_name)
251251
check_hotkeys(key_name)
252252
# 不录制热键
253-
if key_name in HOT_KEYS:
254-
return
253+
for btn in [self.hotkey_start, self.hotkey_record, self.hotkey_stop]:
254+
if key_name in btn.text():
255+
return
255256
# 录制事件
256257
if self.state == State.RECORDING:
257258
if event.event_type == 'EM' and not flag_multiplemonitor:

Util/RunScriptClass.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,12 @@ def run_script_from_objects(self, head_object: JsonObject, attach: List[str] = N
152152
if self.state == State.IDLE:
153153
return False
154154
if attach:
155-
PluginManager.call_group(attach, current_object)
155+
try:
156+
PluginManager.call_group(attach, current_object)
157+
except Exception as e:
158+
logger.error(e)
159+
self.logSignal.emit(f'An error occurred while calling {attach}, please check log file')
160+
self.logSignal.emit(f'调用{attach}时发生错误,请检查程序日志')
156161
current_object = self.run_object(current_object)
157162
return True
158163

0 commit comments

Comments
 (0)