diff --git a/NEWS.md b/NEWS.md
index 72a3c6e7..e3ac23c6 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,8 @@
+Version 0.12.2 For Dev-C++ 7 Beta
+ - enhancement: auto find compiler sets in the PATH
+ - change: path for iconsets
+ - enhancement: select icon sets in options dialog ( but we have only 1 icon set now...)
+
Version 0.12.1 For Dev-C++ 7 Beta
- fix: error when drag&drop in editors
diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.qm b/RedPandaIDE/RedPandaIDE_zh_CN.qm
index f456f4b9..ab0dc0f8 100644
Binary files a/RedPandaIDE/RedPandaIDE_zh_CN.qm and b/RedPandaIDE/RedPandaIDE_zh_CN.qm differ
diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.ts b/RedPandaIDE/RedPandaIDE_zh_CN.ts
index ce86925a..e1260249 100644
--- a/RedPandaIDE/RedPandaIDE_zh_CN.ts
+++ b/RedPandaIDE/RedPandaIDE_zh_CN.ts
@@ -556,13 +556,13 @@
Add
- 添加
+ 添加
Remove
- 删除
+ 删除
...
@@ -636,7 +636,7 @@
Remove
- 删除
+ 删除
Delete
@@ -700,31 +700,31 @@
Auto Find Compilers
-
+ 自动搜索编译器
Find Compiler in the Folder
-
+ 在指定文件夹中搜索编译器
Add Blank Compiler Set
-
+ 添加空白编译器设置
Rename
-
+ 改名
Remove
- 删除
+ 删除
@@ -1823,30 +1823,40 @@ Are you really want to continue?
表单
-
+
Theme:
主题:
-
+
+ Icon Set:
+ 图标集：
+
+
+
Font:
字体:
-
+
Language:
语言:
-
+
*Needs restart
*需要重启之后生效
-
+
Font Size:
大小:
+
+
+ English
+ 英语
+
Simplified Chinese
@@ -1886,31 +1896,32 @@ Are you really want to continue?
+
Open in browser
在文件浏览器中打开
-
+
Remove all custom settings and exit
删除所有的自定义设置并退出程序
-
+
Confirm
确认
-
+
Do you really want to delete all custom settings?
你真的要删除所有自定义设置吗？
-
+
Error
错误
-
+
Failed to delete custom settings.
删除自定义设置失败
@@ -1957,7 +1968,7 @@ Are you really want to continue?
ExecutableRunner
-
+
The runner process '%1' failed to start.
The runner process failed to start.
无法启动程序运行进程'%1'。
@@ -1967,17 +1978,17 @@ Are you really want to continue?
程序运行进程启动后崩溃。
-
+
The last waitFor...() function timed out.
waitFor()函数等待超时。
-
+
An error occurred when attempting to write to the runner process.
在向程序运行进程写入内容时出错。
-
+
An error occurred when attempting to read from the runner process.
在从程序运行进程读取内容时出错。
@@ -2014,17 +2025,23 @@ Are you really want to continue?
将程序的标准输入重定向到下面的文件
-
+
+
+ Browse
+ 浏览
+
+
+
Note: Debugger doesn't support this feature.
注意:由于gdb的bug，调试时不支持该功能
-
+
Choose input file
选择输入文件
-
+
All files (*.*)
所有文件 (*.*)
@@ -2972,11 +2989,11 @@ Are you really want to continue?
-
-
-
-
-
+
+
+
+
+
Issues
编译器
@@ -3052,7 +3069,7 @@ Are you really want to continue?
-
+
Debug Console
调试主控台
@@ -3186,8 +3203,8 @@ Are you really want to continue?
-
-
+
+
Compile
编译
@@ -3233,8 +3250,8 @@ Are you really want to continue?
-
-
+
+
Copy
复制
@@ -3245,7 +3262,7 @@ Are you really want to continue?
-
+
Paste
粘贴
@@ -3256,7 +3273,7 @@ Are you really want to continue?
-
+
Select All
选择全部
@@ -3383,7 +3400,7 @@ Are you really want to continue?
-
+
New Problem Set
新建试题集
@@ -3402,14 +3419,14 @@ Are you really want to continue?
-
+
Save Problem Set
保存试题集
-
+
Load Problem Set
载入试题集
@@ -3749,7 +3766,7 @@ Are you really want to continue?
-
+
Clear all breakpoints
删除所有断点
@@ -3850,7 +3867,7 @@ Are you really want to continue?
-
+
Rename Symbol
重命名符号
@@ -3871,13 +3888,13 @@ Are you really want to continue?
-
+
Export As RTF
导出为RTF
-
+
Export As HTML
导出为HTML
@@ -3997,7 +4014,7 @@ Are you really want to continue?
-
+
Open Folder
打开文件夹
@@ -4007,7 +4024,7 @@ Are you really want to continue?
运行参数...
-
+
File Encoding
文件编码
@@ -4017,32 +4034,32 @@ Are you really want to continue?
文件历史
-
-
+
-
+
+
Debugging
正在调试
-
-
+
-
+
+
Running
正在运行
-
-
+
-
+
+
Compiling
正在编译
@@ -4051,172 +4068,172 @@ 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'
-
+
Show detail debug logs
显示详细调试器日志
-
+
Copy all
全部复制
-
-
+
+
Clear
清除
@@ -4232,7 +4249,7 @@ Are you really want to continue?
-
+
Problem Set %1
试题集%1
@@ -4253,73 +4270,73 @@ Are you really want to continue?
或者选择使用其他的网络端口。
-
+
Red Panda Dev-C++
小熊猫Dev-C++
-
-
+
+
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:
描述：
@@ -4328,363 +4345,363 @@ 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
重命名
-
+
Remove Folder
删除文件夹
-
+
Sort By Type
按类型排序
-
+
Sort alphabetically
按名称排序
-
+
Show inherited members
显示继承的成员
-
+
Goto declaration
跳转到声明处
-
+
Goto definition
跳转到定义处
-
+
Open in Editor
在编辑器中打开
-
+
Open in External Program
使用外部程序打开
-
+
Open in Terminal
在终端中打开
-
+
Open in Windows Explorer
在Windows浏览器中打开
-
+
Character sets
字符集
-
+
%1 files autosaved
已自动保存%1个文件
-
+
Set answer to...
设置答案源代码...
-
+
select other file...
选择其他文件...
-
+
Select Answer Source File
选择答案源代码文件
-
+
C/C++Source Files (*.c *.cpp *.cc *.cxx)
C/C++Source Files (*.c *.cpp *.cc *.cxx
C/C++源代码文件 (*.c *.cpp *.cc *.cxx)
-
+
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?
你真的想要做那些吗？
-
+
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
-
+
Red panda Dev-C++ project file (*.dev)
小熊猫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
添加到项目
-
+
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
@@ -4695,15 +4712,15 @@ Are you really want to continue?
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
Error
错误
@@ -4713,75 +4730,75 @@ Are you really want to continue?
项目历史
-
+
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个文件）
@@ -4847,22 +4864,22 @@ Are you really want to continue?
OJProblemCasesRunner
-
+
The runner process '%1' failed to start.
无法启动程序运行进程'%1'。
-
+
The last waitFor...() function timed out.
waitFor()函数等待超时。
-
+
An error occurred when attempting to write to the runner process.
在向程序运行进程写入内容时出错。
-
+
An error occurred when attempting to read from the runner process.
在从程序运行进程读取内容时出错。
@@ -5125,17 +5142,23 @@ Are you really want to continue?
表单
-
+
+
+ Browse
+ 浏览
+
+
+
Host application for DLL:
DLL文件的宿主程序：
-
+
Choose host application
选择宿主程序
-
+
All files (*.*)
所有文件 (*.*)
@@ -5313,27 +5336,27 @@ Are you really want to continue?
输出文件：
-
+
%1 files [ %2 sources, %3 headers, %4 resources, %5 other files ]
共%1个文件[%2个源程序文件，%3个头文件，%4个资源文件，%5个其他文件]
-
+
Can't remove old icon file
无法删除旧图标文件
-
+
Can't remove old icon file '%1'
无法删除旧图标文件'%1'
-
+
Select icon file
选择图标文件
-
+
Icon Files (*.ico)
图标文件 (*.ico)
@@ -5352,26 +5375,27 @@ Are you really want to continue?
+
Browse
浏览
-
+
Information about using a custom make file
关于自定义Makefile
-
+
Include the following files into the makefile:
在Makefile中包含下列文件:
-
+
Custom makefile
自定义Makefile
-
+
All files (*.*)
所有文件 (*.*)
@@ -5410,7 +5434,7 @@ Are you really want to continue?
-
+
Executable output directory
可执行文件输出文件夹
@@ -5437,17 +5461,17 @@ Are you really want to continue?
自定义可执行文件名
-
+
Object files output directory
目标文件输出文件夹
-
+
Log file
日志文件
-
+
All files (*.*)
所有文件 (*.*)
@@ -5466,21 +5490,22 @@ Are you really want to continue?
+
Browse
浏览
-
+
<html><head/><body><p>For more information about gcc precompiled header, see:</p><p><a href="https://gcc.gnu.org/onlinedocs/gcc/Precompiled-Headers.html"><span style=" text-decoration: underline; color:#007af4;">https://gcc.gnu.org/onlinedocs/gcc/Precompiled-Headers.html</span></a></p></body></html>
<html><head/><body><p>请问访问下面网站以了解有关gcc预定义头文件的信息:</p><p><a href="https://gcc.gnu.org/onlinedocs/gcc/Precompiled-Headers.html"><span style=" text-decoration: underline; color:#007af4;">https://gcc.gnu.org/onlinedocs/gcc/Precompiled-Headers.html</span></a></p></body></html>
-
+
Precompiled header
预定义头文件
-
+
header files (*.h)
header files (*.h
文件夹 (*.h)
@@ -5887,33 +5912,33 @@ Are you really want to continue?
只生成汇编代码(-S)
-
-
+
+
Confirm
确认
-
+
The following problems were found during validation of compiler set "%1":
在验证编译器设置"%1"时遇到了下列问题：
-
+
Would you like Red Panda C++ to remove them for you and add the default paths to the valid paths?
是否让小熊猫C++删除这些配置，并尝试重新建立配置？
-
+
Leaving those directories will lead to problems during compilation.<br /><br />Unless you know exactly what you're doing, it is recommended that you click Yes.
如果仍然保留这些设置，可能会导致编译错误。<br /><br />请选择“是”，除非您清楚的知道选择“否”的后果，
-
+
Compiler set not configuared.
未配置编译器设置。
-
+
Would you like Red Panda C++ to search for compilers in the following locations: <BR />'%1'<BR />'%2'?
您需要小熊猫C++在下列位置搜索编译器吗：<br />%1<br />%2
@@ -6633,7 +6658,7 @@ Are you really want to continue?
SettingsDialog
-
+
Options
选项
@@ -6659,69 +6684,68 @@ Are you really want to continue?
取消
-
+
Appearence
外观
-
+
Environment
环境
-
+
File Association
文件关联
-
+
Shortcuts
快捷键
-
+
Folders
文件夹
-
+
Performance
性能
-
-
+
+
Compiler Set
编译器配置集
-
+
Compiler
编译器
-
+
Auto Link
自动链接
-
-
-
-
+
+
+
-
+
+
General
通用
-
@@ -6732,95 +6756,95 @@ Are you really want to continue?
+
Editor
编辑器
-
+
Font
字体
-
+
Copy & Export
复制/导出
-
+
Color
配色
-
+
Code Completion
代码补全
-
+
Symbol Completion
符号补全
-
+
Snippet
代码模板
-
+
Auto Syntax Checking
自动语法检查
-
+
Tooltips
信息提示
-
+
Auto save
自动保存
-
+
Misc
杂项
-
-
-
+
+
+
Program Runner
程序运行
-
-
+
+
Problem Set
试题集
-
+
Debugger
调试器
-
+
Code Formatter
代码排版
-
+
Tools
工具
-
+
Project Options
项目选项
-
@@ -6830,56 +6854,57 @@ Are you really want to continue?
+
Project
项目
-
+
Files
文件
-
+
Custom Compile options
自定义编译选项
-
+
Directories
文件夹
-
+
Precompiled Header
预编译头文件
-
+
Makefile
Makefile
-
+
Output
输出
-
+
DLL host
DLL宿主
-
+
Version info
版本信息
-
+
Save Changes
保存修改
-
+
There are changes in the settings, do you want to save them before swtich to other page?
本页中有尚未保存的设置修改，是否保存后再切换到其他页？
@@ -7137,27 +7162,27 @@ Are you really want to continue?
插入宏指令
-
+
Save Changes?
保存修改？
-
+
Do you want to save changes to the current tool?
您需要保存对当前工具的修改吗？
-
+
Choose Folder
选择文件夹
-
+
Select program
选择程序
-
+
Executable files (*.exe)
可执行文件 (*.exe)
diff --git a/RedPandaIDE/icons.qrc b/RedPandaIDE/icons.qrc
index 05598c4d..547cd9d3 100644
--- a/RedPandaIDE/icons.qrc
+++ b/RedPandaIDE/icons.qrc
@@ -107,106 +107,107 @@
images/associations/obj.ico
images/associations/rc.ico
images/associations/template.ico
- images/editor/breakpoint.svg
- images/editor/bookmark.svg
- images/editor/currentline.svg
- images/editor/syntaxerror.svg
- images/editor/syntaxwarning.svg
- images/classparser/class.svg
- images/classparser/define.svg
- images/classparser/enum.svg
- images/classparser/global.svg
- images/classparser/global_method.svg
- images/classparser/method_inherited.svg
- images/classparser/method_inherited_protected.svg
- images/classparser/method_private.svg
- images/classparser/method_protected.svg
- images/classparser/method_public.svg
- images/classparser/namespace.svg
- images/classparser/static_method.svg
- images/classparser/static_var.svg
- images/classparser/type.svg
- images/classparser/var_inherited.svg
- images/classparser/var_inherited_protected.svg
- images/classparser/var_private.svg
- images/classparser/var_protected.svg
- images/classparser/var_public.svg
- images/newlook/01File-01New.svg
- images/newlook/01File-02Open.svg
- images/newlook/01File-03Save.svg
- images/newlook/01File-04SaveAs.svg
- images/newlook/01File-05SaveAll.svg
- images/newlook/01File-06Close.svg
- images/newlook/01File-07CloseAll.svg
- images/newlook/01File-08Print.svg
- images/newlook/01File-09Open_Folder.svg
- images/newlook/02Project_01New.svg
- images/newlook/02Project_02Save.svg
- images/newlook/02Project_03Close.svg
- images/newlook/02Project_04NewFile.svg
- images/newlook/02Project_05AddFile.svg
- images/newlook/02Project_06RemoveFile.svg
- images/newlook/02Project_07Properties.svg
- images/newlook/03Edit_01Undo.svg
- images/newlook/03Edit_02Redo.svg
- images/newlook/03Edit_03Cut.svg
- images/newlook/03Edit_04Copy.svg
- images/newlook/03Edit_05Paste.svg
- images/newlook/03Edit_06Indent.svg
- images/newlook/03Edit_07Unindent.svg
- images/newlook/03Edit_08Search.svg
- images/newlook/03Edit_09Replace.svg
- images/newlook/03Edit_10SearchInFiles.svg
- images/newlook/04Code-01Back.svg
- images/newlook/04Code-02Forward.svg
- images/newlook/04Code-03AddBookmark.svg
- images/newlook/04Code-04RemoveBookmark.svg
- images/newlook/04Code-05Reformat.svg
- images/newlook/05Run-01Compile.svg
- images/newlook/05Run-02CompileRun.svg
- images/newlook/05Run-03Run.svg
- images/newlook/05Run-04Rebuild.svg
- images/newlook/05Run-05Options.svg
- images/newlook/05Run-06Debug.svg
- images/newlook/05Run-07StepOver.svg
- images/newlook/05Run-08StepInto.svg
- images/newlook/05Run-08StepOut.svg
- images/newlook/05Run-09RunToCursor.svg
- images/newlook/05Run-10Continue.svg
- images/newlook/05Run-11Stop.svg
- images/newlook/05Run-12AddWatch.svg
- images/newlook/05Run-13RemoveWatch.svg
- images/newlook/00Misc-01Back.svg
- images/newlook/00Misc-02Forward.svg
- images/newlook/00Misc-03Add.svg
- images/newlook/00Misc-04Remove.svg
- images/newlook/00Misc-05Gear.svg
- images/newlook/00Misc-06Cross.svg
- images/newlook/00Misc-07Folder.svg
- images/newlook/00Misc-08Term.svg
- images/newlook/00Misc-09Clean.svg
- images/newlook/06View-01Maximum.svg
- images/newlook/07Help-01About.svg
- images/newlook/01File-10FileProperties.svg
- images/newlook/01File-11Locate.svg
- images/newlook/03Edit-11SortByName.svg
- images/newlook/03Edit-12SortByType.svg
- images/newlook/03Edit-13ShowInherited.svg
- images/newlook/06View-02ClassBrowser.svg
- images/newlook/08Problem_01Problem.svg
- images/newlook/08Problem_02ProblemSet.svg
- images/newlook/08Problem_03Properties.svg
- images/newlook/08Problem_04EditSource.svg
- images/newlook/08Problem_05RunCases.svg
- images/newlook/06View-03Files.svg
- images/newlook/06View-04CompileLog.svg
- images/newlook/06View-05Bookmark.svg
- images/newlook/06View-06Todo.svg
- images/newlook/05Run-14StepOverInstruction.svg
- images/newlook/05Run-15StepIntoInstruction.svg
images/dark-close.svg
- images/newlook/00Misc-10Check.svg
- images/newlook/00Misc-11Rename.svg
- images/newlook/00Misc-12Help.svg
+ images/newlook/classparser/class.svg
+ images/newlook/classparser/define.svg
+ images/newlook/classparser/enum.svg
+ images/newlook/classparser/global.svg
+ images/newlook/classparser/global_method.svg
+ images/newlook/classparser/method_inherited.svg
+ images/newlook/classparser/method_inherited_protected.svg
+ images/newlook/classparser/method_private.svg
+ images/newlook/classparser/method_protected.svg
+ images/newlook/classparser/method_public.svg
+ images/newlook/classparser/namespace.svg
+ images/newlook/classparser/static_method.svg
+ images/newlook/classparser/static_var.svg
+ images/newlook/classparser/type.svg
+ images/newlook/classparser/var_inherited.svg
+ images/newlook/classparser/var_inherited_protected.svg
+ images/newlook/classparser/var_private.svg
+ images/newlook/classparser/var_protected.svg
+ images/newlook/classparser/var_public.svg
+ images/newlook/editor/bookmark.svg
+ images/newlook/editor/breakpoint.svg
+ images/newlook/editor/currentline.svg
+ images/newlook/editor/syntaxerror.svg
+ images/newlook/editor/syntaxwarning.svg
+ images/newlook/actions/00Misc-01Back.svg
+ images/newlook/actions/00Misc-02Forward.svg
+ images/newlook/actions/00Misc-03Add.svg
+ images/newlook/actions/00Misc-04Remove.svg
+ images/newlook/actions/00Misc-05Gear.svg
+ images/newlook/actions/00Misc-06Cross.svg
+ images/newlook/actions/00Misc-07Folder.svg
+ images/newlook/actions/00Misc-08Term.svg
+ images/newlook/actions/00Misc-09Clean.svg
+ images/newlook/actions/00Misc-10Check.svg
+ images/newlook/actions/00Misc-11Rename.svg
+ images/newlook/actions/00Misc-12Help.svg
+ images/newlook/actions/01File-01New.svg
+ images/newlook/actions/01File-02Open.svg
+ images/newlook/actions/01File-03Save.svg
+ images/newlook/actions/01File-04SaveAs.svg
+ images/newlook/actions/01File-05SaveAll.svg
+ images/newlook/actions/01File-06Close.svg
+ images/newlook/actions/01File-07CloseAll.svg
+ images/newlook/actions/01File-08Print.svg
+ images/newlook/actions/01File-09Open_Folder.svg
+ images/newlook/actions/01File-10FileProperties.svg
+ images/newlook/actions/01File-11Locate.svg
+ images/newlook/actions/02Project_01New.svg
+ images/newlook/actions/02Project_02Save.svg
+ images/newlook/actions/02Project_03Close.svg
+ images/newlook/actions/02Project_04NewFile.svg
+ images/newlook/actions/02Project_05AddFile.svg
+ images/newlook/actions/02Project_06RemoveFile.svg
+ images/newlook/actions/02Project_07Properties.svg
+ images/newlook/actions/03Edit_01Undo.svg
+ images/newlook/actions/03Edit_02Redo.svg
+ images/newlook/actions/03Edit_03Cut.svg
+ images/newlook/actions/03Edit_04Copy.svg
+ images/newlook/actions/03Edit_05Paste.svg
+ images/newlook/actions/03Edit_06Indent.svg
+ images/newlook/actions/03Edit_07Unindent.svg
+ images/newlook/actions/03Edit_08Search.svg
+ images/newlook/actions/03Edit_09Replace.svg
+ images/newlook/actions/03Edit_10SearchInFiles.svg
+ images/newlook/actions/03Edit-11SortByName.svg
+ images/newlook/actions/03Edit-12ShowInherited.svg
+ images/newlook/actions/03Edit-12SortByType.svg
+ images/newlook/actions/03Edit-13ShowInherited.svg
+ images/newlook/actions/04Code-01Back.svg
+ images/newlook/actions/04Code-02Forward.svg
+ images/newlook/actions/04Code-03AddBookmark.svg
+ images/newlook/actions/04Code-04RemoveBookmark.svg
+ images/newlook/actions/04Code-05Reformat.svg
+ images/newlook/actions/05Run-01Compile.svg
+ images/newlook/actions/05Run-02CompileRun.svg
+ images/newlook/actions/05Run-03Run.svg
+ images/newlook/actions/05Run-04Rebuild.svg
+ images/newlook/actions/05Run-05Options.svg
+ images/newlook/actions/05Run-06Debug.svg
+ images/newlook/actions/05Run-07StepOver.svg
+ images/newlook/actions/05Run-08StepInto.svg
+ images/newlook/actions/05Run-08StepOut.svg
+ images/newlook/actions/05Run-09RunToCursor.svg
+ images/newlook/actions/05Run-10Continue.svg
+ images/newlook/actions/05Run-11Stop.svg
+ images/newlook/actions/05Run-12AddWatch.svg
+ images/newlook/actions/05Run-13RemoveWatch.svg
+ images/newlook/actions/05Run-14StepOverInstruction.svg
+ images/newlook/actions/05Run-15StepIntoInstruction.svg
+ images/newlook/actions/06View-01Maximum.svg
+ images/newlook/actions/06View-02ClassBrowser.svg
+ images/newlook/actions/06View-03Files.svg
+ images/newlook/actions/06View-04CompileLog.svg
+ images/newlook/actions/06View-05Bookmark.svg
+ images/newlook/actions/06View-06Todo.svg
+ images/newlook/actions/07Help-01About.svg
+ images/newlook/actions/08Problem_01Problem.svg
+ images/newlook/actions/08Problem_02ProblemSet.svg
+ images/newlook/actions/08Problem_03Properties.svg
+ images/newlook/actions/08Problem_04EditSource.svg
+ images/newlook/actions/08Problem_05RunCases.svg
diff --git a/RedPandaIDE/iconsmanager.cpp b/RedPandaIDE/iconsmanager.cpp
index 8442aea9..aa6367ab 100644
--- a/RedPandaIDE/iconsmanager.cpp
+++ b/RedPandaIDE/iconsmanager.cpp
@@ -16,7 +16,7 @@ IconsManager::IconsManager(QObject *parent) : QObject(parent)
void IconsManager::updateEditorGuttorIcons(const QString& iconSet,int size)
{
- QString iconFolder = QString(":/icons/images/%1/").arg(iconSet);
+ QString iconFolder = QString(":/icons/images/%1/editor/").arg(iconSet);
mIconPixmaps.insert(GUTTER_BREAKPOINT, createSVGIcon(iconFolder+"breakpoint.svg",size,size));
mIconPixmaps.insert(GUTTER_SYNTAX_ERROR, createSVGIcon(iconFolder+"syntaxerror.svg",size,size));
mIconPixmaps.insert(GUTTER_SYNTAX_WARNING,createSVGIcon(iconFolder+"syntaxwarning.svg",size,size));
@@ -26,7 +26,7 @@ void IconsManager::updateEditorGuttorIcons(const QString& iconSet,int size)
void IconsManager::updateParserIcons(const QString &iconSet, int size)
{
- QString iconFolder = QString(":/icons/images/%1/").arg(iconSet);
+ QString iconFolder = QString(":/icons/images/%1/classparser/").arg(iconSet);
mIconPixmaps.insert(PARSER_TYPE, createSVGIcon(iconFolder+"type.svg",size,size));
mIconPixmaps.insert(PARSER_CLASS, createSVGIcon(iconFolder+"class.svg",size,size));
mIconPixmaps.insert(PARSER_NAMESPACE, createSVGIcon(iconFolder+"namespace.svg",size,size));
@@ -49,7 +49,7 @@ void IconsManager::updateParserIcons(const QString &iconSet, int size)
void IconsManager::updateActionIcons(const QString iconSet, int size)
{
- QString iconFolder = QString(":/icons/images/%1/").arg(iconSet);
+ QString iconFolder = QString(":/icons/images/%1/actions/").arg(iconSet);
mActionIconSize = QSize(size,size);
mIconPixmaps.insert(ACTION_MISC_BACK, createSVGIcon(iconFolder+"00Misc-01Back.svg",size,size));
mIconPixmaps.insert(ACTION_MISC_FORWARD, createSVGIcon(iconFolder+"00Misc-02Forward.svg",size,size));
diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp
index 078d5ae7..1ee53929 100644
--- a/RedPandaIDE/mainwindow.cpp
+++ b/RedPandaIDE/mainwindow.cpp
@@ -325,7 +325,7 @@ void MainWindow::updateForEncodingInfo() {
void MainWindow::updateEditorSettings()
{
- pIconsManager->updateEditorGuttorIcons("editor",pointToPixel(pSettings->editor().fontSize()));
+ pIconsManager->updateEditorGuttorIcons(pSettings->environment().iconSet(),pointToPixel(pSettings->editor().fontSize()));
mEditorList->applySettings();
}
@@ -550,7 +550,7 @@ void MainWindow::applySettings()
font.setStyleStrategy(QFont::PreferAntialias);
qApp->setFont(font);
this->setFont(font);
- pIconsManager->updateParserIcons("classparser",pointToPixel(pSettings->environment().interfaceFontSize()));
+ pIconsManager->updateParserIcons(pSettings->environment().iconSet(),pointToPixel(pSettings->environment().interfaceFontSize()));
QFont caseEditorFont(pSettings->executor().caseEditorFontName());
caseEditorFont.setPixelSize(pointToPixel(pSettings->executor().caseEditorFontSize()));
@@ -586,6 +586,8 @@ void MainWindow::applySettings()
if (idxProblemSet>=0)
ui->tabInfos->removeTab(idxProblemSet);
}
+ //icon sets for editors
+ updateEditorSettings();
updateDebuggerSettings();
updateActionIcons();
}
@@ -1100,7 +1102,7 @@ void MainWindow::updateDebuggerSettings()
void MainWindow::updateActionIcons()
{
int size = pointToPixel(pSettings->environment().interfaceFontSize());
- pIconsManager->updateActionIcons("newlook", size);
+ pIconsManager->updateActionIcons(pSettings->environment().iconSet(), size);
QSize iconSize(size,size);
ui->toolbarMain->setIconSize(iconSize);
ui->toolbarCode->setIconSize(iconSize);
diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp
index e541b160..7df42b07 100644
--- a/RedPandaIDE/settings.cpp
+++ b/RedPandaIDE/settings.cpp
@@ -2446,6 +2446,17 @@ void Settings::CompilerSets::findSets()
clearSets();
addSets(includeTrailingPathDelimiter(mSettings->dirs().app())+"MinGW32");
addSets(includeTrailingPathDelimiter(mSettings->dirs().app())+"MinGW64");
+
+ QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+ QString path = env.value("PATH");
+ QStringList pathList = path.split(PATH_SEPARATOR);
+ foreach (const QString& s, pathList){
+ if (s.endsWith(QString(QDir::separator())+"bin")) {
+ QString temp = s.mid(0,s.length()-4);
+ qDebug()<cbTheme->addItem(name);
// }
- ui->cbLanguage->addItem("English","en");
+ ui->cbLanguage->addItem(tr("English"),"en");
ui->cbLanguage->addItem(tr("Simplified Chinese"),"zh_CN");
+ ui->cbIconSet->addItem("newlook");
}
EnvironmentAppearenceWidget::~EnvironmentAppearenceWidget()
@@ -34,6 +35,7 @@ void EnvironmentAppearenceWidget::doLoad()
ui->cbTheme->setCurrentText(pSettings->environment().theme());
ui->cbFont->setCurrentFont(QFont(pSettings->environment().interfaceFont()));
ui->spinFontSize->setValue(pSettings->environment().interfaceFontSize());
+ ui->cbIconSet->setCurrentText(pSettings->environment().iconSet());
for (int i=0;icbLanguage->count();i++) {
if (ui->cbLanguage->itemData(i) == pSettings->environment().language()) {
@@ -57,7 +59,7 @@ void EnvironmentAppearenceWidget::doSave()
pSettings->environment().setInterfaceFont(ui->cbFont->currentFont().family());
pSettings->environment().setInterfaceFontSize(ui->spinFontSize->value());
pSettings->environment().setLanguage(ui->cbLanguage->currentData().toString());
-
+ pSettings->environment().setIconSet(ui->cbIconSet->currentText());
pSettings->editor().save();
pSettings->environment().save();
pMainWindow->applySettings();
diff --git a/RedPandaIDE/settingsdialog/environmentappearencewidget.ui b/RedPandaIDE/settingsdialog/environmentappearencewidget.ui
index c6272357..e2ab34bc 100644
--- a/RedPandaIDE/settingsdialog/environmentappearencewidget.ui
+++ b/RedPandaIDE/settingsdialog/environmentappearencewidget.ui
@@ -14,14 +14,14 @@
Form
- -
-
+
-
+
- Font Size:
+ Font:
- -
+
-
Qt::Vertical
@@ -34,23 +34,9 @@
- -
-
-
- Theme:
-
-
-
- -
-
-
- Font:
-
-
-
- -
-
-
+
-
+
+
0
@@ -64,10 +50,17 @@
0
-
-
+
-
-
+
+
+ *Needs restart
+
+
+
+ -
+
Qt::Horizontal
@@ -82,6 +75,13 @@
+ -
+
+
+ Theme:
+
+
+
-
@@ -120,6 +120,54 @@
+ -
+
+
+ Language:
+
+
+
+ -
+
+
+ Font Size:
+
+
+
+ -
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
-
@@ -155,15 +203,15 @@
-
-
+
- Language:
+ Icon Set:
-
-
-
+
+
0
@@ -177,17 +225,10 @@
0
-
-
+
-
-
-
- *Needs restart
-
-
-
- -
-
+
Qt::Horizontal