diff --git a/NEWS.md b/NEWS.md index 07bf110e..60d437b3 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +Red Panda C++ Version 0.14.1 + - enhancement: custom theme + Red Panda C++ Version 0.14.0 - enhancement: custom icon set ( in the configuration folder) - enhancement: show custom icon set folder in options -> enviroment -> folders diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.qm b/RedPandaIDE/RedPandaIDE_zh_CN.qm index 3b864c45..e8803827 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 f299b572..7d735c6f 100644 --- a/RedPandaIDE/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/RedPandaIDE_zh_CN.ts @@ -129,14 +129,23 @@ p, li { white-space: pre-wrap; } AppTheme - + + Theme file '%1' doesn't exist! + 主题文件"%1"不存在！ + + + Error in json file '%1':%2 : %3 JSON文件'%1':%2中存在错误：%3 - + + Can't open the theme file '%1' for read. + 无法读取主题文件"%1"! + + Can't open file '%1' for read. - 无法读取文件'%1'. + 无法读取文件'%1'. @@ -1993,12 +2002,17 @@ Are you really want to continue? 主题: - + + Use custom theme + 使用自定义主题 + + + Icon Set: 图标集： - + Use custom icon set 使用自定义图标 @@ -2157,12 +2171,17 @@ Are you really want to continue? EnvironmentShortcutModel - + + action + 动作 + + + Function 功能 - + Shortcut 快捷键 @@ -2178,7 +2197,7 @@ Are you really want to continue? ExecutableRunner - + The runner process '%1' failed to start. The runner process failed to start. 无法启动程序运行进程'%1'。 @@ -2188,17 +2207,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. 在从程序运行进程读取内容时出错。 @@ -3235,51 +3254,51 @@ Are you really want to continue? MainWindow - + Red Panda C++ 小熊猫C++ - + - - - - - + + + + + Issues 编译器 - + Compile Log 编译日志 - + File 文件 - + Tools 工具 - - + + Run 运行 - + Edit 编辑 - + Project 项目 @@ -3297,7 +3316,7 @@ Are you really want to continue? 结构 - + Files 文件 @@ -3307,85 +3326,85 @@ Are you really want to continue? 资源 - - - - + + + + Debug 调试 - + Evaluate: 求值 - - + + Debug Console 调试主控台 - + Call Stack 调用栈 - + Breakpoints 断点 - + Locals 局部变量 - - + + Search 查找 - + History: 历史： - + Search Again 重新查找 - + Replace with: 替换为： - + Replace 替换 - + Close 关闭 - + Execute 运行 - - + + Code 代码 - + Window 窗口 @@ -3398,766 +3417,766 @@ Are you really want to continue? 工具栏2 - + New 新建 - + Ctrl+N Ctrl+N - + Open... 打开... - + Ctrl+O Ctrl+O - + Save 保存 - + Ctrl+S Ctrl+S - + Save As... 另存为... - + Save As 另存为 - + Save All 全部保存 - + Ctrl+Shift+S Ctrl+Shift+S - + Options 选项 - - - - - + + + + + Compile 编译 - + F9 F9 - + F10 F10 - + Undo 恢复 - + Ctrl+Z Ctrl+Z - + Redo 重做 - + Ctrl+Y Ctrl+Y - + Cut 剪切 - + Ctrl+X Ctrl+X - - - + + + Copy 复制 - + Ctrl+C Ctrl+C - - + + Paste 粘贴 - + Ctrl+V Ctrl+V - - + + Select All 选择全部 - + Ctrl+A Ctrl+A - + Indent 缩进 - + UnIndent 取消缩进 - + Toggle Comment 切换注释 - + Ctrl+/ Ctrl+/ - + Collapse All 全部收起 - + Uncollapse All 全部展开 - + Encode in ANSI 使用ANSI编码 - + Encode in UTF-8 使用UTF-8编码 - + Auto Detect 自动检测 - + Convert to ANSI 转换为ANSI编码 - + Convert to UTF-8 转换为UTF-8编码 - - + + Compile & Run 编译运行 - + F11 F11 - - + + Rebuild All 全部重编译 - + F12 F12 - + Stop Execution 停止执行 - + F6 F6 - + F5 F5 - + Step Over 单步跳过 - + F7 F7 - + Step Into 单步进入 - - + + - + Problem Set 试题集 - - + + New Problem Set 新建试题集 - + Add Problem 添加试题 - + Remove Problem 删除试题 - - + + Save Problem Set 保存试题集 - - + + Load Problem Set 载入试题集 - + Memory 内存 - + Address Expression: Address: 地址表达式： - + Cancel 取消 - + TODO TODO - + Bookmark 书签 - - + + - + Problem 试题 - + Add Probem Case 添加试题案例 - + Remove Problem Case Remove Problem Set 删除试题集 - + Open Anwser Source File 打开答案源代码文件 - + Run All Cases Run Current Case 运行所有案例 - + Problem Cases Validation Options 测试案例验证选项 - + %v/%m %v/%m - + Output 输出 - + Input 输入 - + Expected 期望输出 - + Help 帮助 - + Refactor 重构 - + View 视图 - + Tool Windows 工具窗口 - + Main 主工具栏 - + Compiler Set 编译器配置集 - - + + New Source File 新建源代码文件 - + Tab Tab - + Shift+Tab Shift+Tab - + F8 F8 - + Step Out 单步跳出 - + Ctrl+F8 Ctrl+F8 - + Run To Cursor 执行到光标处 - + Ctrl+F5 Ctrl+F5 - + Continue 继续执行 - + F4 F4 - + Add Watch... 添加监视 - + View CPU Window... 打开CPU信息窗口... - + Exit 退出 - + Find... 查找... - + Ctrl+F Ctrl+F - + Find in Files... 在文件中查找... - + Ctrl+Shift+F Ctrl+Shift+F - + Replace... 替换 - + Ctrl+R Ctrl+R - + Find Next 查找下一个 - + F3 F3 - + Find Previous 查找前一个 - + Shift+F3 Shift+F3 - + Remove Watch 删除监视值 - + Remove All Watches Remove All 删除全部监视值 - + Modify Watch... 修改监视值 - + Reformat Code 对代码重新排版 - + Ctrl+Shift+A Ctrl+Shift+A - + Go back 前一次编辑位置 - + Ctrl+Alt+Left Ctrl+Alt+Left - + Forward 后一次编辑位置 - + Ctrl+Alt+Right Ctrl+Alt+Right - + Ctrl+W Ctrl+W - + Close All 全部关闭 - + Ctrl+Shift+W Ctrl+Shift+W - + Maximize Editor 最大化编辑器 - + Ctrl+F11 Ctrl+F11 - + Next 下一窗口 - + Ctrl+Tab Ctrl+Tab - + Previous 前一窗口 - + Ctrl+Shift+Tab Ctrl+Shift+Tab - + Toggle breakpoint 切换断点 - + Ctrl+F4 Ctrl+F4 - - + + Clear all breakpoints 删除所有断点 - + Breakpoint property... 设置断点条件... - + Goto Declaration 跳转到声明处 - + Goto Definition 跳转到定义处 - + Find references 查找符号的引用 - + Open containing folder 打开所在的文件夹 - + Ctrl+B Ctrl+B - + Open a terminal here 打开命令行窗口 - + File Properties... 文件属性... - + Close Project 关闭项目 - + Project options 项目属性 - + New Project... 新建项目... - + New File 新建项目文件 - + Add to project... 添加到项目... - + Remove from project 从项目删除 - + View Makefile 查看Makefile - + Clean 清理构建文件 - + Open Folder in Explorer 在浏览器中打开 - + Open In Terminal 在终端中打开 - + About 关于 - - + + Rename Symbol 重命名符号 - + Shift+F6 Shift+F6 - + Print... 打印... - + Ctrl+P Ctrl+P - - + + Export As RTF 导出为RTF - - + + Export As HTML 导出为HTML - + Move To Other View 移动到其他视图 - + Ctrl+M Ctrl+M @@ -4299,7 +4318,7 @@ Are you really want to continue? - + Open Folder 打开文件夹 @@ -4309,42 +4328,42 @@ Are you really want to continue? 运行参数... - + File Encoding 文件编码 - + Recent Files 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -4353,193 +4372,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 @@ -4560,68 +4579,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: 描述： @@ -4630,240 +4649,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 @@ -4872,222 +4891,227 @@ 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 项目历史 - + + Load Theme Error + 载入主题失败 + + + 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个文件） @@ -5144,7 +5168,7 @@ Are you really want to continue? 源文件名： - + Path 路径 @@ -5210,22 +5234,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. 在从程序运行进程读取内容时出错。 @@ -6000,7 +6024,7 @@ Are you really want to continue? QApplication - + Error 错误 @@ -6075,200 +6099,200 @@ Are you really want to continue? 无法载入自动链接设置 - - - - + + + + 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) @@ -6277,54 +6301,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 @@ -6676,12 +6700,12 @@ Are you really want to continue? 无标题 - + constructor 构造函数 - + destructor 析构函数 @@ -7158,7 +7182,7 @@ Are you really want to continue? 自动链接 - + @@ -7234,15 +7258,15 @@ Are you really want to continue? 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 diff --git a/RedPandaIDE/colorscheme.cpp b/RedPandaIDE/colorscheme.cpp index f73ab5fd..e5f7befb 100644 --- a/RedPandaIDE/colorscheme.cpp +++ b/RedPandaIDE/colorscheme.cpp @@ -275,11 +275,11 @@ void ColorManager::reload() { mSchemes.clear(); //bundled schemes ( the lowest priority) - loadSchemesInDir(pSettings->dirs().data(Settings::Dirs::DataType::ColorSheme),true,false); + loadSchemesInDir(pSettings->dirs().data(Settings::Dirs::DataType::ColorScheme),true,false); //config schemes ( higher priority) - loadSchemesInDir(pSettings->dirs().config(Settings::Dirs::DataType::ColorSheme),false,false); + loadSchemesInDir(pSettings->dirs().config(Settings::Dirs::DataType::ColorScheme),false,false); //customed schemes ( highest priority) - loadSchemesInDir(pSettings->dirs().config(Settings::Dirs::DataType::ColorSheme),false,true); + loadSchemesInDir(pSettings->dirs().config(Settings::Dirs::DataType::ColorScheme),false,true); } QStringList ColorManager::getSchemes(const QString &themeType) @@ -731,9 +731,9 @@ QString ColorManager::generateFullPathname(const QString &name, bool isBundled, { QString filename = generateFilename(name,isCustomed); if (isBundled && !isCustomed) { - return includeTrailingPathDelimiter(pSettings->dirs().data(Settings::Dirs::DataType::ColorSheme))+filename; + return includeTrailingPathDelimiter(pSettings->dirs().data(Settings::Dirs::DataType::ColorScheme))+filename; } else { - return includeTrailingPathDelimiter(pSettings->dirs().config(Settings::Dirs::DataType::ColorSheme))+filename; + return includeTrailingPathDelimiter(pSettings->dirs().config(Settings::Dirs::DataType::ColorScheme))+filename; } } diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 5d4d887f..8c06ff03 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -567,16 +567,27 @@ void MainWindow::updateEditorColorSchemes() void MainWindow::applySettings() { ThemeManager themeManager; - PAppTheme appTheme = themeManager.theme(pSettings->environment().theme()); - if (appTheme->isDark()) - QApplication::setStyle(new DarkFusionStyle()); - else - QApplication::setStyle(new LightFusionStyle()); - qApp->setPalette(appTheme->palette()); - //fix for qstatusbar bug - mFileEncodingStatus->setPalette(appTheme->palette()); - mFileModeStatus->setPalette(appTheme->palette()); - mFileInfoStatus->setPalette(appTheme->palette()); + if (pSettings->environment().useCustomTheme()) { + themeManager.prepareCustomeTheme(); + } + themeManager.setUseCustomTheme(pSettings->environment().useCustomTheme()); + try { + PAppTheme appTheme = themeManager.theme(pSettings->environment().theme()); + if (appTheme->isDark()) + QApplication::setStyle(new DarkFusionStyle()); + else + QApplication::setStyle(new LightFusionStyle()); + qApp->setPalette(appTheme->palette()); + //fix for qstatusbar bug + mFileEncodingStatus->setPalette(appTheme->palette()); + mFileModeStatus->setPalette(appTheme->palette()); + mFileInfoStatus->setPalette(appTheme->palette()); + } catch (FileError e) { + QMessageBox::critical(this, + tr("Load Theme Error"), + e.reason()); + } + updateEditorColorSchemes(); QFont font(pSettings->environment().interfaceFont()); @@ -1182,6 +1193,7 @@ void MainWindow::updateActionIcons() ui->actionNew->setIcon(pIconsManager->getIcon(IconsManager::ACTION_FILE_NEW)); ui->actionNew_Project->setIcon(pIconsManager->getIcon(IconsManager::ACTION_PROJECT_NEW)); ui->actionOpen->setIcon(pIconsManager->getIcon(IconsManager::ACTION_FILE_OPEN)); + ui->actionOpen_Folder->setIcon(pIconsManager->getIcon(IconsManager::ACTION_FILE_OPEN_FOLDER)); ui->actionSave->setIcon(pIconsManager->getIcon(IconsManager::ACTION_FILE_SAVE)); ui->actionSaveAs->setIcon(pIconsManager->getIcon(IconsManager::ACTION_FILE_SAVE_AS)); ui->actionSaveAll->setIcon(pIconsManager->getIcon(IconsManager::ACTION_FILE_SAVE_ALL)); diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp index 7f89043f..036501da 100644 --- a/RedPandaIDE/settings.cpp +++ b/RedPandaIDE/settings.cpp @@ -208,10 +208,12 @@ QString Settings::Dirs::data(Settings::Dirs::DataType dataType) const switch (dataType) { case DataType::None: return dataDir; - case DataType::ColorSheme: + case DataType::ColorScheme: return ":/colorschemes/colorschemes"; case DataType::IconSet: return ":/resources/iconsets"; + case DataType::Theme: + return ":/themes"; } return ""; } @@ -224,10 +226,12 @@ QString Settings::Dirs::config(Settings::Dirs::DataType dataType) const switch (dataType) { case DataType::None: return configDir; - case DataType::ColorSheme: + case DataType::ColorScheme: return includeTrailingPathDelimiter(configDir)+"scheme"; case DataType::IconSet: return includeTrailingPathDelimiter(configDir)+"iconsets"; + case DataType::Theme: + return includeTrailingPathDelimiter(configDir)+"themes"; } return ""; } @@ -2900,6 +2904,7 @@ void Settings::Environment::doLoad() mLanguage = stringValue("language", QLocale::system().name()); mIconSet = stringValue("icon_set","newlook"); mUseCustomIconSet = boolValue("use_custom_icon_set", false); + mUseCustomTheme = boolValue("use_custom_theme", false); mCurrentFolder = stringValue("current_folder",QDir::currentPath()); @@ -3001,6 +3006,16 @@ void Settings::Environment::setUseCustomIconSet(bool newUseCustomIconSet) mUseCustomIconSet = newUseCustomIconSet; } +bool Settings::Environment::useCustomTheme() const +{ + return mUseCustomTheme; +} + +void Settings::Environment::setUseCustomTheme(bool newUseCustomTheme) +{ + mUseCustomTheme = newUseCustomTheme; +} + void Settings::Environment::doSave() { //Appearence @@ -3010,6 +3025,7 @@ void Settings::Environment::doSave() saveValue("language", mLanguage); saveValue("icon_set",mIconSet); saveValue("use_custom_icon_set", mUseCustomIconSet); + saveValue("use_custom_theme", mUseCustomTheme); saveValue("current_folder",mCurrentFolder); saveValue("default_open_folder",mDefaultOpenFolder); diff --git a/RedPandaIDE/settings.h b/RedPandaIDE/settings.h index 1338b0ab..0b49aacf 100644 --- a/RedPandaIDE/settings.h +++ b/RedPandaIDE/settings.h @@ -102,8 +102,9 @@ public: public: enum class DataType { None, - ColorSheme, - IconSet + ColorScheme, + IconSet, + Theme }; explicit Dirs(Settings * settings); QString appDir() const; @@ -523,6 +524,9 @@ public: bool useCustomIconSet() const; void setUseCustomIconSet(bool newUseCustomIconSet); + bool useCustomTheme() const; + void setUseCustomTheme(bool newUseCustomTheme); + private: //Appearence @@ -533,6 +537,7 @@ public: QString mCurrentFolder; QString mIconSet; bool mUseCustomIconSet; + bool mUseCustomTheme; QString mDefaultOpenFolder; QString mTerminalPath; diff --git a/RedPandaIDE/settingsdialog/environmentappearencewidget.cpp b/RedPandaIDE/settingsdialog/environmentappearencewidget.cpp index 3f3b598f..1a509188 100644 --- a/RedPandaIDE/settingsdialog/environmentappearencewidget.cpp +++ b/RedPandaIDE/settingsdialog/environmentappearencewidget.cpp @@ -53,6 +53,7 @@ void EnvironmentAppearenceWidget::doLoad() ui->spinFontSize->setValue(pSettings->environment().interfaceFontSize()); ui->cbIconSet->setCurrentText(pSettings->environment().iconSet()); ui->chkUseCustomIconSet->setChecked(pSettings->environment().useCustomIconSet()); + ui->chkUseCustomTheme->setChecked(pSettings->environment().useCustomTheme()); for (int i=0;icbLanguage->count();i++) { if (ui->cbLanguage->itemData(i) == pSettings->environment().language()) { @@ -78,6 +79,7 @@ void EnvironmentAppearenceWidget::doSave() pSettings->environment().setLanguage(ui->cbLanguage->currentData().toString()); pSettings->environment().setIconSet(ui->cbIconSet->currentText()); pSettings->environment().setUseCustomIconSet(ui->chkUseCustomIconSet->isChecked()); + pSettings->environment().setUseCustomTheme(ui->chkUseCustomTheme->isChecked()); pSettings->editor().save(); pSettings->environment().save(); diff --git a/RedPandaIDE/settingsdialog/environmentappearencewidget.ui b/RedPandaIDE/settingsdialog/environmentappearencewidget.ui index 4a5dc4f7..1b212565 100644 --- a/RedPandaIDE/settingsdialog/environmentappearencewidget.ui +++ b/RedPandaIDE/settingsdialog/environmentappearencewidget.ui @@ -152,6 +152,13 @@ + + + + Use custom theme + + + diff --git a/RedPandaIDE/thememanager.cpp b/RedPandaIDE/thememanager.cpp index bf753703..65ea3199 100644 --- a/RedPandaIDE/thememanager.cpp +++ b/RedPandaIDE/thememanager.cpp @@ -23,8 +23,10 @@ #include #include #include "utils.h" +#include "settings.h" -ThemeManager::ThemeManager(QObject *parent) : QObject(parent) +ThemeManager::ThemeManager(QObject *parent) : QObject(parent), + mUseCustomTheme(false) { } @@ -32,10 +34,33 @@ ThemeManager::ThemeManager(QObject *parent) : QObject(parent) PAppTheme ThemeManager::theme(const QString &themeName) { PAppTheme appTheme = std::make_shared(); - appTheme->load(QString(":/themes/%1.json").arg(themeName)); + QString themeDir; + if (mUseCustomTheme) + themeDir = pSettings->dirs().config(Settings::Dirs::DataType::Theme); + else + themeDir = pSettings->dirs().data(Settings::Dirs::DataType::Theme); + appTheme->load(QString("%1/%2.json").arg(themeDir, themeName)); return appTheme; } +bool ThemeManager::useCustomTheme() const +{ + return mUseCustomTheme; +} + +void ThemeManager::setUseCustomTheme(bool newUseCustomTheme) +{ + mUseCustomTheme = newUseCustomTheme; +} + +void ThemeManager::prepareCustomeTheme() +{ + + if (QFile(pSettings->dirs().config(Settings::Dirs::DataType::Theme)).exists()) + return; + copyFolder(pSettings->dirs().data(Settings::Dirs::DataType::Theme),pSettings->dirs().config(Settings::Dirs::DataType::Theme)); +} + AppTheme::AppTheme(QObject *parent):QObject(parent) { @@ -116,8 +141,10 @@ QPalette AppTheme::palette() const void AppTheme::load(const QString &filename) { QFile file(filename); - if (!file.exists()) - return; + if (!file.exists()) { + throw FileError(tr("Theme file '%1' doesn't exist!") + .arg(filename)); + } if (file.open(QFile::ReadOnly)) { QByteArray content = file.readAll(); QJsonParseError error; @@ -144,7 +171,7 @@ void AppTheme::load(const QString &filename) } } else { - throw FileError(tr("Can't open file '%1' for read.") + throw FileError(tr("Can't open the theme file '%1' for read.") .arg(filename)); } } diff --git a/RedPandaIDE/thememanager.h b/RedPandaIDE/thememanager.h index 573a53db..f09cbeb7 100644 --- a/RedPandaIDE/thememanager.h +++ b/RedPandaIDE/thememanager.h @@ -102,6 +102,12 @@ class ThemeManager : public QObject public: explicit ThemeManager(QObject *parent = nullptr); PAppTheme theme(const QString& themeName); + bool useCustomTheme() const; + void setUseCustomTheme(bool newUseCustomTheme); + void prepareCustomeTheme(); + +private: + bool mUseCustomTheme; }; #endif // THEMEMANAGER_H diff --git a/RedPandaIDE/utils.cpp b/RedPandaIDE/utils.cpp index dedeae41..3b899332 100644 --- a/RedPandaIDE/utils.cpp +++ b/RedPandaIDE/utils.cpp @@ -1120,7 +1120,6 @@ void copyFolder(const QString &fromDir, const QString &toDir) if(!fileInfo.isHidden()) { //filters dot and dotdot const QString subPathStructure = fileInfo.absoluteFilePath().mid(absSourcePathLength); const QString constructedAbsolutePath = targetDir.absolutePath() + subPathStructure; - qDebug()<