Skip to content

Commit 16c7b01

Browse files
committed
fix: 修复和优化脚本控制台相关问题;
1 parent 4f99026 commit 16c7b01

File tree

13 files changed

+281
-175
lines changed

13 files changed

+281
-175
lines changed

lang/en_US/winghex_en_US.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2965,73 +2965,73 @@
29652965
<context>
29662966
<name>ScriptingConsole</name>
29672967
<message>
2968-
<location filename="../../src/control/scriptingconsole.cpp" line="78"/>
2968+
<location filename="../../src/control/scriptingconsole.cpp" line="79"/>
29692969
<source>ConsoleMutiLine</source>
29702970
<translation>Console - Multi-line Input</translation>
29712971
</message>
29722972
<message>
2973-
<location filename="../../src/control/scriptingconsole.cpp" line="216"/>
2973+
<location filename="../../src/control/scriptingconsole.cpp" line="217"/>
29742974
<source>[Info]</source>
29752975
<translation>[Info]</translation>
29762976
</message>
29772977
<message>
2978-
<location filename="../../src/control/scriptingconsole.cpp" line="227"/>
2978+
<location filename="../../src/control/scriptingconsole.cpp" line="228"/>
29792979
<source>[Warn]</source>
29802980
<translation>[Warn]</translation>
29812981
</message>
29822982
<message>
2983-
<location filename="../../src/control/scriptingconsole.cpp" line="238"/>
2983+
<location filename="../../src/control/scriptingconsole.cpp" line="239"/>
29842984
<source>[Error]</source>
29852985
<translation>[Error]</translation>
29862986
</message>
29872987
<message>
2988-
<location filename="../../src/control/scriptingconsole.cpp" line="338"/>
2988+
<location filename="../../src/control/scriptingconsole.cpp" line="339"/>
29892989
<source>InvalidDelCmd</source>
29902990
<translation>Invalid delete command</translation>
29912991
</message>
29922992
<message>
2993-
<location filename="../../src/control/scriptingconsole.cpp" line="353"/>
2993+
<location filename="../../src/control/scriptingconsole.cpp" line="354"/>
29942994
<source>NotFoundIgnore:</source>
29952995
<translation>Variable not found, ignored:</translation>
29962996
</message>
29972997
<message>
2998-
<location filename="../../src/control/scriptingconsole.cpp" line="422"/>
2998+
<location filename="../../src/control/scriptingconsole.cpp" line="423"/>
29992999
<source>[Console]</source>
30003000
<translation>[Console]</translation>
30013001
</message>
30023002
<message>
3003-
<location filename="../../src/control/scriptingconsole.cpp" line="641"/>
3003+
<location filename="../../src/control/scriptingconsole.cpp" line="670"/>
30043004
<source>MultiCodeCanNotUndo</source>
30053005
<translation>Multiple lines of code cannot be modified after pasting.</translation>
30063006
</message>
30073007
<message>
3008-
<location filename="../../src/control/scriptingconsole.cpp" line="845"/>
3008+
<location filename="../../src/control/scriptingconsole.cpp" line="875"/>
30093009
<source>Copy</source>
30103010
<translation>Copy</translation>
30113011
</message>
30123012
<message>
3013-
<location filename="../../src/control/scriptingconsole.cpp" line="848"/>
3013+
<location filename="../../src/control/scriptingconsole.cpp" line="878"/>
30143014
<source>Cut</source>
30153015
<translation>Cut</translation>
30163016
</message>
30173017
<message>
3018-
<location filename="../../src/control/scriptingconsole.cpp" line="853"/>
3018+
<location filename="../../src/control/scriptingconsole.cpp" line="883"/>
30193019
<source>Paste</source>
30203020
<translation>Paste</translation>
30213021
</message>
30223022
<message>
3023-
<location filename="../../src/control/scriptingconsole.cpp" line="858"/>
3024-
<location filename="../../src/control/scriptingconsole.cpp" line="879"/>
3023+
<location filename="../../src/control/scriptingconsole.cpp" line="888"/>
3024+
<location filename="../../src/control/scriptingconsole.cpp" line="909"/>
30253025
<source>Clear</source>
30263026
<translation>Clear</translation>
30273027
</message>
30283028
<message>
3029-
<location filename="../../src/control/scriptingconsole.cpp" line="864"/>
3029+
<location filename="../../src/control/scriptingconsole.cpp" line="894"/>
30303030
<source>MutiConsole</source>
30313031
<translation>Multi-line Console</translation>
30323032
</message>
30333033
<message>
3034-
<location filename="../../src/control/scriptingconsole.cpp" line="872"/>
3034+
<location filename="../../src/control/scriptingconsole.cpp" line="902"/>
30353035
<source>AbortScript</source>
30363036
<translation>Terminate script</translation>
30373037
</message>
@@ -3793,18 +3793,18 @@
37933793
<translation>A internal plugin that provides AngelScript scripts with the ability to call the host API.</translation>
37943794
</message>
37953795
<message>
3796-
<location filename="../../src/class/wingangelapi.cpp" line="1312"/>
3796+
<location filename="../../src/class/wingangelapi.cpp" line="1238"/>
37973797
<source>NotSupportedQMetaType:</source>
37983798
<translation>Unsupported QT metadata types:</translation>
37993799
</message>
38003800
<message>
3801-
<location filename="../../src/class/wingangelapi.cpp" line="1769"/>
3802-
<location filename="../../src/class/wingangelapi.cpp" line="1853"/>
3801+
<location filename="../../src/class/wingangelapi.cpp" line="1695"/>
3802+
<location filename="../../src/class/wingangelapi.cpp" line="1779"/>
38033803
<source>Get Exception While ScriptCall: (%1) %2</source>
38043804
<translation>Get Exception While ScriptCall: (%1) %2</translation>
38053805
</message>
38063806
<message>
3807-
<location filename="../../src/class/wingangelapi.cpp" line="1795"/>
3807+
<location filename="../../src/class/wingangelapi.cpp" line="1721"/>
38083808
<source>InvalidRetType: need </source>
38093809
<translation>Invalid return value: Required </translation>
38103810
</message>

lang/zh_CN/winghex_zh_CN.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2965,73 +2965,73 @@
29652965
<context>
29662966
<name>ScriptingConsole</name>
29672967
<message>
2968-
<location filename="../../src/control/scriptingconsole.cpp" line="78"/>
2968+
<location filename="../../src/control/scriptingconsole.cpp" line="79"/>
29692969
<source>ConsoleMutiLine</source>
29702970
<translation>控制台-多行输入</translation>
29712971
</message>
29722972
<message>
2973-
<location filename="../../src/control/scriptingconsole.cpp" line="216"/>
2973+
<location filename="../../src/control/scriptingconsole.cpp" line="217"/>
29742974
<source>[Info]</source>
29752975
<translation>【信息】</translation>
29762976
</message>
29772977
<message>
2978-
<location filename="../../src/control/scriptingconsole.cpp" line="227"/>
2978+
<location filename="../../src/control/scriptingconsole.cpp" line="228"/>
29792979
<source>[Warn]</source>
29802980
<translation>【警告】</translation>
29812981
</message>
29822982
<message>
2983-
<location filename="../../src/control/scriptingconsole.cpp" line="238"/>
2983+
<location filename="../../src/control/scriptingconsole.cpp" line="239"/>
29842984
<source>[Error]</source>
29852985
<translation>【错误】</translation>
29862986
</message>
29872987
<message>
2988-
<location filename="../../src/control/scriptingconsole.cpp" line="338"/>
2988+
<location filename="../../src/control/scriptingconsole.cpp" line="339"/>
29892989
<source>InvalidDelCmd</source>
29902990
<translation>无效删除指令</translation>
29912991
</message>
29922992
<message>
2993-
<location filename="../../src/control/scriptingconsole.cpp" line="353"/>
2993+
<location filename="../../src/control/scriptingconsole.cpp" line="354"/>
29942994
<source>NotFoundIgnore:</source>
29952995
<translation>变量未找到,忽略:</translation>
29962996
</message>
29972997
<message>
2998-
<location filename="../../src/control/scriptingconsole.cpp" line="422"/>
2998+
<location filename="../../src/control/scriptingconsole.cpp" line="423"/>
29992999
<source>[Console]</source>
30003000
<translation>【控制台】</translation>
30013001
</message>
30023002
<message>
3003-
<location filename="../../src/control/scriptingconsole.cpp" line="641"/>
3003+
<location filename="../../src/control/scriptingconsole.cpp" line="670"/>
30043004
<source>MultiCodeCanNotUndo</source>
30053005
<translation>多行代码粘贴后将不能修改</translation>
30063006
</message>
30073007
<message>
3008-
<location filename="../../src/control/scriptingconsole.cpp" line="845"/>
3008+
<location filename="../../src/control/scriptingconsole.cpp" line="875"/>
30093009
<source>Copy</source>
30103010
<translation>复制</translation>
30113011
</message>
30123012
<message>
3013-
<location filename="../../src/control/scriptingconsole.cpp" line="848"/>
3013+
<location filename="../../src/control/scriptingconsole.cpp" line="878"/>
30143014
<source>Cut</source>
30153015
<translation>剪切</translation>
30163016
</message>
30173017
<message>
3018-
<location filename="../../src/control/scriptingconsole.cpp" line="853"/>
3018+
<location filename="../../src/control/scriptingconsole.cpp" line="883"/>
30193019
<source>Paste</source>
30203020
<translation>粘贴</translation>
30213021
</message>
30223022
<message>
3023-
<location filename="../../src/control/scriptingconsole.cpp" line="858"/>
3024-
<location filename="../../src/control/scriptingconsole.cpp" line="879"/>
3023+
<location filename="../../src/control/scriptingconsole.cpp" line="888"/>
3024+
<location filename="../../src/control/scriptingconsole.cpp" line="909"/>
30253025
<source>Clear</source>
30263026
<translation>清空</translation>
30273027
</message>
30283028
<message>
3029-
<location filename="../../src/control/scriptingconsole.cpp" line="864"/>
3029+
<location filename="../../src/control/scriptingconsole.cpp" line="894"/>
30303030
<source>MutiConsole</source>
30313031
<translation>多行控制台</translation>
30323032
</message>
30333033
<message>
3034-
<location filename="../../src/control/scriptingconsole.cpp" line="872"/>
3034+
<location filename="../../src/control/scriptingconsole.cpp" line="902"/>
30353035
<source>AbortScript</source>
30363036
<translation>终止脚本</translation>
30373037
</message>
@@ -3793,18 +3793,18 @@
37933793
<translation>为 AngelScript 脚本提供调用主机 API 能力的内部插件。</translation>
37943794
</message>
37953795
<message>
3796-
<location filename="../../src/class/wingangelapi.cpp" line="1312"/>
3796+
<location filename="../../src/class/wingangelapi.cpp" line="1238"/>
37973797
<source>NotSupportedQMetaType:</source>
37983798
<translation>不支持的 QT 数据元类型:</translation>
37993799
</message>
38003800
<message>
3801-
<location filename="../../src/class/wingangelapi.cpp" line="1769"/>
3802-
<location filename="../../src/class/wingangelapi.cpp" line="1853"/>
3801+
<location filename="../../src/class/wingangelapi.cpp" line="1695"/>
3802+
<location filename="../../src/class/wingangelapi.cpp" line="1779"/>
38033803
<source>Get Exception While ScriptCall: (%1) %2</source>
38043804
<translation>脚本调用发生异常:(%1)%2</translation>
38053805
</message>
38063806
<message>
3807-
<location filename="../../src/class/wingangelapi.cpp" line="1795"/>
3807+
<location filename="../../src/class/wingangelapi.cpp" line="1721"/>
38083808
<source>InvalidRetType: need </source>
38093809
<translation>无效返回值:需要 </translation>
38103810
</message>

lang/zh_TW/winghex_zh_TW.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2965,73 +2965,73 @@
29652965
<context>
29662966
<name>ScriptingConsole</name>
29672967
<message>
2968-
<location filename="../../src/control/scriptingconsole.cpp" line="78"/>
2968+
<location filename="../../src/control/scriptingconsole.cpp" line="79"/>
29692969
<source>ConsoleMutiLine</source>
29702970
<translation>控制臺-多行輸入</translation>
29712971
</message>
29722972
<message>
2973-
<location filename="../../src/control/scriptingconsole.cpp" line="216"/>
2973+
<location filename="../../src/control/scriptingconsole.cpp" line="217"/>
29742974
<source>[Info]</source>
29752975
<translation>【資訊】</translation>
29762976
</message>
29772977
<message>
2978-
<location filename="../../src/control/scriptingconsole.cpp" line="227"/>
2978+
<location filename="../../src/control/scriptingconsole.cpp" line="228"/>
29792979
<source>[Warn]</source>
29802980
<translation>【警告】</translation>
29812981
</message>
29822982
<message>
2983-
<location filename="../../src/control/scriptingconsole.cpp" line="238"/>
2983+
<location filename="../../src/control/scriptingconsole.cpp" line="239"/>
29842984
<source>[Error]</source>
29852985
<translation>【錯誤】</translation>
29862986
</message>
29872987
<message>
2988-
<location filename="../../src/control/scriptingconsole.cpp" line="338"/>
2988+
<location filename="../../src/control/scriptingconsole.cpp" line="339"/>
29892989
<source>InvalidDelCmd</source>
29902990
<translation>無效刪除指令</translation>
29912991
</message>
29922992
<message>
2993-
<location filename="../../src/control/scriptingconsole.cpp" line="353"/>
2993+
<location filename="../../src/control/scriptingconsole.cpp" line="354"/>
29942994
<source>NotFoundIgnore:</source>
29952995
<translation>變數未找到,忽略:</translation>
29962996
</message>
29972997
<message>
2998-
<location filename="../../src/control/scriptingconsole.cpp" line="422"/>
2998+
<location filename="../../src/control/scriptingconsole.cpp" line="423"/>
29992999
<source>[Console]</source>
30003000
<translation>【控制臺】</translation>
30013001
</message>
30023002
<message>
3003-
<location filename="../../src/control/scriptingconsole.cpp" line="641"/>
3003+
<location filename="../../src/control/scriptingconsole.cpp" line="670"/>
30043004
<source>MultiCodeCanNotUndo</source>
30053005
<translation>多行代碼粘貼後將不能修改</translation>
30063006
</message>
30073007
<message>
3008-
<location filename="../../src/control/scriptingconsole.cpp" line="845"/>
3008+
<location filename="../../src/control/scriptingconsole.cpp" line="875"/>
30093009
<source>Copy</source>
30103010
<translation>複製</translation>
30113011
</message>
30123012
<message>
3013-
<location filename="../../src/control/scriptingconsole.cpp" line="848"/>
3013+
<location filename="../../src/control/scriptingconsole.cpp" line="878"/>
30143014
<source>Cut</source>
30153015
<translation>剪切</translation>
30163016
</message>
30173017
<message>
3018-
<location filename="../../src/control/scriptingconsole.cpp" line="853"/>
3018+
<location filename="../../src/control/scriptingconsole.cpp" line="883"/>
30193019
<source>Paste</source>
30203020
<translation>粘貼</translation>
30213021
</message>
30223022
<message>
3023-
<location filename="../../src/control/scriptingconsole.cpp" line="858"/>
3024-
<location filename="../../src/control/scriptingconsole.cpp" line="879"/>
3023+
<location filename="../../src/control/scriptingconsole.cpp" line="888"/>
3024+
<location filename="../../src/control/scriptingconsole.cpp" line="909"/>
30253025
<source>Clear</source>
30263026
<translation>清空</translation>
30273027
</message>
30283028
<message>
3029-
<location filename="../../src/control/scriptingconsole.cpp" line="864"/>
3029+
<location filename="../../src/control/scriptingconsole.cpp" line="894"/>
30303030
<source>MutiConsole</source>
30313031
<translation>多行控制臺</translation>
30323032
</message>
30333033
<message>
3034-
<location filename="../../src/control/scriptingconsole.cpp" line="872"/>
3034+
<location filename="../../src/control/scriptingconsole.cpp" line="902"/>
30353035
<source>AbortScript</source>
30363036
<translation>終止腳本</translation>
30373037
</message>
@@ -3793,18 +3793,18 @@
37933793
<translation>為 AngelScript 腳本提供調用主機 API 能力的內部插件。</translation>
37943794
</message>
37953795
<message>
3796-
<location filename="../../src/class/wingangelapi.cpp" line="1312"/>
3796+
<location filename="../../src/class/wingangelapi.cpp" line="1238"/>
37973797
<source>NotSupportedQMetaType:</source>
37983798
<translation>不支持的 QT 數據元類型:</translation>
37993799
</message>
38003800
<message>
3801-
<location filename="../../src/class/wingangelapi.cpp" line="1769"/>
3802-
<location filename="../../src/class/wingangelapi.cpp" line="1853"/>
3801+
<location filename="../../src/class/wingangelapi.cpp" line="1695"/>
3802+
<location filename="../../src/class/wingangelapi.cpp" line="1779"/>
38033803
<source>Get Exception While ScriptCall: (%1) %2</source>
38043804
<translation>腳本調用發生異常:(%1)%2</translation>
38053805
</message>
38063806
<message>
3807-
<location filename="../../src/class/wingangelapi.cpp" line="1795"/>
3807+
<location filename="../../src/class/wingangelapi.cpp" line="1721"/>
38083808
<source>InvalidRetType: need </source>
38093809
<translation>無效返回值:需要 </translation>
38103810
</message>

src/class/ascompletion.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "class/angellsp.h"
2121
#include "model/codecompletionmodel.h"
2222
#include "wingcodeedit.h"
23-
#include "wingsyntaxhighlighter.h"
2423

2524
#include <KSyntaxHighlighting/Format>
2625

0 commit comments

Comments
 (0)