diff --git a/NEWS.md b/NEWS.md
index e0da6500..d764ba96 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,6 +2,7 @@ Red Panda C++ Version 1.1.1
- enhancement: adjust the appearance of problem case's input/output/expected control
- change: swap position of problem case's output and expected input controls
- enhancement: when problem case panel is positioned at right, problem case's input, output and expected controls is layouted vertically
+ - enhancement: add ignore spaces checkbox in problem cases panel
Red Panda C++ Version 1.1.0
- enhancement: when ctrl+mouse cursor hovered an identifier or header name, use underline to highlight it
diff --git a/RedPandaIDE/RedPandaIDE_pt.ts b/RedPandaIDE/RedPandaIDE_pt.ts
index 8a3b19a4..0a3b7ad1 100644
--- a/RedPandaIDE/RedPandaIDE_pt.ts
+++ b/RedPandaIDE/RedPandaIDE_pt.ts
@@ -4424,10 +4424,6 @@
Choose Expected Output Data File
-
- Line %1
-
-
Batch Set Cases
@@ -4492,6 +4488,10 @@
Rename
+
+ Ignore Spaces
+
+
NewClassDialog
diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.ts b/RedPandaIDE/RedPandaIDE_zh_CN.ts
index 77fd36be..f0afcd5e 100644
--- a/RedPandaIDE/RedPandaIDE_zh_CN.ts
+++ b/RedPandaIDE/RedPandaIDE_zh_CN.ts
@@ -1335,17 +1335,17 @@ Are you really want to continue?
找不到astyle程序"%1".
-
+
Break point condition
断点条件
-
+
Enter the condition of the breakpoint:
输入当前断点的生效条件:
-
+
Readonly
只读
@@ -2276,27 +2276,27 @@ Are you really want to continue?
EnvironmentShortcutModel
-
+
action
动作
-
+
Error
错误
-
+
Shortcut "%1" is used by "%2".
快捷键“%1”已经被“%2”使用了。
-
+
Function
功能
-
+
Shortcut
快捷键
@@ -3830,18 +3830,18 @@ Are you really want to continue?
MainWindow
-
+
Red Panda C++
小熊猫C++
-
-
-
-
-
-
+
+
+
+
+
+
Issues
编译器
@@ -3860,8 +3860,8 @@ Are you really want to continue?
工具
-
-
+
+
Run
运行
@@ -3873,25 +3873,25 @@ Are you really want to continue?
-
+
Project
项目
-
+
Watch
监视
-
+
Structure
结构
-
+
Files
文件
@@ -3902,9 +3902,9 @@ Are you really want to continue?
-
-
-
+
+
+
Debug
调试
@@ -3915,7 +3915,7 @@ Are you really want to continue?
-
+
Debug Console
调试主控台
@@ -3937,7 +3937,7 @@ Are you really want to continue?
-
+
Search
查找
@@ -3962,7 +3962,7 @@ Are you really want to continue?
替换
-
+
Close
关闭
@@ -3996,78 +3996,78 @@ Are you really want to continue?
新建
-
+
Ctrl+N
Ctrl+N
-
+
Open...
打开...
-
+
Ctrl+O
Ctrl+O
-
+
Save
保存
-
+
Ctrl+S
Ctrl+S
-
+
Save As...
另存为...
-
+
Save As
另存为
-
+
Save All
全部保存
-
+
Ctrl+Shift+S
Ctrl+Shift+S
-
+
Options
选项
-
-
-
-
+
+
+
+
Compile
编译
-
+
Tools Output
工具输出
-
-
+
+
Choose Input File
选择输入文件
-
+
...
...
@@ -4082,199 +4082,199 @@ Are you really want to continue?
Git
-
+
F9
F9
-
+
F10
F10
-
+
Undo
恢复
-
+
Ctrl+Z
Ctrl+Z
-
+
Redo
重做
-
+
Ctrl+Y
Ctrl+Y
-
+
Cut
剪切
-
+
Ctrl+X
Ctrl+X
-
-
+
-
+
+
Copy
复制
-
+
Ctrl+C
Ctrl+C
-
-
+
+
Paste
粘贴
-
+
Ctrl+V
Ctrl+V
-
-
-
+
+
+
Select All
选择全部
-
+
Ctrl+A
Ctrl+A
-
+
Indent
缩进
-
+
UnIndent
取消缩进
-
+
Toggle Comment
切换注释
-
+
Ctrl+/
Ctrl+/
-
+
Collapse All
全部收起
-
+
Uncollapse All
全部展开
-
+
Encode in ANSI
使用ANSI编码
-
+
Encode in UTF-8
使用UTF-8编码
-
+
Auto Detect
自动检测
-
+
Convert to ANSI
转换为ANSI编码
-
+
Convert to UTF-8
转换为UTF-8编码
-
-
+
+
Compile & Run
编译运行
-
+
F11
F11
-
-
+
+
Rebuild All
全部重编译
-
+
F12
F12
-
+
Stop Execution
停止执行
-
+
F6
F6
-
+
F5
F5
-
+
Step Over
单步跳过
-
+
F7
F7
-
+
Step Into
单步进入
-
+
Problem Set
试题集
-
+
New Problem Set
新建试题集
@@ -4293,14 +4293,14 @@ Are you really want to continue?
-
+
Save Problem Set
保存试题集
-
+
Load Problem Set
载入试题集
@@ -4322,20 +4322,20 @@ Are you really want to continue?
-
+
TODO
TODO
-
+
Bookmark
书签
-
+
Problem
试题
@@ -4361,7 +4361,7 @@ Are you really want to continue?
-
+
Run All Cases
Run Current Case
运行所有案例
@@ -4377,17 +4377,17 @@ Are you really want to continue?
%v/%m
-
+
Output
输出
-
+
Input
输入
-
+
Expected
期望输出
@@ -4431,553 +4431,558 @@ Are you really want to continue?
消息
-
+ Ignore Spaces
+ 忽略空格
+
+
+
+
New Source File
新建源代码文件
-
+
Tab
Tab
-
+
Shift+Tab
Shift+Tab
-
+
F8
F8
-
+
Step Out
单步跳出
-
+
Ctrl+F8
Ctrl+F8
-
+
Run To Cursor
执行到光标处
-
+
Ctrl+F5
Ctrl+F5
-
+
Continue
继续执行
-
+
F4
F4
-
+
Add Watch...
添加监视
-
+
View CPU Window...
打开CPU信息窗口...
-
+
Exit
退出
-
+
Find...
查找...
-
+
Ctrl+F
Ctrl+F
-
+
Find in Files...
在文件中查找...
-
+
Ctrl+Shift+F
Ctrl+Shift+F
-
+
Replace...
替换
-
+
Ctrl+R
Ctrl+R
-
+
Find Next
查找下一个
-
+
F3
F3
-
+
Find Previous
查找前一个
-
+
Shift+F3
Shift+F3
-
+
Remove Watch
删除监视值
-
+
Remove All Watches
Remove All
删除全部监视值
-
+
Modify Watch...
修改监视值
-
+
Reformat Code
对代码重新排版
-
+
Ctrl+Shift+A
Ctrl+Shift+A
-
+
Go back
前一次编辑位置
-
+
Ctrl+Alt+Left
Ctrl+Alt+Left
-
+
Forward
后一次编辑位置
-
+
Ctrl+Alt+Right
Ctrl+Alt+Right
-
+
Ctrl+W
Ctrl+W
-
+
Close All
全部关闭
-
+
Ctrl+Shift+W
Ctrl+Shift+W
-
+
Maximize Editor
最大化编辑器
-
+
Ctrl+F11
Ctrl+F11
-
+
Next
下一窗口
-
+
Ctrl+Tab
Ctrl+Tab
-
+
Previous
前一窗口
-
+
Ctrl+Shift+Tab
Ctrl+Shift+Tab
-
+
Toggle breakpoint
切换断点
-
+
Ctrl+F4
Ctrl+F4
-
-
+
+
Clear all breakpoints
删除所有断点
-
+
Breakpoint property...
设置断点条件...
-
+
Goto Declaration
跳转到声明处
-
+
Ctrl+Shift+G
Ctrl+Shift+G
-
+
Goto Definition
跳转到定义处
-
+
Ctrl+G
Ctrl+G
-
+
Find references
查找符号的引用
-
+
Open containing folder
打开所在的文件夹
-
+
Ctrl+B
Ctrl+B
-
+
Open a terminal here
打开命令行窗口
-
+
File Properties...
文件属性...
-
+
Close Project
关闭项目
-
+
Project options
项目属性
-
+
New Project...
新建项目...
-
-
+
+
New Project File
新建项目文件
-
+
F1
F1
-
+
Move Selection Up
向上移动选中的行
-
+
Ctrl+Shift+Up
Ctrl+Shift+Up
-
+
Move Selection Down
向下移动选中的行
-
+
Ctrl+Shift+Down
Ctrl+Shift+Down
-
+
Convert to UTF-8 BOM
转换为UTF-8 BOM编码
-
+
Encode in UTF-8 BOM
使用UTF-8 BOM编码
-
+
Compiler Options...
编译器选项...
-
+
Toggle Explorer Panel
切换管理器面板
-
+
Ctrl+F9
Ctrl+F9
-
+
Toggle Messages Panel
切换消息面板
-
+
Ctrl+F10
Ctrl+F10
-
+
New File
新建文件
-
+
Add to project...
添加到项目...
-
+
Remove from project
从项目删除
-
+
View Makefile
查看Makefile
-
+
Clean
清理构建文件
-
+
Open Folder in Explorer
在浏览器中打开
-
+
Open In Terminal
在终端中打开
-
+
About
关于
-
-
+
+
Rename Symbol
重命名符号
-
+
Shift+F6
Shift+F6
-
+
Print...
打印...
-
+
Ctrl+P
Ctrl+P
-
-
+
+
Export As RTF
导出为RTF
-
-
+
+
Export As HTML
导出为HTML
-
+
Move To Other View
移动到其他视图
-
+
Ctrl+M
Ctrl+M
-
-
+
+
C++ Reference
C++参考手册
-
+
C Reference
C参考手册
-
+
Show Tool Panels
显示全部工具面板
-
+
Create Git Repository
Create Repository
创建Git仓库
-
+
Commit
提交(Commit)
-
+
Revert
撤销(Revert)
-
+
Reset
回滚(Reset)
-
+
Add Files
添加文件
-
+
Restore
还原(Restore)
-
+
Website
官方网站
-
+
Branch/Switch
分支切换(Switch)
-
+
Merge
合并(Merge)
-
-
+
+
Show Log
Log
显示日志(Log)
-
+
Remotes...
远程仓库...
-
+
Fetch
取回(Fetch)
-
+
Pull
拉取(Pull)
-
+
Push
推送(Push)
-
+
Hide Non Support Files
隐藏不支持的文件
-
+
Toggle Block Comment
切换块注释
-
+
Alt+Shift+A
Alt+Shift+A
-
+
Match Bracket
匹配当前括号
-
+
Ctrl+]
Ctrl+]
@@ -4986,50 +4991,50 @@ Are you really want to continue?
工具窗口栏
-
+
Status Bar
状态栏
-
+
Ctrl+Backspace
Ctrl+Backspace
-
+
Interrupt
中断
-
-
+
+
Delete To Word Begin
删除到单词开头
-
+
Ctrl+Shift+B
Ctrl+Shift+B
-
+
Delete to Word End
删除到单词结尾
-
+
Ctrl+Shift+E
Ctrl+Shift+E
-
+
New Class...
Add Class...
新建类...
-
-
+
+
New Header...
New Header
新建头文件...
@@ -5039,47 +5044,47 @@ Are you really want to continue?
插入行
-
+
Delete Line
删除当前行
-
+
Ctrl+D
Ctrl+D
-
+
Duplicate Line
复制当前行
-
+
Ctrl+E
Ctrl+E
-
+
Delete Word
删除当前单词
-
+
Ctrl+Shift+D
Ctrl+Shift+D
-
+
Delete to EOL
删除到行尾
-
+
Ctrl+Del
Ctrl+Del
-
+
Delete to BOL
删除到行首
@@ -5088,27 +5093,27 @@ Are you really want to continue?
C/C++参考
-
+
EGE Manual
EGE图形库手册
-
+
Add Bookmark
添加书签
-
+
Remove Bookmark
删除书签
-
+
Modify Bookmark Description
修改书签说明
-
+
Locate in Files View
在文件视图中定位
@@ -5117,12 +5122,12 @@ Are you really want to continue?
打开文件夹
-
+
Running Parameters...
运行参数...
-
+
File Encoding
文件编码
@@ -5132,32 +5137,32 @@ Are you really want to continue?
文件历史
-
-
-
-
-
-
+
+
+
+
+
+
Debugging
正在调试
-
-
-
-
-
+
+
+
+
+
Running
正在运行
-
-
-
-
-
-
+
+
+
+
+
+
Compiling
正在编译
@@ -5166,187 +5171,187 @@ Are you really want to continue?
行:%1 列:%2 已选择:%3 总行数:%4 总长度:%5
-
+
Line:%1 Col:%2 Selected:%3 Lines:%4 Length:%5
Line: %1 Col: %2 Selected: %3 Lines: %4 Length: %5
行: %1 列: %2 已选择 :%3 总行数: %4 总长度: %5
-
+
Read Only
只读
-
+
Insert
插入
-
+
Overwrite
覆写
-
+
Close project
关闭项目
-
+
Are you sure you want to close %1?
你确定要关闭'%1'吗?
-
-
+
+
Confirm
确认
-
-
-
+
+
+
Source file is not compiled.
源文件尚未编译。
-
-
+
+
Compile now?
现在编译?
-
-
+
+
Source file is more recent than executable.
源文件比可执行程序新。
-
+
Recompile now?
重新编译?
-
+
No compiler set
无编译器设置
-
+
No compiler set is configured.
没有配置编译器设置。
-
+
Can't start debugging.
无法启动调试器
-
-
+
+
Enable debugging
启用调试参数
-
-
+
+
You have not enabled debugging info (-g3) and/or stripped it from the executable (-s) in Compiler Options.<BR /><BR />Do you want to correct this now?
当前编译设置中未启用调试选项(-g3),或启用了信息剥除选项(-s)<br /><br/>是否纠正这一问题?
-
+
Project not built
项目尚未构建
-
+
Project hasn't been built. Build it now?
项目尚未构建。是否构建?
-
+
Host applcation missing
宿主程序不存在
-
+
DLL project needs a host application to run.
动态链接库(DLL)需要一个宿主程序来运行。
-
+
But it's missing.
但它不存在。
-
+
Host application not exists
宿主程序不存在
-
+
Host application file '%1' doesn't exist.
宿主程序'%1'不存在。
-
+
Recompile?
重新编译?
-
-
+
+
Save last open info error
保存上次打开信息失败
-
+
Can't remove old last open information file '%1'
无法删除旧上次打开信息文件'%1'
-
+
Can't save last open info file '%1'
无法保存上次打开信息文件'%1'
-
+
Load last open info error
载入上次打开信息失败
-
+
Can't load last open info file '%1'
无法载入上次打开信息文件'%1'
-
+
Open Source File
打开源代码文件
-
-
+
+
Batch Set Cases
批量设置案例
-
+
Show detail debug logs
显示详细调试器日志
-
+
Copy all
全部复制
-
-
-
-
-
-
+
+
+
+
+
+
Clear
清除
@@ -5362,7 +5367,7 @@ Are you really want to continue?
-
+
Problem Set %1
试题集%1
@@ -5383,68 +5388,68 @@ Are you really want to continue?
或者选择使用其他的网络端口。
-
-
+
+
Rebuild Project
重新构建项目
-
-
+
+
Project has been modified, do you want to rebuild it?
项目已经被修改过,是否需要重新构建?
-
+
Auto Save Error
自动保存出错
-
+
Auto save "%1" to "%2" failed:%3
自动保存"%1"到"%2"失败:%3
-
+
Properties...
试题属性...
-
+
Set Problem Set Name
设置试题集名称
-
+
Problem Set Name:
试题集名称:
-
+
Remove
删除
-
+
Remove All Bookmarks
删除全部书签
-
+
Modify Description
修改描述
-
-
-
+
+
+
Bookmark Description
书签描述
-
-
-
+
+
+
Description:
描述:
@@ -5453,178 +5458,178 @@ Are you really want to continue?
在调试主控台中显示调试器输出
-
+
Remove this search
清除这次搜索
-
+
Clear all searches
删除所有搜索
-
+
Breakpoint condition...
断点条件...
-
+
Break point condition
断点条件
-
+
Enter the condition of the breakpoint:
输入当前断点的生效条件:
-
+
Remove All Breakpoints
Remove all breakpoints
删除所有断点
-
+
Remove Breakpoint
删除当前断点
-
+
Rename File
重命名文件
-
-
+
+
Add Folder
添加文件夹
-
+
New folder
新文件夹
-
+
Folder name:
文件夹:
-
+
Rename Folder
重命名
-
+
Run Current Case
运行当前案例
-
+
Remove Folder
删除文件夹
-
+
Switch to normal view
切换为普通视图
-
+
Switch to custom view
切换为自定义视图
-
+
Sort By Type
按类型排序
-
+
Sort alphabetically
按名称排序
-
+
Show inherited members
显示继承的成员
-
+
Goto declaration
跳转到声明处
-
+
Goto definition
跳转到定义处
-
-
+
+
New Folder
新建文件夹
-
+
Rename
重命名
-
-
-
-
+
+
+
+
Delete
删除
-
+
Open in Editor
在编辑器中打开
-
+
Open in External Program
使用外部程序打开
-
+
Open in Terminal
在终端中打开
-
+
Open in Windows Explorer
在Windows浏览器中打开
-
+
Character sets
字符集
-
+
Convert to %1
转换为%1编码
-
+
%1 files autosaved
已自动保存%1个文件
-
+
Set answer to...
设置答案源代码...
-
+
select other file...
选择其他文件...
-
+
Select Answer Source File
选择答案源代码文件
@@ -5634,83 +5639,83 @@ Are you really want to continue?
C/C++源代码文件 (*.c *.cpp *.cc *.cxx)
-
+
New Folder %1
新建文件夹%1
-
+
Untitled
无标题
-
+
Untitled %1
无标题%1
-
+
Do you really want to delete %1?
你真的要删除%1吗?
-
+
Do you really want to delete %1 files?
你真的要删除%1个文件吗?
-
+
Save project
保存项目
-
+
The project '%1' has modifications.
项目'%1'有改动。
-
-
+
+
Do you want to save it?
需要保存吗?
-
-
+
+
File Changed
文件已发生变化
-
+
New Project File?
新建项目文件?
-
+
Do you want to add the new file to the project?
您是否要将新建的文件加入项目?
-
-
-
-
+
+
+
+
Save Error
保存失败
-
+
Change Project Compiler Set
改变项目编译器配置集
-
+
Change the project's compiler set will lose all custom compiler set options.
改变项目的编译器配置集会导致所有的自定义编译器选项被重置。
-
-
+
+
Do you really want to do that?
你真的想要那么做吗?
@@ -5719,181 +5724,178 @@ Are you really want to continue?
批量设置案例
-
+
Choose input files
选择输入数据文件
-
+
Input data files (*.in)
输入数据文件 (*.in)
-
+
Modify Watch
修改监视表达式
-
+
Watch Expression
监视表达式
-
+
Do you really want to clear all breakpoints in this file?
您真的要清除该文件的所有断点吗?
-
+
New project
新建项目
-
+
Close %1 and start new project?
关闭'%1'以打开新项目?
-
+
Folder not exist
文件夹不存在
-
+
Folder '%1' doesn't exist. Create it now?
文件夹'%1'不存在。是否创建?
-
+
Can't create folder
无法创建文件夹
-
+
Failed to create folder '%1'.
创建文件夹'%1'失败。
-
+
Save new project as
-
+
Folder %1 is not empty.
文件夹%1不是空的。
-
+
Do you really want to delete it?
你真的要删除它吗?
-
+
Change working folder
改变工作文件夹
-
+
File '%1' is not in the current working folder.
File '%1' is not in the current working folder
文件'%1'不在当前工作文件夹中。
-
+
Do you want to change working folder to '%1'?
是否将工作文件夹改设为'%1'?
-
+
Can't Commit
无法提交
-
+
Git needs user info to commit.
Git需要用信息进行提交。
-
+
Choose Input Data File
选择输入数据文件
-
-
+
+
All files (*.*)
所有文件 (*.*)
-
+
Choose Expected Output Data File
Choose Expected Input Data File
选择期望输出文件
-
-
-
Line %1
- 第%1行
+ 第%1行
-
-
-
+
+
+
Choose Working Folder
选择工作文件夹
-
-
+
+
Header Exists
头文件已存在
-
-
+
+
Header file "%1" already exists!
头文件"%1"已存在!
-
+
Source Exists
源文件已存在!
-
+
Source file "%1" already exists!
源文件"%1"已存在!
-
+
Can't commit!
无法提交!
-
+
The following files are in conflicting:
下列文件处于冲突状态,请解决后重新添加和提交:
-
+
Commit Message
提交信息
-
+
Commit Message:
提交信息:
-
+
Commit Failed
提交失败
-
+
Commit message shouldn't be empty!
提交信息不能为空!
@@ -5902,135 +5904,135 @@ Are you really want to continue?
小熊猫Dev-C++项目文件 (*.dev)
-
+
New project fail
新建项目失败
-
+
Can't assign project template
无法使用模板创建项目
-
+
Remove file
删除文件
-
+
Remove the file from disk?
同时从硬盘上删除文件?
-
+
untitled
无标题
-
+
New Project File Name
新的项目文件名
-
+
File Name:
文件名:
-
+
File Already Exists!
文件已存在!
-
+
File '%1' already exists!
文件'%1'已经存在!
-
+
Add to project
添加到项目
-
+
C/C++ Source Files (*.c *.cpp *.cc *.cxx)
C/C++源代码文件 (*.c *.cpp *.cc *.cxx)
-
+
This operation will remove all cases for the current problem.
本操作会删除此试题的所有案例。
-
+
Red Panda C++ project file (*.dev)
小熊猫C++项目文件(*.dev)
-
+
Rename Error
重命名出错
-
+
Symbol '%1' is defined in system header.
符号'%1'在系统头文件中定义,无法修改。
-
+
New Name
新名称
-
-
+
+
Replace Error
替换出错
-
+
Can't open file '%1' for replace!
无法打开文件'%1'进行替换!
-
+
Contents has changed since last search!
内容和上次查找时不一致。
-
+
Rich Text Format Files (*.rtf)
RTF格式文件 (*.rtf)
-
+
HTML Files (*.html)
HTML文件 (*.html)
-
+
The current problem set is not empty.
当前的试题集不是空的。
-
+
Problem %1
试题%1
-
-
+
+
Problem Set Files (*.pbs)
试题集文件 (*.pbs)
-
+
Load Error
载入失败
-
-
+
+
Problem Case %1
试题案例%1
@@ -6041,16 +6043,16 @@ Are you really want to continue?
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
Error
错误
@@ -6060,96 +6062,96 @@ Are you really want to continue?
项目历史
-
+
Load Theme Error
载入主题失败
-
-
+
+
Clear History
清除历史
-
-
+
+
Version Control
版本控制
-
+
File '%1' was changed.
磁盘文件'%1'已被修改。
-
+
Reload its content from disk?
是否重新读取它的内容?
-
+
File '%1' was removed.
磁盘文件'%1'已被删除。
-
+
Keep it open?
是否保持它在小熊猫C++中打开的编辑窗口?
-
+
Open
打开
-
+
Compile Failed
编译失败
-
+
Run Failed
运行失败
-
-
-
-
+
+
+
+
Confirm Convertion
确认转换
-
-
-
-
+
+
+
+
The editing file will be saved using %1 encoding. <br />This operation can't be reverted. <br />Are you sure to continue?
当前编辑器中的文件将会使用%1编码保存。<br />这项操作无法被撤回。<br />你确定要继续吗?
-
+
New Watch Expression
新监视表达式
-
+
Enter Watch Expression (it is recommended to use 'this->' for class members):
输入监视表达式
-
+
Parsing file %1 of %2: "%3"
(%1/%2)正在解析文件"%3"
-
-
+
+
Done parsing %1 files in %2 seconds
完成%1个文件的解析,用时%2秒
-
+
(%1 files per second)
(每秒%1个文件)
@@ -8369,14 +8371,14 @@ Are you really want to continue?
性能
-
+
Compiler Set
编译器配置集
-
+
Compiler
@@ -8388,7 +8390,7 @@ Are you really want to continue?
自动链接
-
+
@@ -8464,15 +8466,15 @@ Are you really want to continue?
杂项
-
-
+
+
Program Runner
程序运行
-
+
Problem Set
试题集
@@ -8606,18 +8608,18 @@ Are you really want to continue?
读取快捷键配置文件'%1'失败:%2
-
-
+
+
Save shortcut config failed
保存快捷键配置失败
-
+
Can't open shortcut config file '%1' for write.
无法写入快捷键配置文件'%1'
-
+
Write to shortcut config file '%1' failed.
写入快捷键配置文件失败'%1'。
diff --git a/RedPandaIDE/RedPandaIDE_zh_TW.ts b/RedPandaIDE/RedPandaIDE_zh_TW.ts
index d77b0746..0694ad15 100644
--- a/RedPandaIDE/RedPandaIDE_zh_TW.ts
+++ b/RedPandaIDE/RedPandaIDE_zh_TW.ts
@@ -4440,10 +4440,6 @@
Choose Expected Output Data File
-
- Line %1
-
-
Convert to UTF-8 BOM
@@ -4492,6 +4488,10 @@
Rename
+
+ Ignore Spaces
+
+
NewClassDialog
diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp
index e6f99df6..fd1b028c 100644
--- a/RedPandaIDE/mainwindow.cpp
+++ b/RedPandaIDE/mainwindow.cpp
@@ -719,6 +719,7 @@ void MainWindow::applySettings()
showHideMessagesTab(ui->tabProblem, pSettings->ui().showProblem()
&& pSettings->executor().enableProblemSet());
+ ui->chkIgnoreSpaces->setChecked(pSettings->executor().ignoreSpacesWhenValidatingCases());
ui->actionInterrupt->setVisible(pSettings->debugger().useGDBServer());
//icon sets for editors
updateEditorSettings();
@@ -6246,7 +6247,7 @@ void MainWindow::setDockMessagesToArea(const Qt::DockWidgetArea &area)
& ~area);
QGridLayout* layout=(QGridLayout*)ui->panelProblemCase->layout();
layout->removeWidget(ui->widgetProblemCaseInputCaption);
- layout->removeWidget(ui->lblProblemCaseOutputCaption);
+ layout->removeWidget(ui->widgetProblemCaseOutputCaption);
layout->removeWidget(ui->widgetProblemCaseExpectedCaption);
layout->removeWidget(ui->txtProblemCaseInput);
layout->removeWidget(ui->txtProblemCaseOutput);
@@ -6259,28 +6260,30 @@ void MainWindow::setDockMessagesToArea(const Qt::DockWidgetArea &area)
case Qt::DockWidgetArea::TopDockWidgetArea:
layout->addWidget(ui->widgetProblemCaseInputCaption, 0, 0, 1, 1);
layout->addWidget(ui->txtProblemCaseInput, 1, 0, 1, 1);
- layout->addWidget(ui->lblProblemCaseInput, 2, 0, 1, 1);
-
- layout->addWidget(ui->lblProblemCaseOutputCaption, 0, 2, 1, 1);
- layout->addWidget(ui->txtProblemCaseOutput, 1, 2, 1, 1);
- layout->addWidget(ui->lblProblemCaseOutput, 2, 2, 1, 1);
+// layout->addWidget(ui->lblProblemCaseInput, 2, 0, 1, 1);
layout->addWidget(ui->widgetProblemCaseExpectedCaption, 0, 1, 1, 1);
layout->addWidget(ui->txtProblemCaseExpected, 1, 1, 1, 1);
- layout->addWidget(ui->lblProblemCaseExpected, 2, 1, 1, 1);
+// layout->addWidget(ui->lblProblemCaseExpected, 2, 1, 1, 1);
+
+ layout->addWidget(ui->widgetProblemCaseOutputCaption, 0, 2, 1, 1);
+ layout->addWidget(ui->txtProblemCaseOutput, 1, 2, 1, 1);
+// layout->addWidget(ui->lblProblemCaseOutput, 2, 2, 1, 1);
+
+
break;
default:
layout->addWidget(ui->widgetProblemCaseInputCaption, 0, 0, 1, 1);
layout->addWidget(ui->txtProblemCaseInput, 1, 0, 1, 1);
- layout->addWidget(ui->lblProblemCaseInput, 2, 0, 1, 1);
+ //layout->addWidget(ui->lblProblemCaseInput, 2, 0, 1, 1);
layout->addWidget(ui->widgetProblemCaseExpectedCaption, 3, 0, 1, 1);
layout->addWidget(ui->txtProblemCaseExpected, 4, 0, 1, 1);
- layout->addWidget(ui->lblProblemCaseExpected, 5, 0, 1, 1);
+ //layout->addWidget(ui->lblProblemCaseExpected, 5, 0, 1, 1);
- layout->addWidget(ui->lblProblemCaseOutputCaption, 6, 0, 1, 1);
+ layout->addWidget(ui->widgetProblemCaseOutputCaption, 6, 0, 1, 1);
layout->addWidget(ui->txtProblemCaseOutput, 7, 0, 1, 1);
- layout->addWidget(ui->lblProblemCaseOutput, 8, 0, 1, 1);
+ //layout->addWidget(ui->lblProblemCaseOutput, 8, 0, 1, 1);
}
}
@@ -7774,7 +7777,7 @@ void MainWindow::on_txtProblemCaseOutput_cursorPositionChanged()
QTextCursor cursor = ui->txtProblemCaseOutput->textCursor();
int val = ui->txtProblemCaseOutput->verticalScrollBar()->value();
int line = cursor.block().firstLineNumber();
- ui->lblProblemCaseOutput->setText(tr("Line %1").arg(cursor.block().firstLineNumber()+1));
+ //ui->lblProblemCaseOutput->setText(tr("Line %1").arg(cursor.block().firstLineNumber()+1));
QTextBlock block = ui->txtProblemCaseExpected->document()->findBlockByLineNumber(line);
if (!block.isValid())
@@ -7788,14 +7791,14 @@ void MainWindow::on_txtProblemCaseOutput_cursorPositionChanged()
void MainWindow::on_txtProblemCaseExpected_cursorPositionChanged()
{
QTextCursor cursor = ui->txtProblemCaseExpected->textCursor();
- ui->lblProblemCaseExpected->setText(tr("Line %1").arg(cursor.block().firstLineNumber()+1));
+ //ui->lblProblemCaseExpected->setText(tr("Line %1").arg(cursor.block().firstLineNumber()+1));
}
void MainWindow::on_txtProblemCaseInput_cursorPositionChanged()
{
QTextCursor cursor = ui->txtProblemCaseInput->textCursor();
- ui->lblProblemCaseInput->setText(tr("Line %1").arg(cursor.block().firstLineNumber()+1));
+ //ui->lblProblemCaseInput->setText(tr("Line %1").arg(cursor.block().firstLineNumber()+1));
}
@@ -7874,3 +7877,9 @@ void MainWindow::on_actionToggle_Messages_Panel_triggered()
stretchMessagesPanel(ui->tabMessages->isShrinked());
}
+
+void MainWindow::on_chkIgnoreSpaces_stateChanged(int /*arg1*/)
+{
+ pSettings->executor().setIgnoreSpacesWhenValidatingCases(ui->chkIgnoreSpaces->isChecked());
+}
+
diff --git a/RedPandaIDE/mainwindow.h b/RedPandaIDE/mainwindow.h
index 1358be05..6881815d 100644
--- a/RedPandaIDE/mainwindow.h
+++ b/RedPandaIDE/mainwindow.h
@@ -680,6 +680,8 @@ private slots:
void on_actionToggle_Messages_Panel_triggered();
+ void on_chkIgnoreSpaces_stateChanged(int arg1);
+
private:
Ui::MainWindow *ui;
EditorList *mEditorList;
diff --git a/RedPandaIDE/mainwindow.ui b/RedPandaIDE/mainwindow.ui
index 968e0bb0..daff73d3 100644
--- a/RedPandaIDE/mainwindow.ui
+++ b/RedPandaIDE/mainwindow.ui
@@ -1738,6 +1738,23 @@
+ -
+
+
+
+
+
+
+ -
+
+
+ QPlainTextEdit::NoWrap
+
+
+ true
+
+
+
-
@@ -1872,28 +1889,49 @@
- -
-
-
- QPlainTextEdit::NoWrap
-
-
- true
-
-
-
-
-
-
- Output
-
-
-
- -
-
-
-
-
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Output
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Ignore Spaces
+
+
+
+