diff --git a/NEWS.md b/NEWS.md index ebe84c8c..577d801e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -10,6 +10,7 @@ Red Panda C++ Version 0.13.4 - enhancement: setting non-ascii font for editors - enhancement: correct handle windows dpi change event - enhancement: code completion find words with char in the middle + - enhancement: custom icon set ( in the configuration folder) Red Panda C++ Version 0.13.3 - enhancement: restore editor position after rename symbol diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.qm b/RedPandaIDE/RedPandaIDE_zh_CN.qm index 473da76d..d7900fe4 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 e711c4b5..0bb494e7 100644 --- a/RedPandaIDE/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/RedPandaIDE_zh_CN.ts @@ -1272,40 +1272,40 @@ Are you really want to continue? 打印文档 - - - + + + Ctrl+click for more info Ctrl+单击以获取更多信息 - - + + Symbol '%1' not found! 未找到符号'%1'! - + astyle not found 找不到astyle程序 - + Can't find astyle in "%1". 找不到astyle程序"%1". - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Readonly 只读 @@ -1997,6 +1997,11 @@ Are you really want to continue? Icon Set: 图标集: + + + Use custom icon set + 使用自定义图标 + Font: @@ -3223,18 +3228,18 @@ Are you really want to continue? MainWindow - + Red Panda C++ 小熊猫C++ - - - - - + + + + + Issues 编译器 @@ -3310,7 +3315,7 @@ Are you really want to continue? - + Debug Console 调试主控台 @@ -3386,7 +3391,7 @@ Are you really want to continue? 工具栏2 - + New 新建 @@ -3444,8 +3449,8 @@ Are you really want to continue? - + Compile 编译 @@ -3491,8 +3496,8 @@ Are you really want to continue? - - + + Copy 复制 @@ -3503,7 +3508,7 @@ Are you really want to continue? - + Paste 粘贴 @@ -3514,7 +3519,7 @@ Are you really want to continue? - + Select All 选择全部 @@ -3634,14 +3639,14 @@ Are you really want to continue? - + Problem Set 试题集 - + New Problem Set 新建试题集 @@ -3660,14 +3665,14 @@ Are you really want to continue? - + Save Problem Set 保存试题集 - + Load Problem Set 载入试题集 @@ -3703,7 +3708,7 @@ Are you really want to continue? - + Problem 试题 @@ -4007,7 +4012,7 @@ Are you really want to continue? - + Clear all breakpoints 删除所有断点 @@ -4108,7 +4113,7 @@ Are you really want to continue? - + Rename Symbol 重命名符号 @@ -4129,13 +4134,13 @@ Are you really want to continue? - + Export As RTF 导出为RTF - + Export As HTML 导出为HTML @@ -4281,7 +4286,7 @@ Are you really want to continue? - + Open Folder 打开文件夹 @@ -4291,42 +4296,42 @@ Are you really want to continue? 运行参数... - + File Encoding 文件编码 - + Recent Files 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -4335,193 +4340,193 @@ 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 打开源代码文件 - + Show detail debug logs 显示详细调试器日志 - + Copy all 全部复制 - - + + Clear 清除 - + Export 导出 - + Insert Snippet 插入代码段 - - + + Problem Set %1 试题集%1 @@ -4542,68 +4547,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: 描述: @@ -4612,240 +4617,240 @@ 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 @@ -4854,222 +4859,222 @@ 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 添加到项目 - + 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 - - - - - - - - - - - - + + + + + + + + + + + - + + Error 错误 - + Recent Projects 项目历史 - + 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个文件) @@ -5925,7 +5930,7 @@ Are you really want to continue? QApplication - + Error 错误 @@ -5979,221 +5984,221 @@ Are you really want to continue? - - + + Error 错误 - + Can't create configuration folder %1 无法创建配置文件夹"%1" - + Can't write to configuration file %1 无法写入配置文件夹"%1" - + Can't load autolink settings 无法载入自动链接设置 - - - - + + + + The following %1 directories don't exist: 下列%1文件夹不存在: - - + + binary 二进制 - + No %1 directories have been specified. 未指定%1文件夹 - + C include C包含 - - + + C++ include C++包含 - - - - + + + + Cannot find the %1 "%2" 无法找到%1程序"%2" - + C Compiler C编译器 - + C++ Compiler C++编译器 - + Maker 构建程序(Make) - + Debugger 调试器 - + C options C语言选项 - + Support all ANSI standard C programs (-ansi) 支持所有ANSI标准C程序(-ansi) - + Do not recognize asm,inline or typeof as a keyword (-fno-asm) 不支持将asm、inline和typeof作为关键字(-fno-asm) - + Imitate traditional C preprocessors (-traditional-cpp) 模仿传统C预处理器行为(-traditional-cpp) - + Code Generation 代码生成 - + Optimize for the following machine (-march) 生成特定机器的专用指令(-march) - + Optimize less, while maintaining full compatibility (-tune) 完整兼容特定机器,较少优化(-tune) - + Enable use of specific instructions (-mx) 启用特定指令集(-mx) - + Optimization level (-Ox) 优化级别(-Ox) - + Compile with the following pointer size (-mx) 使用下列指针大小编译(-mx) - + Language standard (-std) 语言标准(-std) - + Profile 性能分析 - + Generate debugging information (-g3) 生成调试信息(-g3) - + Would you like Red Panda C++ to search for compilers in PATH? 您同意小熊猫C++在PATH路径中寻找gcc编译器吗? - + Generate profiling info for analysis (-pg) 生成性能分析信息(-pg) - + Warnings 代码警告 - + Inhibit all warning messages (-w) 忽略所有警告信息(-w) - + Show most warnings (-Wall) 启用常见问题警告(-Wall) - + Show some more warnings (-Wextra) 启用更多问题警告(-Wextra) - + Check ISO C/C++/C++0x conformance (-pedantic) 检查ISO C/C++/C++0x语法一致性(-pedantic) - + Only check the code for syntax errors (-fsyntax-only) 只进行语法检查(不编译)(-fsyntax-only) - + Make all warnings into errors (-Werror) 将警告作为错误处理(-Werror) - + Abort compilation on first error (-Wfatal-errors) 遇到第一个错误后立即中止编译(-Wfatal-errors) - + Linker 链接器 - + Link an Objective C program (-lobjc) 链接Objective-C程序 (-lobjc) - + Do not use standard system libraries (-nostdlib) 不使用标准库和系统启动文件(-nostdlib) - + Do not create a console window (-mwindows) 不产生控制台窗口(-mwindows) - + Strip executable (-s) 剥除附加信息(-s) @@ -6202,54 +6207,54 @@ Are you really want to continue? 链接Ojbective C程序(-lobjc) - + Output 输出 - + Put comments in generated assembly code (-fverbose-asm) 在生成的汇编代码中加入注释(-fverbose-asm) - + Use pipes instead of temporary files during compilation (-pipe) 编译时使用管道而不是临时文件(-pipe) - + Do not assemble, compile and generate the assemble code (-S) 只生成汇编代码(-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 @@ -6292,27 +6297,27 @@ Are you really want to continue? 无标题 - + Index %1 out of range 下标"%1"越界 - + bytes 字节 - + KB KB - + MB MB - + GB GB @@ -7083,7 +7088,7 @@ Are you really want to continue? 自动链接 - + @@ -7159,15 +7164,15 @@ Are you really want to continue? 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 diff --git a/RedPandaIDE/icons.qrc b/RedPandaIDE/icons.qrc index 557b8613..1001c686 100644 --- a/RedPandaIDE/icons.qrc +++ b/RedPandaIDE/icons.qrc @@ -108,110 +108,112 @@ images/associations/rc.ico images/associations/template.ico images/dark-close.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/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/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/05Run-16Interrupt.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 - images/newlook/actions/08Problem-06Correct.svg - images/newlook/actions/08Problem-07Wrong.svg - images/newlook/actions/08Problem-08Running.svg + + + resources/iconsets/newlook/classparser/class.svg + resources/iconsets/newlook/classparser/define.svg + resources/iconsets/newlook/classparser/enum.svg + resources/iconsets/newlook/classparser/global.svg + resources/iconsets/newlook/classparser/global_method.svg + resources/iconsets/newlook/classparser/method_inherited.svg + resources/iconsets/newlook/classparser/method_inherited_protected.svg + resources/iconsets/newlook/classparser/method_private.svg + resources/iconsets/newlook/classparser/method_protected.svg + resources/iconsets/newlook/classparser/method_public.svg + resources/iconsets/newlook/classparser/namespace.svg + resources/iconsets/newlook/classparser/static_method.svg + resources/iconsets/newlook/classparser/static_var.svg + resources/iconsets/newlook/classparser/type.svg + resources/iconsets/newlook/classparser/var_inherited.svg + resources/iconsets/newlook/classparser/var_inherited_protected.svg + resources/iconsets/newlook/classparser/var_private.svg + resources/iconsets/newlook/classparser/var_protected.svg + resources/iconsets/newlook/classparser/var_public.svg + resources/iconsets/newlook/editor/bookmark.svg + resources/iconsets/newlook/editor/breakpoint.svg + resources/iconsets/newlook/editor/currentline.svg + resources/iconsets/newlook/editor/syntaxerror.svg + resources/iconsets/newlook/editor/syntaxwarning.svg + resources/iconsets/newlook/actions/00Misc-01Back.svg + resources/iconsets/newlook/actions/00Misc-02Forward.svg + resources/iconsets/newlook/actions/00Misc-03Add.svg + resources/iconsets/newlook/actions/00Misc-04Remove.svg + resources/iconsets/newlook/actions/00Misc-05Gear.svg + resources/iconsets/newlook/actions/00Misc-06Cross.svg + resources/iconsets/newlook/actions/00Misc-07Folder.svg + resources/iconsets/newlook/actions/00Misc-08Term.svg + resources/iconsets/newlook/actions/00Misc-09Clean.svg + resources/iconsets/newlook/actions/00Misc-10Check.svg + resources/iconsets/newlook/actions/00Misc-11Rename.svg + resources/iconsets/newlook/actions/00Misc-12Help.svg + resources/iconsets/newlook/actions/01File-01New.svg + resources/iconsets/newlook/actions/01File-02Open.svg + resources/iconsets/newlook/actions/01File-03Save.svg + resources/iconsets/newlook/actions/01File-04SaveAs.svg + resources/iconsets/newlook/actions/01File-05SaveAll.svg + resources/iconsets/newlook/actions/01File-06Close.svg + resources/iconsets/newlook/actions/01File-07CloseAll.svg + resources/iconsets/newlook/actions/01File-08Print.svg + resources/iconsets/newlook/actions/01File-09Open_Folder.svg + resources/iconsets/newlook/actions/01File-10FileProperties.svg + resources/iconsets/newlook/actions/01File-11Locate.svg + resources/iconsets/newlook/actions/02Project-01New.svg + resources/iconsets/newlook/actions/02Project-02Save.svg + resources/iconsets/newlook/actions/02Project-03Close.svg + resources/iconsets/newlook/actions/02Project-04NewFile.svg + resources/iconsets/newlook/actions/02Project-05AddFile.svg + resources/iconsets/newlook/actions/02Project-06RemoveFile.svg + resources/iconsets/newlook/actions/02Project-07Properties.svg + resources/iconsets/newlook/actions/03Edit-01Undo.svg + resources/iconsets/newlook/actions/03Edit-02Redo.svg + resources/iconsets/newlook/actions/03Edit-03Cut.svg + resources/iconsets/newlook/actions/03Edit-04Copy.svg + resources/iconsets/newlook/actions/03Edit-05Paste.svg + resources/iconsets/newlook/actions/03Edit-06Indent.svg + resources/iconsets/newlook/actions/03Edit-07Unindent.svg + resources/iconsets/newlook/actions/03Edit-08Search.svg + resources/iconsets/newlook/actions/03Edit-09Replace.svg + resources/iconsets/newlook/actions/03Edit-10SearchInFiles.svg + resources/iconsets/newlook/actions/03Edit-11SortByName.svg + resources/iconsets/newlook/actions/03Edit-12ShowInherited.svg + resources/iconsets/newlook/actions/03Edit-12SortByType.svg + resources/iconsets/newlook/actions/03Edit-13ShowInherited.svg + resources/iconsets/newlook/actions/04Code-01Back.svg + resources/iconsets/newlook/actions/04Code-02Forward.svg + resources/iconsets/newlook/actions/04Code-03AddBookmark.svg + resources/iconsets/newlook/actions/04Code-04RemoveBookmark.svg + resources/iconsets/newlook/actions/04Code-05Reformat.svg + resources/iconsets/newlook/actions/05Run-01Compile.svg + resources/iconsets/newlook/actions/05Run-02CompileRun.svg + resources/iconsets/newlook/actions/05Run-03Run.svg + resources/iconsets/newlook/actions/05Run-04Rebuild.svg + resources/iconsets/newlook/actions/05Run-05Options.svg + resources/iconsets/newlook/actions/05Run-06Debug.svg + resources/iconsets/newlook/actions/05Run-07StepOver.svg + resources/iconsets/newlook/actions/05Run-08StepInto.svg + resources/iconsets/newlook/actions/05Run-08StepOut.svg + resources/iconsets/newlook/actions/05Run-09RunToCursor.svg + resources/iconsets/newlook/actions/05Run-10Continue.svg + resources/iconsets/newlook/actions/05Run-11Stop.svg + resources/iconsets/newlook/actions/05Run-12AddWatch.svg + resources/iconsets/newlook/actions/05Run-13RemoveWatch.svg + resources/iconsets/newlook/actions/05Run-14StepOverInstruction.svg + resources/iconsets/newlook/actions/05Run-15StepIntoInstruction.svg + resources/iconsets/newlook/actions/05Run-16Interrupt.svg + resources/iconsets/newlook/actions/06View-01Maximum.svg + resources/iconsets/newlook/actions/06View-02ClassBrowser.svg + resources/iconsets/newlook/actions/06View-03Files.svg + resources/iconsets/newlook/actions/06View-04CompileLog.svg + resources/iconsets/newlook/actions/06View-05Bookmark.svg + resources/iconsets/newlook/actions/06View-06Todo.svg + resources/iconsets/newlook/actions/07Help-01About.svg + resources/iconsets/newlook/actions/08Problem-01Problem.svg + resources/iconsets/newlook/actions/08Problem-02ProblemSet.svg + resources/iconsets/newlook/actions/08Problem-03Properties.svg + resources/iconsets/newlook/actions/08Problem-04EditSource.svg + resources/iconsets/newlook/actions/08Problem-05RunCases.svg + resources/iconsets/newlook/actions/08Problem-06Correct.svg + resources/iconsets/newlook/actions/08Problem-07Wrong.svg + resources/iconsets/newlook/actions/08Problem-08Running.svg diff --git a/RedPandaIDE/iconsmanager.cpp b/RedPandaIDE/iconsmanager.cpp index d010f0f9..eddbc736 100644 --- a/RedPandaIDE/iconsmanager.cpp +++ b/RedPandaIDE/iconsmanager.cpp @@ -22,6 +22,9 @@ #include #include #include +#include +#include +#include "utils.h" IconsManager* pIconsManager; @@ -32,7 +35,9 @@ IconsManager::IconsManager(QObject *parent) : QObject(parent) void IconsManager::updateEditorGuttorIcons(const QString& iconSet,int size) { - QString iconFolder = QString(":/icons/images/%1/editor/").arg(iconSet); + QString iconFolder = QString(":/resources/iconsets/%1/editor/").arg(iconSet); + if (!mIconSetPathTemplate.isEmpty()) + iconFolder = mIconSetPathTemplate.arg(iconSet,"editor"); 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)); @@ -42,7 +47,9 @@ void IconsManager::updateEditorGuttorIcons(const QString& iconSet,int size) void IconsManager::updateParserIcons(const QString &iconSet, int size) { - QString iconFolder = QString(":/icons/images/%1/classparser/").arg(iconSet); + QString iconFolder = QString(":/resources/iconsets/%1/classparser/").arg(iconSet); + if (!mIconSetPathTemplate.isEmpty()) + iconFolder = mIconSetPathTemplate.arg(iconSet,"classparser"); 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)); @@ -65,7 +72,9 @@ void IconsManager::updateParserIcons(const QString &iconSet, int size) void IconsManager::updateActionIcons(const QString iconSet, int size) { - QString iconFolder = QString(":/icons/images/%1/actions/").arg(iconSet); + QString iconFolder = QString(":/resources/iconsets/%1/actions/").arg(iconSet); + if (!mIconSetPathTemplate.isEmpty()) + iconFolder = mIconSetPathTemplate.arg(iconSet,"actions"); 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)); @@ -195,3 +204,20 @@ const QSize &IconsManager::actionIconSize() const { return mActionIconSize; } + +const QString &IconsManager::iconSetPathTemplate() const +{ + return mIconSetPathTemplate; +} + +void IconsManager::setIconSetPathTemplate(const QString &newIconSetPathTemplate) +{ + mIconSetPathTemplate = newIconSetPathTemplate; +} + +void IconsManager::prepareCustomIconSet(const QString &customIconSet) +{ + if (QFile(customIconSet).exists()) + return; + copyFolder(":/resources/iconsets",customIconSet); +} diff --git a/RedPandaIDE/iconsmanager.h b/RedPandaIDE/iconsmanager.h index f869a510..caa4f387 100644 --- a/RedPandaIDE/iconsmanager.h +++ b/RedPandaIDE/iconsmanager.h @@ -159,12 +159,19 @@ public: PPixmap createSVGIcon(const QString& filename, int width, int height); const QSize &actionIconSize() const; + + const QString &iconSetPathTemplate() const; + void setIconSetPathTemplate(const QString &newIconSetPathTemplate); + + void prepareCustomIconSet(const QString &customIconSet); + signals: void actionIconsUpdated(); private: QMap mIconPixmaps; PPixmap mDefaultIconPixmap; QSize mActionIconSize; + QString mIconSetPathTemplate; }; extern IconsManager* pIconsManager; diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index eb3c8153..3afcc388 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -582,6 +582,14 @@ void MainWindow::applySettings() for (QWidget* p:findChildren()) { p->setFont(font); } + if (pSettings->environment().useCustomIconSet()) { + QString customIconSetPath = pSettings->dirs().config(Settings::Dirs::DataType::IconSet); + pIconsManager->prepareCustomIconSet(customIconSetPath); + pIconsManager->setIconSetPathTemplate( + includeTrailingPathDelimiter(customIconSetPath) + +"%1/%2/" + ); + } pIconsManager->updateParserIcons(pSettings->environment().iconSet(),pointToPixel(pSettings->environment().interfaceFontSize())); QFont caseEditorFont(pSettings->executor().caseEditorFontName()); diff --git a/RedPandaIDE/images/newlook/actions/00Misc-01Back.svg b/RedPandaIDE/resources/iconsets/newlook/actions/00Misc-01Back.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/00Misc-01Back.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/00Misc-01Back.svg diff --git a/RedPandaIDE/images/newlook/actions/00Misc-02Forward.svg b/RedPandaIDE/resources/iconsets/newlook/actions/00Misc-02Forward.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/00Misc-02Forward.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/00Misc-02Forward.svg diff --git a/RedPandaIDE/images/newlook/actions/00Misc-03Add.svg b/RedPandaIDE/resources/iconsets/newlook/actions/00Misc-03Add.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/00Misc-03Add.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/00Misc-03Add.svg diff --git a/RedPandaIDE/images/newlook/actions/00Misc-04Remove.svg b/RedPandaIDE/resources/iconsets/newlook/actions/00Misc-04Remove.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/00Misc-04Remove.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/00Misc-04Remove.svg diff --git a/RedPandaIDE/images/newlook/actions/00Misc-05Gear.svg b/RedPandaIDE/resources/iconsets/newlook/actions/00Misc-05Gear.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/00Misc-05Gear.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/00Misc-05Gear.svg diff --git a/RedPandaIDE/images/newlook/actions/00Misc-06Cross.svg b/RedPandaIDE/resources/iconsets/newlook/actions/00Misc-06Cross.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/00Misc-06Cross.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/00Misc-06Cross.svg diff --git a/RedPandaIDE/images/newlook/actions/00Misc-07Folder.svg b/RedPandaIDE/resources/iconsets/newlook/actions/00Misc-07Folder.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/00Misc-07Folder.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/00Misc-07Folder.svg diff --git a/RedPandaIDE/images/newlook/actions/00Misc-08Term.svg b/RedPandaIDE/resources/iconsets/newlook/actions/00Misc-08Term.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/00Misc-08Term.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/00Misc-08Term.svg diff --git a/RedPandaIDE/images/newlook/actions/00Misc-09Clean.svg b/RedPandaIDE/resources/iconsets/newlook/actions/00Misc-09Clean.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/00Misc-09Clean.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/00Misc-09Clean.svg diff --git a/RedPandaIDE/images/newlook/actions/00Misc-10Check.svg b/RedPandaIDE/resources/iconsets/newlook/actions/00Misc-10Check.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/00Misc-10Check.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/00Misc-10Check.svg diff --git a/RedPandaIDE/images/newlook/actions/00Misc-11Rename.svg b/RedPandaIDE/resources/iconsets/newlook/actions/00Misc-11Rename.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/00Misc-11Rename.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/00Misc-11Rename.svg diff --git a/RedPandaIDE/images/newlook/actions/00Misc-12Help.svg b/RedPandaIDE/resources/iconsets/newlook/actions/00Misc-12Help.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/00Misc-12Help.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/00Misc-12Help.svg diff --git a/RedPandaIDE/images/newlook/actions/01File-01New.svg b/RedPandaIDE/resources/iconsets/newlook/actions/01File-01New.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/01File-01New.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/01File-01New.svg diff --git a/RedPandaIDE/images/newlook/actions/01File-02Open.svg b/RedPandaIDE/resources/iconsets/newlook/actions/01File-02Open.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/01File-02Open.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/01File-02Open.svg diff --git a/RedPandaIDE/images/newlook/actions/01File-03Save.svg b/RedPandaIDE/resources/iconsets/newlook/actions/01File-03Save.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/01File-03Save.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/01File-03Save.svg diff --git a/RedPandaIDE/images/newlook/actions/01File-04SaveAs.svg b/RedPandaIDE/resources/iconsets/newlook/actions/01File-04SaveAs.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/01File-04SaveAs.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/01File-04SaveAs.svg diff --git a/RedPandaIDE/images/newlook/actions/01File-05SaveAll.svg b/RedPandaIDE/resources/iconsets/newlook/actions/01File-05SaveAll.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/01File-05SaveAll.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/01File-05SaveAll.svg diff --git a/RedPandaIDE/images/newlook/actions/01File-06Close.svg b/RedPandaIDE/resources/iconsets/newlook/actions/01File-06Close.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/01File-06Close.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/01File-06Close.svg diff --git a/RedPandaIDE/images/newlook/actions/01File-07CloseAll.svg b/RedPandaIDE/resources/iconsets/newlook/actions/01File-07CloseAll.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/01File-07CloseAll.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/01File-07CloseAll.svg diff --git a/RedPandaIDE/images/newlook/actions/01File-08Print.svg b/RedPandaIDE/resources/iconsets/newlook/actions/01File-08Print.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/01File-08Print.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/01File-08Print.svg diff --git a/RedPandaIDE/images/newlook/actions/01File-09Open_Folder.svg b/RedPandaIDE/resources/iconsets/newlook/actions/01File-09Open_Folder.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/01File-09Open_Folder.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/01File-09Open_Folder.svg diff --git a/RedPandaIDE/images/newlook/actions/01File-10FileProperties.svg b/RedPandaIDE/resources/iconsets/newlook/actions/01File-10FileProperties.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/01File-10FileProperties.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/01File-10FileProperties.svg diff --git a/RedPandaIDE/images/newlook/actions/01File-11Locate.svg b/RedPandaIDE/resources/iconsets/newlook/actions/01File-11Locate.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/01File-11Locate.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/01File-11Locate.svg diff --git a/RedPandaIDE/images/newlook/actions/02Project-01New.svg b/RedPandaIDE/resources/iconsets/newlook/actions/02Project-01New.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/02Project-01New.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/02Project-01New.svg diff --git a/RedPandaIDE/images/newlook/actions/02Project-02Save.svg b/RedPandaIDE/resources/iconsets/newlook/actions/02Project-02Save.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/02Project-02Save.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/02Project-02Save.svg diff --git a/RedPandaIDE/images/newlook/actions/02Project-03Close.svg b/RedPandaIDE/resources/iconsets/newlook/actions/02Project-03Close.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/02Project-03Close.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/02Project-03Close.svg diff --git a/RedPandaIDE/images/newlook/actions/02Project-04NewFile.svg b/RedPandaIDE/resources/iconsets/newlook/actions/02Project-04NewFile.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/02Project-04NewFile.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/02Project-04NewFile.svg diff --git a/RedPandaIDE/images/newlook/actions/02Project-05AddFile.svg b/RedPandaIDE/resources/iconsets/newlook/actions/02Project-05AddFile.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/02Project-05AddFile.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/02Project-05AddFile.svg diff --git a/RedPandaIDE/images/newlook/actions/02Project-06RemoveFile.svg b/RedPandaIDE/resources/iconsets/newlook/actions/02Project-06RemoveFile.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/02Project-06RemoveFile.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/02Project-06RemoveFile.svg diff --git a/RedPandaIDE/images/newlook/actions/02Project-07Properties.svg b/RedPandaIDE/resources/iconsets/newlook/actions/02Project-07Properties.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/02Project-07Properties.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/02Project-07Properties.svg diff --git a/RedPandaIDE/images/newlook/actions/03Edit-01Undo.svg b/RedPandaIDE/resources/iconsets/newlook/actions/03Edit-01Undo.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/03Edit-01Undo.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/03Edit-01Undo.svg diff --git a/RedPandaIDE/images/newlook/actions/03Edit-02Redo.svg b/RedPandaIDE/resources/iconsets/newlook/actions/03Edit-02Redo.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/03Edit-02Redo.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/03Edit-02Redo.svg diff --git a/RedPandaIDE/images/newlook/actions/03Edit-03Cut.svg b/RedPandaIDE/resources/iconsets/newlook/actions/03Edit-03Cut.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/03Edit-03Cut.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/03Edit-03Cut.svg diff --git a/RedPandaIDE/images/newlook/actions/03Edit-04Copy.svg b/RedPandaIDE/resources/iconsets/newlook/actions/03Edit-04Copy.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/03Edit-04Copy.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/03Edit-04Copy.svg diff --git a/RedPandaIDE/images/newlook/actions/03Edit-05Paste.svg b/RedPandaIDE/resources/iconsets/newlook/actions/03Edit-05Paste.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/03Edit-05Paste.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/03Edit-05Paste.svg diff --git a/RedPandaIDE/images/newlook/actions/03Edit-06Indent.svg b/RedPandaIDE/resources/iconsets/newlook/actions/03Edit-06Indent.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/03Edit-06Indent.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/03Edit-06Indent.svg diff --git a/RedPandaIDE/images/newlook/actions/03Edit-07Unindent.svg b/RedPandaIDE/resources/iconsets/newlook/actions/03Edit-07Unindent.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/03Edit-07Unindent.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/03Edit-07Unindent.svg diff --git a/RedPandaIDE/images/newlook/actions/03Edit-08Search.svg b/RedPandaIDE/resources/iconsets/newlook/actions/03Edit-08Search.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/03Edit-08Search.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/03Edit-08Search.svg diff --git a/RedPandaIDE/images/newlook/actions/03Edit-09Replace.svg b/RedPandaIDE/resources/iconsets/newlook/actions/03Edit-09Replace.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/03Edit-09Replace.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/03Edit-09Replace.svg diff --git a/RedPandaIDE/images/newlook/actions/03Edit-10SearchInFiles.svg b/RedPandaIDE/resources/iconsets/newlook/actions/03Edit-10SearchInFiles.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/03Edit-10SearchInFiles.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/03Edit-10SearchInFiles.svg diff --git a/RedPandaIDE/images/newlook/actions/03Edit-11SortByName.svg b/RedPandaIDE/resources/iconsets/newlook/actions/03Edit-11SortByName.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/03Edit-11SortByName.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/03Edit-11SortByName.svg diff --git a/RedPandaIDE/images/newlook/actions/03Edit-12ShowInherited.svg b/RedPandaIDE/resources/iconsets/newlook/actions/03Edit-12ShowInherited.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/03Edit-12ShowInherited.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/03Edit-12ShowInherited.svg diff --git a/RedPandaIDE/images/newlook/actions/03Edit-12SortByType.svg b/RedPandaIDE/resources/iconsets/newlook/actions/03Edit-12SortByType.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/03Edit-12SortByType.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/03Edit-12SortByType.svg diff --git a/RedPandaIDE/images/newlook/actions/03Edit-13ShowInherited.svg b/RedPandaIDE/resources/iconsets/newlook/actions/03Edit-13ShowInherited.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/03Edit-13ShowInherited.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/03Edit-13ShowInherited.svg diff --git a/RedPandaIDE/images/newlook/actions/04Code-01Back.svg b/RedPandaIDE/resources/iconsets/newlook/actions/04Code-01Back.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/04Code-01Back.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/04Code-01Back.svg diff --git a/RedPandaIDE/images/newlook/actions/04Code-02Forward.svg b/RedPandaIDE/resources/iconsets/newlook/actions/04Code-02Forward.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/04Code-02Forward.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/04Code-02Forward.svg diff --git a/RedPandaIDE/images/newlook/actions/04Code-03AddBookmark.svg b/RedPandaIDE/resources/iconsets/newlook/actions/04Code-03AddBookmark.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/04Code-03AddBookmark.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/04Code-03AddBookmark.svg diff --git a/RedPandaIDE/images/newlook/actions/04Code-04RemoveBookmark.svg b/RedPandaIDE/resources/iconsets/newlook/actions/04Code-04RemoveBookmark.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/04Code-04RemoveBookmark.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/04Code-04RemoveBookmark.svg diff --git a/RedPandaIDE/images/newlook/actions/04Code-05Reformat.svg b/RedPandaIDE/resources/iconsets/newlook/actions/04Code-05Reformat.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/04Code-05Reformat.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/04Code-05Reformat.svg diff --git a/RedPandaIDE/images/newlook/actions/05Run-01Compile.svg b/RedPandaIDE/resources/iconsets/newlook/actions/05Run-01Compile.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/05Run-01Compile.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/05Run-01Compile.svg diff --git a/RedPandaIDE/images/newlook/actions/05Run-02CompileRun.svg b/RedPandaIDE/resources/iconsets/newlook/actions/05Run-02CompileRun.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/05Run-02CompileRun.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/05Run-02CompileRun.svg diff --git a/RedPandaIDE/images/newlook/actions/05Run-03Run.svg b/RedPandaIDE/resources/iconsets/newlook/actions/05Run-03Run.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/05Run-03Run.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/05Run-03Run.svg diff --git a/RedPandaIDE/images/newlook/actions/05Run-04Rebuild.svg b/RedPandaIDE/resources/iconsets/newlook/actions/05Run-04Rebuild.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/05Run-04Rebuild.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/05Run-04Rebuild.svg diff --git a/RedPandaIDE/images/newlook/actions/05Run-05Options.svg b/RedPandaIDE/resources/iconsets/newlook/actions/05Run-05Options.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/05Run-05Options.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/05Run-05Options.svg diff --git a/RedPandaIDE/images/newlook/actions/05Run-06Debug.svg b/RedPandaIDE/resources/iconsets/newlook/actions/05Run-06Debug.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/05Run-06Debug.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/05Run-06Debug.svg diff --git a/RedPandaIDE/images/newlook/actions/05Run-07StepOver.svg b/RedPandaIDE/resources/iconsets/newlook/actions/05Run-07StepOver.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/05Run-07StepOver.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/05Run-07StepOver.svg diff --git a/RedPandaIDE/images/newlook/actions/05Run-08StepInto.svg b/RedPandaIDE/resources/iconsets/newlook/actions/05Run-08StepInto.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/05Run-08StepInto.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/05Run-08StepInto.svg diff --git a/RedPandaIDE/images/newlook/actions/05Run-08StepOut.svg b/RedPandaIDE/resources/iconsets/newlook/actions/05Run-08StepOut.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/05Run-08StepOut.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/05Run-08StepOut.svg diff --git a/RedPandaIDE/images/newlook/actions/05Run-09RunToCursor.svg b/RedPandaIDE/resources/iconsets/newlook/actions/05Run-09RunToCursor.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/05Run-09RunToCursor.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/05Run-09RunToCursor.svg diff --git a/RedPandaIDE/images/newlook/actions/05Run-10Continue.svg b/RedPandaIDE/resources/iconsets/newlook/actions/05Run-10Continue.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/05Run-10Continue.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/05Run-10Continue.svg diff --git a/RedPandaIDE/images/newlook/actions/05Run-11Stop.svg b/RedPandaIDE/resources/iconsets/newlook/actions/05Run-11Stop.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/05Run-11Stop.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/05Run-11Stop.svg diff --git a/RedPandaIDE/images/newlook/actions/05Run-12AddWatch.svg b/RedPandaIDE/resources/iconsets/newlook/actions/05Run-12AddWatch.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/05Run-12AddWatch.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/05Run-12AddWatch.svg diff --git a/RedPandaIDE/images/newlook/actions/05Run-13RemoveWatch.svg b/RedPandaIDE/resources/iconsets/newlook/actions/05Run-13RemoveWatch.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/05Run-13RemoveWatch.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/05Run-13RemoveWatch.svg diff --git a/RedPandaIDE/images/newlook/actions/05Run-14StepOverInstruction.svg b/RedPandaIDE/resources/iconsets/newlook/actions/05Run-14StepOverInstruction.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/05Run-14StepOverInstruction.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/05Run-14StepOverInstruction.svg diff --git a/RedPandaIDE/images/newlook/actions/05Run-15StepIntoInstruction.svg b/RedPandaIDE/resources/iconsets/newlook/actions/05Run-15StepIntoInstruction.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/05Run-15StepIntoInstruction.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/05Run-15StepIntoInstruction.svg diff --git a/RedPandaIDE/images/newlook/actions/05Run-16Interrupt.svg b/RedPandaIDE/resources/iconsets/newlook/actions/05Run-16Interrupt.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/05Run-16Interrupt.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/05Run-16Interrupt.svg diff --git a/RedPandaIDE/images/newlook/actions/06View-01Maximum.svg b/RedPandaIDE/resources/iconsets/newlook/actions/06View-01Maximum.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/06View-01Maximum.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/06View-01Maximum.svg diff --git a/RedPandaIDE/images/newlook/actions/06View-02ClassBrowser.svg b/RedPandaIDE/resources/iconsets/newlook/actions/06View-02ClassBrowser.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/06View-02ClassBrowser.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/06View-02ClassBrowser.svg diff --git a/RedPandaIDE/images/newlook/actions/06View-03Files.svg b/RedPandaIDE/resources/iconsets/newlook/actions/06View-03Files.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/06View-03Files.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/06View-03Files.svg diff --git a/RedPandaIDE/images/newlook/actions/06View-04CompileLog.svg b/RedPandaIDE/resources/iconsets/newlook/actions/06View-04CompileLog.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/06View-04CompileLog.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/06View-04CompileLog.svg diff --git a/RedPandaIDE/images/newlook/actions/06View-05Bookmark.svg b/RedPandaIDE/resources/iconsets/newlook/actions/06View-05Bookmark.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/06View-05Bookmark.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/06View-05Bookmark.svg diff --git a/RedPandaIDE/images/newlook/actions/06View-06Todo.svg b/RedPandaIDE/resources/iconsets/newlook/actions/06View-06Todo.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/06View-06Todo.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/06View-06Todo.svg diff --git a/RedPandaIDE/images/newlook/actions/07Help-01About.svg b/RedPandaIDE/resources/iconsets/newlook/actions/07Help-01About.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/07Help-01About.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/07Help-01About.svg diff --git a/RedPandaIDE/images/newlook/actions/08Problem-01Problem.svg b/RedPandaIDE/resources/iconsets/newlook/actions/08Problem-01Problem.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/08Problem-01Problem.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/08Problem-01Problem.svg diff --git a/RedPandaIDE/images/newlook/actions/08Problem-02ProblemSet.svg b/RedPandaIDE/resources/iconsets/newlook/actions/08Problem-02ProblemSet.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/08Problem-02ProblemSet.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/08Problem-02ProblemSet.svg diff --git a/RedPandaIDE/images/newlook/actions/08Problem-03Properties.svg b/RedPandaIDE/resources/iconsets/newlook/actions/08Problem-03Properties.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/08Problem-03Properties.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/08Problem-03Properties.svg diff --git a/RedPandaIDE/images/newlook/actions/08Problem-04EditSource.svg b/RedPandaIDE/resources/iconsets/newlook/actions/08Problem-04EditSource.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/08Problem-04EditSource.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/08Problem-04EditSource.svg diff --git a/RedPandaIDE/images/newlook/actions/08Problem-05RunCases.svg b/RedPandaIDE/resources/iconsets/newlook/actions/08Problem-05RunCases.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/08Problem-05RunCases.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/08Problem-05RunCases.svg diff --git a/RedPandaIDE/images/newlook/actions/08Problem-06Correct.svg b/RedPandaIDE/resources/iconsets/newlook/actions/08Problem-06Correct.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/08Problem-06Correct.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/08Problem-06Correct.svg diff --git a/RedPandaIDE/images/newlook/actions/08Problem-07Wrong.svg b/RedPandaIDE/resources/iconsets/newlook/actions/08Problem-07Wrong.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/08Problem-07Wrong.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/08Problem-07Wrong.svg diff --git a/RedPandaIDE/images/newlook/actions/08Problem-08Running.svg b/RedPandaIDE/resources/iconsets/newlook/actions/08Problem-08Running.svg similarity index 100% rename from RedPandaIDE/images/newlook/actions/08Problem-08Running.svg rename to RedPandaIDE/resources/iconsets/newlook/actions/08Problem-08Running.svg diff --git a/RedPandaIDE/images/newlook/classparser/class.svg b/RedPandaIDE/resources/iconsets/newlook/classparser/class.svg similarity index 100% rename from RedPandaIDE/images/newlook/classparser/class.svg rename to RedPandaIDE/resources/iconsets/newlook/classparser/class.svg diff --git a/RedPandaIDE/images/newlook/classparser/define.svg b/RedPandaIDE/resources/iconsets/newlook/classparser/define.svg similarity index 100% rename from RedPandaIDE/images/newlook/classparser/define.svg rename to RedPandaIDE/resources/iconsets/newlook/classparser/define.svg diff --git a/RedPandaIDE/images/newlook/classparser/enum.svg b/RedPandaIDE/resources/iconsets/newlook/classparser/enum.svg similarity index 100% rename from RedPandaIDE/images/newlook/classparser/enum.svg rename to RedPandaIDE/resources/iconsets/newlook/classparser/enum.svg diff --git a/RedPandaIDE/images/newlook/classparser/global.svg b/RedPandaIDE/resources/iconsets/newlook/classparser/global.svg similarity index 100% rename from RedPandaIDE/images/newlook/classparser/global.svg rename to RedPandaIDE/resources/iconsets/newlook/classparser/global.svg diff --git a/RedPandaIDE/images/newlook/classparser/global_method.svg b/RedPandaIDE/resources/iconsets/newlook/classparser/global_method.svg similarity index 100% rename from RedPandaIDE/images/newlook/classparser/global_method.svg rename to RedPandaIDE/resources/iconsets/newlook/classparser/global_method.svg diff --git a/RedPandaIDE/images/newlook/classparser/method_inherited.svg b/RedPandaIDE/resources/iconsets/newlook/classparser/method_inherited.svg similarity index 100% rename from RedPandaIDE/images/newlook/classparser/method_inherited.svg rename to RedPandaIDE/resources/iconsets/newlook/classparser/method_inherited.svg diff --git a/RedPandaIDE/images/newlook/classparser/method_inherited_protected.svg b/RedPandaIDE/resources/iconsets/newlook/classparser/method_inherited_protected.svg similarity index 100% rename from RedPandaIDE/images/newlook/classparser/method_inherited_protected.svg rename to RedPandaIDE/resources/iconsets/newlook/classparser/method_inherited_protected.svg diff --git a/RedPandaIDE/images/newlook/classparser/method_private.svg b/RedPandaIDE/resources/iconsets/newlook/classparser/method_private.svg similarity index 100% rename from RedPandaIDE/images/newlook/classparser/method_private.svg rename to RedPandaIDE/resources/iconsets/newlook/classparser/method_private.svg diff --git a/RedPandaIDE/images/newlook/classparser/method_protected.svg b/RedPandaIDE/resources/iconsets/newlook/classparser/method_protected.svg similarity index 100% rename from RedPandaIDE/images/newlook/classparser/method_protected.svg rename to RedPandaIDE/resources/iconsets/newlook/classparser/method_protected.svg diff --git a/RedPandaIDE/images/newlook/classparser/method_public.svg b/RedPandaIDE/resources/iconsets/newlook/classparser/method_public.svg similarity index 100% rename from RedPandaIDE/images/newlook/classparser/method_public.svg rename to RedPandaIDE/resources/iconsets/newlook/classparser/method_public.svg diff --git a/RedPandaIDE/images/newlook/classparser/namespace.svg b/RedPandaIDE/resources/iconsets/newlook/classparser/namespace.svg similarity index 100% rename from RedPandaIDE/images/newlook/classparser/namespace.svg rename to RedPandaIDE/resources/iconsets/newlook/classparser/namespace.svg diff --git a/RedPandaIDE/images/newlook/classparser/static_method.svg b/RedPandaIDE/resources/iconsets/newlook/classparser/static_method.svg similarity index 100% rename from RedPandaIDE/images/newlook/classparser/static_method.svg rename to RedPandaIDE/resources/iconsets/newlook/classparser/static_method.svg diff --git a/RedPandaIDE/images/newlook/classparser/static_var.svg b/RedPandaIDE/resources/iconsets/newlook/classparser/static_var.svg similarity index 100% rename from RedPandaIDE/images/newlook/classparser/static_var.svg rename to RedPandaIDE/resources/iconsets/newlook/classparser/static_var.svg diff --git a/RedPandaIDE/images/newlook/classparser/type.svg b/RedPandaIDE/resources/iconsets/newlook/classparser/type.svg similarity index 100% rename from RedPandaIDE/images/newlook/classparser/type.svg rename to RedPandaIDE/resources/iconsets/newlook/classparser/type.svg diff --git a/RedPandaIDE/images/newlook/classparser/var_inherited.svg b/RedPandaIDE/resources/iconsets/newlook/classparser/var_inherited.svg similarity index 100% rename from RedPandaIDE/images/newlook/classparser/var_inherited.svg rename to RedPandaIDE/resources/iconsets/newlook/classparser/var_inherited.svg diff --git a/RedPandaIDE/images/newlook/classparser/var_inherited_protected.svg b/RedPandaIDE/resources/iconsets/newlook/classparser/var_inherited_protected.svg similarity index 100% rename from RedPandaIDE/images/newlook/classparser/var_inherited_protected.svg rename to RedPandaIDE/resources/iconsets/newlook/classparser/var_inherited_protected.svg diff --git a/RedPandaIDE/images/newlook/classparser/var_private.svg b/RedPandaIDE/resources/iconsets/newlook/classparser/var_private.svg similarity index 100% rename from RedPandaIDE/images/newlook/classparser/var_private.svg rename to RedPandaIDE/resources/iconsets/newlook/classparser/var_private.svg diff --git a/RedPandaIDE/images/newlook/classparser/var_protected.svg b/RedPandaIDE/resources/iconsets/newlook/classparser/var_protected.svg similarity index 100% rename from RedPandaIDE/images/newlook/classparser/var_protected.svg rename to RedPandaIDE/resources/iconsets/newlook/classparser/var_protected.svg diff --git a/RedPandaIDE/images/newlook/classparser/var_public.svg b/RedPandaIDE/resources/iconsets/newlook/classparser/var_public.svg similarity index 100% rename from RedPandaIDE/images/newlook/classparser/var_public.svg rename to RedPandaIDE/resources/iconsets/newlook/classparser/var_public.svg diff --git a/RedPandaIDE/images/newlook/editor/bookmark.svg b/RedPandaIDE/resources/iconsets/newlook/editor/bookmark.svg similarity index 100% rename from RedPandaIDE/images/newlook/editor/bookmark.svg rename to RedPandaIDE/resources/iconsets/newlook/editor/bookmark.svg diff --git a/RedPandaIDE/images/newlook/editor/breakpoint.svg b/RedPandaIDE/resources/iconsets/newlook/editor/breakpoint.svg similarity index 100% rename from RedPandaIDE/images/newlook/editor/breakpoint.svg rename to RedPandaIDE/resources/iconsets/newlook/editor/breakpoint.svg diff --git a/RedPandaIDE/images/newlook/editor/currentline.svg b/RedPandaIDE/resources/iconsets/newlook/editor/currentline.svg similarity index 100% rename from RedPandaIDE/images/newlook/editor/currentline.svg rename to RedPandaIDE/resources/iconsets/newlook/editor/currentline.svg diff --git a/RedPandaIDE/images/newlook/editor/syntaxerror.svg b/RedPandaIDE/resources/iconsets/newlook/editor/syntaxerror.svg similarity index 100% rename from RedPandaIDE/images/newlook/editor/syntaxerror.svg rename to RedPandaIDE/resources/iconsets/newlook/editor/syntaxerror.svg diff --git a/RedPandaIDE/images/newlook/editor/syntaxwarning.svg b/RedPandaIDE/resources/iconsets/newlook/editor/syntaxwarning.svg similarity index 100% rename from RedPandaIDE/images/newlook/editor/syntaxwarning.svg rename to RedPandaIDE/resources/iconsets/newlook/editor/syntaxwarning.svg diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp index 6df3ea78..a2d07fd2 100644 --- a/RedPandaIDE/settings.cpp +++ b/RedPandaIDE/settings.cpp @@ -224,6 +224,8 @@ QString Settings::Dirs::config(Settings::Dirs::DataType dataType) const return configDir; case DataType::ColorSheme: return includeTrailingPathDelimiter(configDir)+"scheme"; + case DataType::IconSet: + return includeTrailingPathDelimiter(configDir)+"iconsets"; } return ""; } @@ -2895,6 +2897,8 @@ void Settings::Environment::doLoad() mInterfaceFontSize = intValue("interface_font_size",10); mLanguage = stringValue("language", QLocale::system().name()); mIconSet = stringValue("icon_set","newlook"); + mUseCustomIconSet = boolValue("use_custom_icon_set", false); + mCurrentFolder = stringValue("current_folder",QDir::currentPath()); if (!fileExists(mCurrentFolder)) { @@ -2985,6 +2989,16 @@ void Settings::Environment::setAStylePath(const QString &aStylePath) mAStylePath = aStylePath; } +bool Settings::Environment::useCustomIconSet() const +{ + return mUseCustomIconSet; +} + +void Settings::Environment::setUseCustomIconSet(bool newUseCustomIconSet) +{ + mUseCustomIconSet = newUseCustomIconSet; +} + void Settings::Environment::doSave() { //Appearence @@ -2993,6 +3007,7 @@ void Settings::Environment::doSave() saveValue("interface_font_size", mInterfaceFontSize); saveValue("language", mLanguage); saveValue("icon_set",mIconSet); + saveValue("use_custom_icon_set", mUseCustomIconSet); saveValue("current_folder",mCurrentFolder); saveValue("default_open_folder",mDefaultOpenFolder); diff --git a/RedPandaIDE/settings.h b/RedPandaIDE/settings.h index e13bf989..3b0f59ca 100644 --- a/RedPandaIDE/settings.h +++ b/RedPandaIDE/settings.h @@ -102,7 +102,8 @@ public: public: enum class DataType { None, - ColorSheme + ColorSheme, + IconSet }; explicit Dirs(Settings * settings); QString appDir() const; @@ -519,6 +520,9 @@ public: QString AStylePath() const; void setAStylePath(const QString &aStylePath); + bool useCustomIconSet() const; + void setUseCustomIconSet(bool newUseCustomIconSet); + private: //Appearence @@ -528,6 +532,7 @@ public: QString mLanguage; QString mCurrentFolder; QString mIconSet; + bool mUseCustomIconSet; QString mDefaultOpenFolder; QString mTerminalPath; diff --git a/RedPandaIDE/settingsdialog/environmentappearencewidget.cpp b/RedPandaIDE/settingsdialog/environmentappearencewidget.cpp index 39752420..3f3b598f 100644 --- a/RedPandaIDE/settingsdialog/environmentappearencewidget.cpp +++ b/RedPandaIDE/settingsdialog/environmentappearencewidget.cpp @@ -52,6 +52,7 @@ void EnvironmentAppearenceWidget::doLoad() ui->cbFont->setCurrentFont(QFont(pSettings->environment().interfaceFont())); ui->spinFontSize->setValue(pSettings->environment().interfaceFontSize()); ui->cbIconSet->setCurrentText(pSettings->environment().iconSet()); + ui->chkUseCustomIconSet->setChecked(pSettings->environment().useCustomIconSet()); for (int i=0;icbLanguage->count();i++) { if (ui->cbLanguage->itemData(i) == pSettings->environment().language()) { @@ -76,6 +77,8 @@ void EnvironmentAppearenceWidget::doSave() pSettings->environment().setInterfaceFontSize(ui->spinFontSize->value()); pSettings->environment().setLanguage(ui->cbLanguage->currentData().toString()); pSettings->environment().setIconSet(ui->cbIconSet->currentText()); + pSettings->environment().setUseCustomIconSet(ui->chkUseCustomIconSet->isChecked()); + pSettings->editor().save(); pSettings->environment().save(); pMainWindow->applySettings(); diff --git a/RedPandaIDE/settingsdialog/environmentappearencewidget.ui b/RedPandaIDE/settingsdialog/environmentappearencewidget.ui index e2ab34bc..4a5dc4f7 100644 --- a/RedPandaIDE/settingsdialog/environmentappearencewidget.ui +++ b/RedPandaIDE/settingsdialog/environmentappearencewidget.ui @@ -227,6 +227,13 @@ + + + + Use custom icon set + + + diff --git a/RedPandaIDE/utils.cpp b/RedPandaIDE/utils.cpp index 620b63d6..9fc5ecaf 100644 --- a/RedPandaIDE/utils.cpp +++ b/RedPandaIDE/utils.cpp @@ -1100,3 +1100,38 @@ void setScreenDPI(int dpi) { defaultScreenDPI = dpi; } + +void copyFolder(const QString &fromDir, const QString &toDir) +{ + QDirIterator it(fromDir); + QDir dir(fromDir); + QDir targetDir(toDir); + const int absSourcePathLength = dir.absolutePath().length(); + + + if (targetDir.exists()) + return; + targetDir.mkpath(targetDir.absolutePath()); + + qDebug()<<"copy folder"; + while (it.hasNext()){ + it.next(); + const auto fileInfo = it.fileInfo(); + if(!fileInfo.isHidden()) { //filters dot and dotdot + const QString subPathStructure = fileInfo.absoluteFilePath().mid(absSourcePathLength); + const QString constructedAbsolutePath = targetDir.absolutePath() + subPathStructure; + qDebug()<