diff --git a/NEWS.md b/NEWS.md index 76f550fd..1de5bc01 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,7 +1,8 @@ Version 0.8.2 For Dev-C++ 7 Beta - fix: highlighter can't correctly find the end of ANSI C-style Comments - - enhancement: Add default color scheme to themes. Change theme option will change color scheme too. + - enhancement: add default color scheme to themes. Change theme option will change color scheme too. - fix: when changing options in the option dialog's color scheme panle, color of the demo editor won't be not correctly updated + - enhancement: auto clear parsed symbols when the editor is hidden ( to reduce memory usage of un-active editors) Version 0.8.1 For Dev-C++ 7 Beta - fix: ConsolePaurser.exe only exits when press ENTER diff --git a/RedPandaIDE/HighlighterManager.cpp b/RedPandaIDE/HighlighterManager.cpp index 8e8fadb8..f567ea31 100644 --- a/RedPandaIDE/HighlighterManager.cpp +++ b/RedPandaIDE/HighlighterManager.cpp @@ -5,7 +5,6 @@ #include "qsynedit/highlighter/asm.h" #include "qsynedit/Constants.h" #include "colorscheme.h" -#include HighlighterManager highlighterManager; diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.qm b/RedPandaIDE/RedPandaIDE_zh_CN.qm index 4b7d2174..e07975b9 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 05a06ae1..333f3dcd 100644 --- a/RedPandaIDE/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/RedPandaIDE_zh_CN.ts @@ -64,7 +64,7 @@ JSON文件'%1':%2中存在错误：%3 - + Can't open file '%1' for read. 无法读取文件'%1'. @@ -1029,12 +1029,12 @@ Are you really want to continue? 失败 - - - - - - + + + + + + Error 错误 @@ -1043,60 +1043,60 @@ Are you really want to continue? 无法写入文件"%1" - + Save As 另存为 - + The text to be copied exceeds count limit! 要复制的内容超过了行数限制！ - + The text to be copied exceeds character limit! 要复制的内容超过了字符数限制！ - + The text to be cut exceeds count limit! 要剪切的内容超过了行数限制！ - + The text to be cut exceeds character limit! 要剪切的内容超过了字符数限制！ - + Print Document 打印文档 - - - + + + Ctrl+click for more info Ctrl+单击以获取更多信息 - - + + Symbol '%1' not found! 未找到符号'%1'! - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Readonly 只读 @@ -1253,66 +1253,71 @@ Are you really want to continue? + Clear all parsed symbols when editor is hidden + 清除不活动编辑器中的符号表（大幅减少内存占用） + + + Show completion suggestions while typing 输入时显示补全提示 - + Engine options 引擎选项 - + Scan local header files 扫描本地头文件 - + Scan system header files 扫描系统头文件 - + Show keywords in suggestions 提示C/C++关键字 - + Show code snippets in suggestions 提示用户自定义代码段 - + Append () when complete functions 补全函数时自动添加() - + Ignore case when search suggestions 查找提示时忽略大小写 - + Prefer local symbols 优先提示局部作用域中的符号 - + Prefer symbols mostly used 优先提示经常使用的符号 - + Clear usage data 清除使用数据 - + Completion suggestion window width: 补全提示窗口宽度： - + Completion suggestion window height: 补全提示窗口高度： @@ -1409,55 +1414,55 @@ Are you really want to continue? 背景色 - - - - - - - - + + + + + + + + Error 错误 - + Open 打开 - - + + Color Scheme Files (*.scheme) 配色方案文件 (*.scheme) - + '%1' is not a valid name for color scheme file. '%1'不是合法的配色方案文件名。 - + New scheme name 新方案名 - + '%1' is not a valid scheme name! '%1'不是合法的配色方案名! - + Save 保存 - + Confirm Delete Scheme 确认删除方案 - + Scheme '%1' will be deleted!<br />Do you really want to continue? 配色方案'%1'将会被删除！<br />您确认要继续吗？ @@ -1784,7 +1789,7 @@ Are you really want to continue? 大小: - + Simplified Chinese 简体中文 @@ -1875,7 +1880,7 @@ Are you really want to continue? ExecutableRunner - + The runner process '%1' failed to start. The runner process failed to start. 无法启动程序运行进程'%1'。 @@ -1885,17 +1890,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. 在从程序运行进程读取内容时出错。 @@ -2833,11 +2838,11 @@ Are you really want to continue? - - - - - + + + + + Issues 编译器 @@ -3039,10 +3044,10 @@ Are you really want to continue? - - - - + + + + Compile 编译 @@ -3088,8 +3093,8 @@ Are you really want to continue? - - + + Copy 复制 @@ -3100,7 +3105,7 @@ Are you really want to continue? - + Paste 粘贴 @@ -3111,7 +3116,7 @@ Are you really want to continue? - + Select All 选择全部 @@ -3230,14 +3235,14 @@ Are you really want to continue? - + Problem Set 试题集 - + New Problem Set 新建试题集 @@ -3256,14 +3261,14 @@ Are you really want to continue? - + Save Problem Set 保存试题集 - + Load Problem Set 载入试题集 @@ -3296,7 +3301,7 @@ Are you really want to continue? - + Problem 试题 @@ -3585,7 +3590,7 @@ Are you really want to continue? - + Clear all breakpoints 删除所有断点 @@ -3686,7 +3691,7 @@ Are you really want to continue? - + Rename Symbol 重命名符号 @@ -3707,13 +3712,13 @@ Are you really want to continue? - + Export As RTF 导出为RTF - + Export As HTML 导出为HTML @@ -3769,7 +3774,7 @@ Are you really want to continue? - + Open Folder 打开文件夹 @@ -3779,7 +3784,7 @@ Are you really want to continue? 运行参数... - + File Encoding 文件编码 @@ -3789,32 +3794,32 @@ Are you really want to continue? 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -3823,168 +3828,168 @@ 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' - + Copy all 全部复制 - - + + Clear 清除 @@ -4000,7 +4005,7 @@ Are you really want to continue? - + Problem Set %1 试题集%1 @@ -4021,381 +4026,391 @@ Are you really want to continue? 或者选择使用其他的网络端口。 - + Red Panda Dev-C++ 小熊猫Dev-C++ - + Properties... 试题属性... - + + Set Problem Set Name + 设置试题集名称 + + + + Problem Set Name: + 试题集名称： + + + Remove 删除 - + Remove All Bookmarks 删除全部书签 - + Modify Description 修改描述 - - - + + + Bookmark Description 书签描述 - - - + + + Description: 描述： - + Show debug logs in the debug console 在调试主控台中显示调试器输出 - + 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? 需要保存吗？ - - - - + + + + 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 无法使用模板创建项目 - + 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 @@ -4406,15 +4421,15 @@ Are you really want to continue? - - - - - - - - - + + + + + + + + + Error 错误 @@ -4424,75 +4439,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个文件） @@ -5392,175 +5407,175 @@ 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 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) - + 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) @@ -5569,53 +5584,53 @@ 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 @@ -5947,7 +5962,7 @@ Are you really want to continue? 配置文件'%1'已经存在！ - + default 缺省 @@ -6401,7 +6416,7 @@ Are you really want to continue? 自动链接 - + @@ -6477,7 +6492,7 @@ Are you really want to continue? 杂项 - + Program Runner diff --git a/RedPandaIDE/editor.cpp b/RedPandaIDE/editor.cpp index 14822d19..8b4ea39e 100644 --- a/RedPandaIDE/editor.cpp +++ b/RedPandaIDE/editor.cpp @@ -564,7 +564,9 @@ void Editor::keyPressEvent(QKeyEvent *event) handled = true; QStringList insertString; insertString.append(""); - PStatement function = mParser->findFunctionAt(mFilename,caretY()+1); + PStatement function; + if (mParser) + function = mParser->findFunctionAt(mFilename,caretY()+1); if (function) { QStringList params; QString funcName = function->command; @@ -678,7 +680,7 @@ void Editor::keyPressEvent(QKeyEvent *event) if (pSettings->codeCompletion().enabled() && pSettings->codeCompletion().showCompletionWhileInput() ) { if (mLastIdCharPressed==1) { - if (mParser->isIncludeLine(lineText())) { + if (mParser && mParser->isIncludeLine(lineText())) { // is a #include line setSelText(ch); showHeaderCompletion(false); diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 15ce37ca..47d76593 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -4772,12 +4772,33 @@ PSymbolUsageManager &MainWindow::symbolUsageManager() return mSymbolUsageManager; } +static void updateEditorParser(QTabWidget* tabWidget, + Editor* editor) { + qDebug()<<"update editors"; + qDebug()<codeCompletion().clearWhenEditorHidden(); + if (pSettings->codeCompletion().clearWhenEditorHidden()) { + for (int i=0;icount();i++) { + Editor * e = (Editor*)(tabWidget->widget(i)); + if (!e->inProject()) { + if (e==editor) { + resetCppParser(e->parser()); + e->reparse(); + } else { + qDebug()<<"clear editor:"<filename(); + //e->initParser(); + e->parser()->reset(); + } + } + } + } +} void MainWindow::on_EditorTabsLeft_currentChanged(int) { Editor * editor = mEditorList->getEditor(-1,ui->EditorTabsLeft); if (editor) { editor->reparseTodo(); } + updateEditorParser(ui->EditorTabsLeft,editor); } @@ -4787,6 +4808,7 @@ void MainWindow::on_EditorTabsRight_currentChanged(int) if (editor) { editor->reparseTodo(); } + updateEditorParser(ui->EditorTabsRight,editor); } diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp index 647d94b1..bae75365 100644 --- a/RedPandaIDE/settings.cpp +++ b/RedPandaIDE/settings.cpp @@ -3109,6 +3109,16 @@ void Settings::CodeCompletion::setShowCodeIns(bool newShowCodeIns) mShowCodeIns = newShowCodeIns; } +bool Settings::CodeCompletion::clearWhenEditorHidden() const +{ + return mClearWhenEditorHidden; +} + +void Settings::CodeCompletion::setClearWhenEditorHidden(bool newClearWhenEditorHidden) +{ + mClearWhenEditorHidden = newClearWhenEditorHidden; +} + bool Settings::CodeCompletion::appendFunc() const { return mAppendFunc; @@ -3233,6 +3243,7 @@ void Settings::CodeCompletion::doSave() saveValue("ignore_case",mIgnoreCase); saveValue("append_func",mAppendFunc); saveValue("show_code_ins",mShowCodeIns); + saveValue("clear_when_editor_hidden",mClearWhenEditorHidden); } @@ -3251,6 +3262,7 @@ void Settings::CodeCompletion::doLoad() mIgnoreCase = boolValue("ignore_case",true); mAppendFunc = boolValue("append_func",true); mShowCodeIns = boolValue("show_code_ins",true); + mClearWhenEditorHidden = boolValue("clear_when_editor_hidden",true); } Settings::CodeFormatter::CodeFormatter(Settings *settings): diff --git a/RedPandaIDE/settings.h b/RedPandaIDE/settings.h index e65c90e8..d921c4f0 100644 --- a/RedPandaIDE/settings.h +++ b/RedPandaIDE/settings.h @@ -521,6 +521,9 @@ public: bool showCodeIns() const; void setShowCodeIns(bool newShowCodeIns); + bool clearWhenEditorHidden() const; + void setClearWhenEditorHidden(bool newClearWhenEditorHidden); + private: int mWidth; int mHeight; @@ -534,6 +537,7 @@ public: bool mIgnoreCase; bool mAppendFunc; bool mShowCodeIns; + bool mClearWhenEditorHidden; // _Base interface protected: diff --git a/RedPandaIDE/settingsdialog/editorcodecompletionwidget.cpp b/RedPandaIDE/settingsdialog/editorcodecompletionwidget.cpp index 07eac772..1547ac0d 100644 --- a/RedPandaIDE/settingsdialog/editorcodecompletionwidget.cpp +++ b/RedPandaIDE/settingsdialog/editorcodecompletionwidget.cpp @@ -34,6 +34,7 @@ void EditorCodeCompletionWidget::doLoad() ui->chkIgnoreCases->setChecked(pSettings->codeCompletion().ignoreCase()); ui->chkAppendFunc->setChecked(pSettings->codeCompletion().appendFunc()); ui->chkShowCodeIns->setChecked(pSettings->codeCompletion().showCodeIns()); + ui->chkClearWhenEditorHidden->setChecked(pSettings->codeCompletion().clearWhenEditorHidden()); } void EditorCodeCompletionWidget::doSave() @@ -54,6 +55,7 @@ void EditorCodeCompletionWidget::doSave() pSettings->codeCompletion().setIgnoreCase(ui->chkIgnoreCases->isChecked()); pSettings->codeCompletion().setAppendFunc(ui->chkAppendFunc->isChecked()); pSettings->codeCompletion().setShowCodeIns(ui->chkShowCodeIns->isChecked()); + pSettings->codeCompletion().setClearWhenEditorHidden(ui->chkClearWhenEditorHidden->isChecked()); pSettings->codeCompletion().save(); } diff --git a/RedPandaIDE/settingsdialog/editorcodecompletionwidget.ui b/RedPandaIDE/settingsdialog/editorcodecompletionwidget.ui index 89d8bfa6..5309b6a8 100644 --- a/RedPandaIDE/settingsdialog/editorcodecompletionwidget.ui +++ b/RedPandaIDE/settingsdialog/editorcodecompletionwidget.ui @@ -26,6 +26,13 @@ true + + + + Clear all parsed symbols when editor is hidden + + +