diff --git a/NEWS.md b/NEWS.md index 7572ee94..4140fab4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -12,6 +12,7 @@ Red Panda C++ Version 1.5 - enhancement: save project's bookmark in it's own bookmark file - enhancement: project and non-project files use different bookmark view (auto switch when switch editors) - enhancement: auto merge when save bookmarks. + - enhancement: add option "max undo memory usage" in the options / editor / misc page Red Panda C++ Version 1.4 diff --git a/RedPandaIDE/editor.cpp b/RedPandaIDE/editor.cpp index ec15e359..eaab8128 100644 --- a/RedPandaIDE/editor.cpp +++ b/RedPandaIDE/editor.cpp @@ -4554,6 +4554,7 @@ void Editor::applySettings() } this->setUndoLimit(pSettings->editor().undoLimit()); + this->setUndoMemoryUsage(pSettings->editor().undoMemoryUsage()); setMouseWheelScrollSpeed(pSettings->editor().mouseWheelScrollSpeed()); setMouseSelectionScrollSpeed(pSettings->editor().mouseSelectionScrollSpeed()); diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp index ad7b32c1..e02fcef5 100644 --- a/RedPandaIDE/settings.cpp +++ b/RedPandaIDE/settings.cpp @@ -652,6 +652,16 @@ void Settings::Editor::setUndoLimit(int newUndoLimit) mUndoLimit = newUndoLimit; } +int Settings::Editor::undoMemoryUsage() const +{ + return mUndoMemoryUsage; +} + +void Settings::Editor::setUndoMemoryUsage(int newUndoMemoryUsage) +{ + mUndoMemoryUsage = newUndoMemoryUsage; +} + bool Settings::Editor::highlightCurrentWord() const { return mHighlightCurrentWord; @@ -1231,6 +1241,7 @@ void Settings::Editor::doSave() saveValue("default_file_cpp",mDefaultFileCpp); saveValue("auto_detect_file_encoding",mAutoDetectFileEncoding); saveValue("undo_limit",mUndoLimit); + saveValue("undo_memory_usage", mUndoMemoryUsage); //tooltips saveValue("enable_tooltips",mEnableTooltips); @@ -1371,7 +1382,8 @@ void Settings::Editor::doLoad() else mDefaultEncoding = value("default_encoding", ENCODING_UTF8).toByteArray(); mAutoDetectFileEncoding = boolValue("auto_detect_file_encoding",true); - mUndoLimit = intValue("undo_limit",0); + mUndoLimit = intValue("undo_limit",5000); + mUndoMemoryUsage = intValue("undo_memory_usage", 50); //tooltips mEnableTooltips = boolValue("enable_tooltips",true); diff --git a/RedPandaIDE/settings.h b/RedPandaIDE/settings.h index 362db218..f3ceea34 100644 --- a/RedPandaIDE/settings.h +++ b/RedPandaIDE/settings.h @@ -367,6 +367,9 @@ public: int undoLimit() const; void setUndoLimit(int newUndoLimit); + int undoMemoryUsage() const; + void setUndoMemoryUsage(int newUndoMemoryUsage); + private: //General // indents @@ -474,6 +477,7 @@ public: bool mAutoLoadLastFiles; bool mDefaultFileCpp; int mUndoLimit; + int mUndoMemoryUsage; //hints tooltip diff --git a/RedPandaIDE/settingsdialog/editormiscwidget.cpp b/RedPandaIDE/settingsdialog/editormiscwidget.cpp index 5f75284a..5efa26cd 100644 --- a/RedPandaIDE/settingsdialog/editormiscwidget.cpp +++ b/RedPandaIDE/settingsdialog/editormiscwidget.cpp @@ -65,6 +65,7 @@ void EditorMiscWidget::doLoad() ui->cbEncodingDetail->setCurrentText(defaultEncoding); } ui->spinMaxUndo->setValue(pSettings->editor().undoLimit()); + ui->spinMaxUndoMemory->setValue(pSettings->editor().undoMemoryUsage()); } void EditorMiscWidget::doSave() @@ -80,6 +81,7 @@ void EditorMiscWidget::doSave() pSettings->editor().setDefaultEncoding(ui->cbEncoding->currentData().toByteArray()); } pSettings->editor().setUndoLimit(ui->spinMaxUndo->value()); + pSettings->editor().setUndoMemoryUsage(ui->spinMaxUndoMemory->value()); pSettings->editor().save(); pMainWindow->updateEditorSettings(); } diff --git a/RedPandaIDE/settingsdialog/editormiscwidget.ui b/RedPandaIDE/settingsdialog/editormiscwidget.ui index c63dd2db..3c8b2b35 100644 --- a/RedPandaIDE/settingsdialog/editormiscwidget.ui +++ b/RedPandaIDE/settingsdialog/editormiscwidget.ui @@ -7,7 +7,7 @@ 0 0 515 - 300 + 315 @@ -89,6 +89,57 @@ + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Max Undo Memory Usage + + + + + + + MB + + + 100 + + + 50 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + diff --git a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts index e852f6b5..7faaf51f 100644 --- a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts +++ b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts @@ -206,67 +206,67 @@ CharsetInfoManager Arabic - Árabe + Árabe Greek - Grego + Grego Baltic - Báltico + Báltico Western Europe - Europa Ocidental + Europa Ocidental Central Europe - Europa Central + Europa Central Cyrillic - Cirílico + Cirílico Turkish - Turco + Turco Northern Europe - Europa setentrional + Europa setentrional Hebrew - Hebraico + Hebraico Thai - Tailandês + Tailandês Japanese - Japonês + Japonês Chinese - Chinês + Chinês Korean - Coreano + Coreano Vietnamese - Vietnamês + Vietnamês Eastern Europe - Europa Oriental + Europa Oriental Celtic - Celta + Celta @@ -1371,6 +1371,14 @@ UTF-8 BOM UTF-8 BOM + + Max Undo Memory Usage + + + + MB + MB + EditorSnippetWidget @@ -5698,15 +5706,15 @@ Can't open file '%1' to write! - Impossível gravar no arquivo '%1'! + Impossível gravar no arquivo '%1'! Failed to write data. - Falha ao gravar dados. + Falha ao gravar dados. Untitled - Sem nome + Sem nome The following %1 directories don't exist: @@ -5934,7 +5942,7 @@ Index %1 out of range - Índice %1 fora dos limites + Índice %1 fora dos limites bytes @@ -6474,18 +6482,18 @@ SynDocument Can't open file '%1' for read! - Impossível ler o arquivo '%1'! + Impossível ler o arquivo '%1'! Can't open file '%1' for save! - Impossível gravar no arquivo '%1'! + Impossível gravar no arquivo '%1'! SynEdit The highlighter seems to be in an infinite loop - A colocação de destaques parece estar em repetição infinita + A colocação de destaques parece estar em repetição infinita diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts index 9f0e7880..f2ee00bb 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts @@ -160,27 +160,27 @@ p, li { white-space: pre-wrap; } AutolinkModel - + Header 头文件 - + UTF-8 UTF-8 - + Link options 链接参数 - + Header exists 头文件已存在 - + Header already exists. 头文件已存在。 @@ -188,17 +188,17 @@ p, li { white-space: pre-wrap; } BacktraceModel - + Function 函数 - + Filename 文件名 - + Line 行 @@ -206,37 +206,37 @@ p, li { white-space: pre-wrap; } BookmarkModel - + Save file '%1' failed. 保存文件'%1'失败。 - + Can't open file '%1' for write. 无法写入文件'%1'. - + Error in json file '%1':%2 : %3 JSON文件'%1':%2中存在错误：%3 - + Can't open file '%1' for read. 无法读取文件'%1'. - + Description 描述 - + Line 行 - + Filename 文件名 @@ -244,37 +244,37 @@ p, li { white-space: pre-wrap; } BreakpointModel - + Filename 文件名 - + Line 行 - + Condition 条件 - + Save file '%1' failed. 保存文件'%1'失败。 - + Can't open file '%1' for write. 无法写入文件'%1'. - + Error in json file '%1':%2 : %3 JSON文件'%1':%2中存在错误：%3 - + Can't open file '%1' for read. 无法读取文件'%1'. @@ -322,115 +322,68 @@ p, li { white-space: pre-wrap; } CharsetInfoManager - - - Arabic - 阿拉伯语系 + 阿拉伯语系 - - - - Greek - 希腊语系 + 希腊语系 - - - - Baltic - 巴尔干语系 + 巴尔干语系 - - - - - - - Western Europe - 西欧语言 + 西欧语言 - - Central Europe - 中欧语言 + 中欧语言 - - - - - - - Cyrillic - 西里尔语系 + 西里尔语系 - - - - Turkish - 土耳其语系 + 土耳其语系 - - Northern Europe - 北欧语系 + 北欧语系 - - - Hebrew - 希伯来语 + 希伯来语 - Thai - 泰语 + 泰语 - - Japanese - 日语 + 日语 - - - Chinese - 中文 + 中文 - - Korean - 韩语 + 韩语 - Vietnamese - 越南语 + 越南语 - Eastern Europe - 东欧语系 + 东欧语系 - Celtic - 凯尔特语系 + 凯尔特语系 @@ -579,57 +532,57 @@ p, li { white-space: pre-wrap; } Compiler - + Clean before rebuild failed. 重编译前的清理准备工作失败！ - + Compile Result: 编译结果： - + - Errors: %1 - 错误数: %1 - + - Warnings: %1 - 警告数: %1 - + - Output Filename: %1 - 输出文件名: %1 - + - Output Size: %1 - 输出文件大小: %1 - + - Compilation Time: %1 secs - 编译时间: %1 秒 - + [Error] [错误] - + [Warning] [警告] - + [Info] [信息] - + [Note] [说明] @@ -701,7 +654,7 @@ p, li { white-space: pre-wrap; } ... - + Save failed. 保存失败。 @@ -710,28 +663,28 @@ p, li { white-space: pre-wrap; } CompilerManager - - - - + + + + No compiler set 无编译器设置 - - - - + + + + No compiler set is configured. 没有配置编译器设置。 - - - - + + + + Can't start debugging. 无法启动调试器 @@ -748,12 +701,12 @@ p, li { white-space: pre-wrap; } 程序中的文字内容可能无法被正确处理和显示。 - + Can't find Console Pauser 找不到Console Pauser程序 - + Console Pauser "%1" doesn't exists! 找不到Console Pauser程序"%1"！ @@ -788,7 +741,7 @@ p, li { white-space: pre-wrap; } 删除非法文件夹 - + Choose Folder 选择文件夹 @@ -1196,17 +1149,17 @@ Are you really want to continue? Debugger - + No compiler set 无编译器设置 - + No compiler set is configured. 没有配置编译器设置。 - + Can't start debugging. 无法启动调试器 @@ -1219,42 +1172,42 @@ Are you really want to continue? 调试器路径"%1"中包含非ASCII字符（如，中文字符） - + This prevents it from executing. 这会导致调试器无法启动。 - + Debugger not exists 找不到调试器 - + Can''t find debugger in : "%1" 找不到调试器程序"%1" - + GDB Server path error gdb server路径错误 - + GDB Server's path "%1" contains non-ascii characters. gdb server的路径"%1"包含中文或者全角字符 - + GDB Server not exists 找不到gdb server - + Can''t find gdb server in : "%1" 无法在"%1"找到gdb server - + Execute to evaluate 执行以求值 @@ -1263,22 +1216,22 @@ Are you really want to continue? 不在当前语境中 - + Compile 编译 - + Source file is more recent than executable. 源文件比程序文件新。 - + Recompile? 重新编译？ - + Signal "%1" Received: 收到信号"%1": @@ -1286,7 +1239,7 @@ Are you really want to continue? Editor - + untitled 无标题 @@ -1299,13 +1252,13 @@ Are you really want to continue? 失败 - - - - - - - + + + + + + + Error 错误 @@ -1314,44 +1267,44 @@ Are you really want to continue? 无法写入文件"%1" - + Save As 另存为 - + File %1 already openned! 文件%1已经被打开！ - + 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+单击以获取更多信息 @@ -1360,27 +1313,27 @@ Are you really want to continue? 未找到符号'%1'! - + astyle not found 找不到astyle程序 - + Can't find astyle in "%1". 找不到astyle程序"%1". - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Readonly 只读 @@ -1715,55 +1668,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 />您确认要继续吗？ @@ -1906,37 +1859,47 @@ Are you really want to continue? 最大可撤销编辑操作数量 - + + Max Undo Memory Usage + 最大可撤销编辑操作占用内存 + + + + MB + MB + + + Default file encoding 缺省文件编码 - + Default file type 缺省文件类型 - + C++ files C++语言文件 - + C files C语言文件 - + ANSI ANSI - + UTF-8 UTF-8 - + UTF-8 BOM UTF-8 BOM @@ -2311,27 +2274,27 @@ Are you really want to continue? EnvironmentShortcutModel - + action 动作 - + Error 错误 - + Shortcut "%1" is used by "%2". 快捷键“%1”已经被“%2”使用了。 - + Function 功能 - + Shortcut 快捷键 @@ -2508,18 +2471,18 @@ Are you really want to continue? FileAssociationModel - + Register File Association Error 注册文件类型关联失败 - - + + Don't have privilege to register file types! 没有权限进行文件类型注册！ - + Register File Type Error 注册文件类型失败 @@ -3393,22 +3356,22 @@ Are you really want to continue? 标签(Tag) - + Reset "%1" to this... 将"%1"回滚(Reset)到这里... - + Revert "%1" to this... 将"%1"撤销(Revert)到这里... - + Create Branch at this version... 在此版本创建分支(Branch)... - + Create Tag at this version... 在此版本创建标签(Tag)... @@ -3416,17 +3379,17 @@ Are you really want to continue? GitLogModel - + Date 日期 - + Author 作者 - + Title title 标题 @@ -3725,22 +3688,22 @@ Are you really want to continue? IssuesModel - + Filename 文件名 - + Line 行 - + Col 列 - + Description 描述 @@ -3748,22 +3711,22 @@ Are you really want to continue? IssuesTable - + Filename 文件名 - + Line 行 - + Col 列 - + Description 描述 @@ -3865,18 +3828,18 @@ Are you really want to continue? MainWindow - + Red Panda C++ 小熊猫C++ - - - - - - - + + + + + + + Issues 编译器 @@ -3895,8 +3858,8 @@ Are you really want to continue? 工具 - - + + Run 运行 @@ -3907,26 +3870,26 @@ Are you really want to continue? - - + + Project 项目 - - + + Watch 监视 - - + + Structure 结构 - - + + Files 文件 @@ -3936,68 +3899,68 @@ Are you really want to continue? - - - - + + + + Debug 调试 - + Evaluate: 求值 - - + + Debug Console 调试主控台 - + Call Stack 调用栈 - + Breakpoints 断点 - + Locals 局部变量 - - + + Search 查找 - + History: 历史： - + Search Again 重新查找 - + Replace with: 替换为： - + Replace 替换 - + Close 关闭 @@ -4026,83 +3989,83 @@ 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 编译 - - + + Tools Output 工具输出 - - + + Choose Input File 选择输入文件 - + ... ... @@ -4122,312 +4085,312 @@ Are you really want to continue? 选择 - + 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 期望输出 @@ -4466,391 +4429,391 @@ Are you really want to continue? 管理器 - + Messages 消息 - + Ignore Spaces 忽略空格 - - + + New Source File 新建源代码文件 - + Tab Tab - + Shift+Tab Shift+Tab - + F8 F8 - + Step Out 单步跳出 - + Ctrl+F8 Ctrl+F8 - + Run To Cursor 执行到光标处 - + Ctrl+F5 Ctrl+F5 - + Continue 继续执行 - + F4 F4 - + Add Watch... 添加监视 - + View CPU Window... 打开CPU信息窗口... - + Exit 退出 - + Find... 查找... - + Ctrl+F Ctrl+F - + Find in Files... 在文件中查找... - + Ctrl+Shift+F Ctrl+Shift+F - + Replace... 替换 - + Ctrl+R Ctrl+R - + Find Next 查找下一个 - + F3 F3 - + Find Previous 查找前一个 - + Shift+F3 Shift+F3 - + Remove Watch 删除监视值 - + Remove All Watches Remove All 删除全部监视值 - + Modify Watch... 修改监视值 - + Reformat Code 对代码重新排版 - + Ctrl+Shift+A Ctrl+Shift+A - + Go back 前一次编辑位置 - + Ctrl+Alt+Left Ctrl+Alt+Left - + Forward 后一次编辑位置 - + Ctrl+Alt+Right Ctrl+Alt+Right - + Ctrl+W Ctrl+W - + Close All 全部关闭 - + Ctrl+Shift+W Ctrl+Shift+W - + Maximize Editor 最大化编辑器 - + Ctrl+F11 Ctrl+F11 - + Next 下一窗口 - + Ctrl+Tab Ctrl+Tab - + Previous 前一窗口 - + Ctrl+Shift+Tab Ctrl+Shift+Tab - + Toggle breakpoint 切换断点 - + Ctrl+F4 Ctrl+F4 - - + + Clear all breakpoints 删除所有断点 - + Breakpoint property... 设置断点条件... - + Goto Declaration 跳转到声明处 - + Ctrl+Shift+G Ctrl+Shift+G - + Goto Definition 跳转到定义处 - + Ctrl+G Ctrl+G - + Find references 查找符号的引用 - + Open containing folder 打开所在的文件夹 - + Ctrl+B Ctrl+B - + Open a terminal here 打开命令行窗口 - + File Properties... 文件属性... - + Close Project 关闭项目 - + Project options 项目属性 - + New Project... 新建项目... - - + + New Project File 新建项目文件 - + F1 F1 - + Move Selection Up 向上移动选中的行 - + Ctrl+Shift+Up Ctrl+Shift+Up - + Move Selection Down 向下移动选中的行 - + Ctrl+Shift+Down Ctrl+Shift+Down - + Convert to UTF-8 BOM 转换为UTF-8 BOM编码 - + Encode in UTF-8 BOM 使用UTF-8 BOM编码 - + Compiler Options... 编译器选项... - + Toggle Explorer Panel 切换管理器面板 - + Ctrl+F9 Ctrl+F9 - + Toggle Messages Panel 切换消息面板 - + Ctrl+F10 Ctrl+F10 - + Raylib Manual Raylib教程 - + Select Word 选中当前单词 - + Go to Line... 跳转到行... - + New Template... 新建模板... - + New Template from Project 从项目创建模板 @@ -4859,199 +4822,199 @@ Are you really want to continue? 保存为模板... - + New File 新建文件 - + Add to project... 添加到项目... - + Remove from project 从项目删除 - + View Makefile 查看Makefile - + Clean 清理构建文件 - + Open Folder in Explorer 在浏览器中打开 - + Open In Terminal 在终端中打开 - + About 关于 - - + + Rename Symbol 重命名符号 - + Shift+F6 Shift+F6 - + Print... 打印... - + Ctrl+P Ctrl+P - - + + Export As RTF 导出为RTF - - + + Export As HTML 导出为HTML - + Move To Other View 移动到其他视图 - + Ctrl+M Ctrl+M - - + + C++ Reference C++参考手册 - + C Reference C参考手册 - + Show Tool Panels 显示全部工具面板 - + Create Git Repository Create Repository 创建Git仓库 - + Commit 提交(Commit) - + Revert 撤销(Revert) - + Reset 回滚(Reset) - + Add Files 添加文件 - + Restore 还原(Restore) - + Website 官方网站 - + Branch/Switch 分支切换（Switch） - + Merge 合并（Merge） - - + + Show Log Log 显示日志(Log) - + Remotes... 远程仓库... - + Fetch 取回(Fetch) - + Pull 拉取(Pull) - + Push 推送(Push) - + Hide Non Support Files 隐藏不支持的文件 - + Toggle Block Comment 切换块注释 - + Alt+Shift+A Alt+Shift+A - + Match Bracket 匹配当前括号 - + Ctrl+] Ctrl+] @@ -5060,50 +5023,50 @@ Are you really want to continue? 工具窗口栏 - + Status Bar 状态栏 - + Ctrl+Backspace Ctrl+Backspace - + Interrupt 中断 - - + + Delete To Word Begin 删除到单词开头 - + Ctrl+Shift+B Ctrl+Shift+B - + Delete to Word End 删除到单词结尾 - + Ctrl+Shift+E Ctrl+Shift+E - + New Class... Add Class... 新建类... - - + + New Header... New Header 新建头文件... @@ -5113,47 +5076,47 @@ Are you really want to continue? 插入行 - + Delete Line 删除当前行 - + Ctrl+D Ctrl+D - + Duplicate Line 复制当前行 - + Ctrl+E Ctrl+E - + Delete Word 删除当前单词 - + Ctrl+Shift+D Ctrl+Shift+D - + Delete to EOL 删除到行尾 - + Ctrl+Del Ctrl+Del - + Delete to BOL 删除到行首 @@ -5162,27 +5125,27 @@ Are you really want to continue? C/C++参考 - + EGE Manual EGE图形库手册 - + Add Bookmark 添加书签 - + Remove Bookmark 删除书签 - + Modify Bookmark Description 修改书签说明 - + Locate in Files View 在文件视图中定位 @@ -5191,47 +5154,47 @@ Are you really want to continue? 打开文件夹 - + Running Parameters... 运行参数... - + File Encoding 文件编码 - + Recent Files 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -5240,223 +5203,223 @@ Are you really want to continue? 行:%1 列:%2 已选择:%3 总行数:%4 总长度:%5 - + Line:%1 Col:%2 Selected:%3 Lines:%4 Length:%5 Line: %1 Col: %2 Selected: %3 Lines: %4 Length: %5 行: %1 列: %2 已选择 :%3 总行数: %4 总长度: %5 - + Read Only 只读 - + Insert 插入 - + Overwrite 覆写 - + Close project 关闭项目 - + Are you sure you want to close %1? 你确定要关闭'%1'吗？ - - + + Confirm 确认 - - - + + + Source file is not compiled. 源文件尚未编译。 - - + + Compile now? 现在编译？ - - + + Source file is more recent than executable. 源文件比可执行程序新。 - + Recompile now? 重新编译？ - + No compiler set 无编译器设置 - + No compiler set is configured. 没有配置编译器设置。 - + Can't start debugging. 无法启动调试器 - - + + Enable debugging 启用调试参数 - - + + You have not enabled debugging info (-g3) and/or stripped it from the executable (-s) in Compiler Options.<BR /><BR />Do you want to correct this now? 当前编译设置中未启用调试选项(-g3)，或启用了信息剥除选项(-s)<br /><br/>是否纠正这一问题？ - + Project not built 项目尚未构建 - + Project hasn't been built. Build it now? 项目尚未构建。是否构建？ - + Host applcation missing 宿主程序不存在 - + DLL project needs a host application to run. 动态链接库（DLL）需要一个宿主程序来运行。 - + But it's missing. 但它不存在。 - + Host application not exists 宿主程序不存在 - + Host application file '%1' doesn't exist. 宿主程序'%1'不存在。 - + Recompile? 重新编译？ - - + + Save last open info error 保存上次打开信息失败 - + Can't remove old last open information file '%1' 无法删除旧上次打开信息文件'%1' - + Can't save last open info file '%1' 无法保存上次打开信息文件'%1' - + Load last open info error 载入上次打开信息失败 - + Can't load last open info file '%1' 无法载入上次打开信息文件'%1' - + Open Source File 打开源代码文件 - - + + Batch Set Cases 批量设置案例 - + Show detail debug logs 显示详细调试器日志 - + Copy all 全部复制 - + Go to Line 跳转到行 - + Line 行 - + Template Exists 模板已存在 - + Template %1 already exists. Do you want to overwrite? 模板%1已存在。是否覆盖？ - - - - - - + + + + + + Clear 清除 - + Export 导出 - + Insert Snippet 插入代码段 - - + + Problem Set %1 试题集%1 @@ -5477,68 +5440,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: 描述： @@ -5547,178 +5510,179 @@ Are you really want to continue? 在调试主控台中显示调试器输出 - + Remove this search 清除这次搜索 - + Clear all searches 删除所有搜索 - + Breakpoint condition... 断点条件... - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Remove All Breakpoints Remove all breakpoints 删除所有断点 - + Remove Breakpoint 删除当前断点 - + Rename File 重命名文件 - - + + Add Folder 添加文件夹 - + + New folder 新文件夹 - + Folder name: 文件夹： - + Rename Folder 重命名 - + Run Current Case 运行当前案例 - + Remove Folder 删除文件夹 - + Switch to normal view 切换为普通视图 - + Switch to custom view 切换为自定义视图 - + Sort By Type 按类型排序 - + Sort alphabetically 按名称排序 - + Show inherited members 显示继承的成员 - + Goto declaration 跳转到声明处 - + Goto definition 跳转到定义处 - - + + New Folder 新建文件夹 - + Rename 重命名 - - - - + + + + Delete 删除 - + Open in Editor 在编辑器中打开 - + Open in External Program 使用外部程序打开 - + Open in Terminal 在终端中打开 - + Open in Windows Explorer 在Windows浏览器中打开 - + Character sets 字符集 - + Convert to %1 转换为%1编码 - + %1 files autosaved 已自动保存%1个文件 - + Set answer to... 设置答案源代码... - + select other file... 选择其他文件... - + Select Answer Source File 选择答案源代码文件 @@ -5728,7 +5692,7 @@ Are you really want to continue? C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + New Folder %1 新建文件夹%1 @@ -5741,68 +5705,68 @@ Are you really want to continue? 无标题%1 - + Do you really want to delete %1? 你真的要删除%1吗？ - + Do you really want to delete %1 files? 你真的要删除%1个文件吗？ - + Save project 保存项目 - + The project '%1' has modifications. 项目'%1'有改动。 - - + + Do you want to save it? 需要保存吗？ - - + + File Changed 文件已发生变化 - + New Project File? 新建项目文件? - + Do you want to add the new file to the project? 您是否要将新建的文件加入项目? - - - - + + + + Save Error 保存失败 - + Change Project Compiler Set 改变项目编译器配置集 - + Change the project's compiler set will lose all custom compiler set options. 改变项目的编译器配置集会导致所有的自定义编译器选项被重置。 - - + + Do you really want to do that? 你真的想要那么做吗？ @@ -5811,119 +5775,119 @@ Are you really want to continue? 批量设置案例 - + Choose input files 选择输入数据文件 - + Input data files (*.in) 输入数据文件 (*.in) - + untitled%1 无标题%1 - + Modify Watch 修改监视表达式 - + Watch Expression 监视表达式 - + Do you really want to clear all breakpoints in this file? 您真的要清除该文件的所有断点吗？ - + New project 新建项目 - + Close %1 and start new project? 关闭'%1'以打开新项目? - + Folder not exist 文件夹不存在 - + Folder '%1' doesn't exist. Create it now? 文件夹'%1'不存在。是否创建？ - + Can't create folder 无法创建文件夹 - + Failed to create folder '%1'. 创建文件夹'%1'失败。 - + Save new project as - + Folder %1 is not empty. 文件夹%1不是空的。 - + Do you really want to delete it? 你真的要删除它吗？ - + Change working folder 改变工作文件夹 - + File '%1' is not in the current working folder. File '%1' is not in the current working folder 文件'%1'不在当前工作文件夹中。 - + Do you want to change working folder to '%1'? 是否将工作文件夹改设为'%1'? - + Can't Commit 无法提交 - + Git needs user info to commit. Git需要用信息进行提交。 - + Choose Input Data File 选择输入数据文件 - - + + All files (*.*) 所有文件 (*.*) - + Choose Expected Output Data File Choose Expected Input Data File 选择期望输出文件 @@ -5933,61 +5897,61 @@ Are you really want to continue? 第%1行 - - - + + + Choose Working Folder 选择工作文件夹 - - + + Header Exists 头文件已存在 - - + + Header file "%1" already exists! 头文件"%1"已存在！ - + Source Exists 源文件已存在！ - + Source file "%1" already exists! 源文件"%1"已存在！ - + Can't commit! 无法提交！ - + The following files are in conflicting: 下列文件处于冲突状态，请解决后重新添加和提交： - + Commit Message 提交信息 - + Commit Message: 提交信息： - + Commit Failed 提交失败 - + Commit message shouldn't be empty! 提交信息不能为空！ @@ -5996,255 +5960,256 @@ Are you really want to continue? 小熊猫Dev-C++项目文件 (*.dev) - + New project fail 新建项目失败 - + Can't assign project template 无法使用模板创建项目 - + Remove file 删除文件 - + Remove the file from disk? 同时从硬盘上删除文件？ - - + + + untitled 无标题 - + New Project File Name 新的项目文件名 - + File Name: 文件名： - + File Already Exists! 文件已存在！ - + File '%1' already exists! 文件'%1'已经存在！ - + Add to project 添加到项目 - + C/C++ Source Files (*.c *.cpp *.cc *.cxx) C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + This operation will remove all cases for the current problem. 本操作会删除此试题的所有案例。 - + Red Panda C++ project file (*.dev) 小熊猫C++项目文件(*.dev) - + Rename Error 重命名出错 - + Symbol '%1' is defined in system header. 符号'%1'在系统头文件中定义，无法修改。 - + New Name 新名称 - - + + Replace Error 替换出错 - + Can't open file '%1' for replace! 无法打开文件'%1'进行替换！ - + Contents has changed since last search! 内容和上次查找时不一致。 - + Rich Text Format Files (*.rtf) RTF格式文件 (*.rtf) - + HTML Files (*.html) HTML文件 (*.html) - + The current problem set is not empty. 当前的试题集不是空的。 - + Problem %1 试题%1 - - + + Problem Set Files (*.pbs) 试题集文件 (*.pbs) - + Load Error 载入失败 - - + + Problem Case %1 试题案例%1 - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + Error 错误 - + Recent Projects 项目历史 - + Load Theme Error 载入主题失败 - - + + Clear History 清除历史 - - + + Version Control 版本控制 - + File '%1' was changed. 磁盘文件'%1'已被修改。 - + Reload its content from disk? 是否重新读取它的内容？ - + File '%1' was removed. 磁盘文件'%1'已被删除。 - + Keep it open? 是否保持它在小熊猫C++中打开的编辑窗口？ - + Open 打开 - + Compile Failed 编译失败 - + Run Failed 运行失败 - - - - + + + + Confirm Convertion 确认转换 - - - - + + + + The editing file will be saved using %1 encoding. <br />This operation can't be reverted. <br />Are you sure to continue? 当前编辑器中的文件将会使用%1编码保存。<br />这项操作无法被撤回。<br />你确定要继续吗？ - + New Watch Expression 新监视表达式 - + Enter Watch Expression (it is recommended to use 'this->' for class members): 输入监视表达式 - + Parsing file %1 of %2: "%3" （%1/%2）正在解析文件"%3" - - + + Done parsing %1 files in %2 seconds 完成%1个文件的解析,用时%2秒 - + (%1 files per second) (每秒%1个文件） @@ -6344,7 +6309,7 @@ Are you really want to continue? 取消 - + Path 路径 @@ -6528,12 +6493,12 @@ Are you really want to continue? OJProblemModel - + Name 名称 - + Time(ms) Time(sec) 时间(毫秒) @@ -6583,120 +6548,120 @@ Are you really want to continue? 找不到项目文件'%1'! - + untitled 无标题 - + Can't save file 无法保存文件 - + Can't save file '%1' 无法保存文件'%1'. - + Error Load File 载入文件错误 - - + + Error 错误 - + Can't create folder %1 无法创建文件夹%1 - + Warning 警告 - - + + Can't save file %1 无法保存文件%1 - + File Exists 文件已存在 - + File '%1' is already in the project 文件'%1'已在项目中 - + Project Updated 项目已升级 - + Your project was succesfully updated to a newer file format! 已成功将项目升级到新的格式 - + If something has gone wrong, we kept a backup-file: '%1'... 旧项目文件备份在'%1'。 - + Headers 头文件 - + Sources 源文件 - + Others 其他文件 - + Settings need update 设置需要更新 - + The compiler settings format of Red Panda C++ has changed. The compiler settings format of Dev-C++ has changed. 小熊猫C++的编译器设置格式已发生改变。 - + Please update your settings at Project >> Project Options >> Compiler and save your project. 请在项目 >> 项目属性 >> 编译器设置中修改您的设置并保存您的项目 - + Compiler not found 未找到编译器 - + The compiler set you have selected for this project, no longer exists. 您为该项目设置的编译器不存在。 - + It will be substituted by the global compiler set. 它将会被全局编译器设置代替。 - + Developed using the Red Panda C++ IDE Developed using the Red Panda Dev-C++ IDE 使用小熊猫C++编辑器开发 @@ -6765,37 +6730,37 @@ Are you really want to continue? 无法写入文件'%1'！ - + - Resource File: %1 - 资源文件: %1 - + Compiling project changes... 正在编译项目修改... - + - Project Filename: %1 - 项目文件名: %1 - + - Compiler Set Name: %1 - 编译器配置: %1 - + Processing makefile: 正在处理makefile... - + - makefile processer: %1 - makefile处理器: %1 - + - Command: %1 %2 - 命令: %1 %2 @@ -6955,12 +6920,12 @@ Are you really want to continue? 自定义构建命令 - + Auto detect 自动检测 - + ANSI ANSI @@ -6969,7 +6934,7 @@ Are you really want to continue? ANSI - + UTF-8 @@ -7133,32 +7098,32 @@ Are you really want to continue? ProjectModel - + File exists 文件已存在 - + File '%1' already exists. Delete it now? 文件'%1'已存在。是否删除？ - + Remove failed 删除失败 - + Failed to remove file '%1' 无法删除文件'%1' - + Rename failed 改名失败 - + Failed to rename file '%1' to '%2' 无法将文件'%1'改名为'%2' @@ -7390,7 +7355,7 @@ Are you really want to continue? QApplication - + Error 错误 @@ -7398,12 +7363,12 @@ Are you really want to continue? QObject - + Save 保存 - + Save changes to %1? 将修改保存到"%1"？ @@ -7444,81 +7409,81 @@ 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 调试器 @@ -7587,7 +7552,7 @@ Are you really want to continue? 生成调试信息(-g3) - + Would you like Red Panda C++ to search for compilers in PATH? 您同意小熊猫C++在PATH路径中寻找gcc编译器吗？ @@ -7696,23 +7661,23 @@ Are you really want to continue? 只生成汇编代码(-S) - - + + Confirm 确认 - + The following problems were found during validation of compiler set "%1": 在验证编译器设置"%1"时遇到了下列问题： - + Leaving those directories will lead to problems during compilation. 在配置中保留这些文件夹可能会导致编译出错。 - + Would you like Red Panda C++ to remove them for you and add the default paths to the valid paths? 是否让小熊猫C++删除这些配置，并尝试重新建立配置？ @@ -7721,13 +7686,13 @@ Are you really want to continue? 如果仍然保留这些设置，可能会导致编译错误。<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 @@ -7760,32 +7725,31 @@ Are you really want to continue? 是 - + untitled 无标题 - Index %1 out of range - 下标"%1"越界 + 下标"%1"越界 - + bytes 字节 - + KB KB - + MB MB - + GB GB @@ -8059,27 +8023,24 @@ Are you really want to continue? 缺省 - Can't open file '%1' to write! - 无法写入文件'%1'! + 无法写入文件'%1'! - Failed to write data. - 写入数据失败。 + 写入数据失败。 - Untitled - 无标题 + 无标题 - + constructor 构造函数 - + destructor 析构函数 @@ -8087,8 +8048,8 @@ Are you really want to continue? - - + + Can't open file '%1' for read. 无法读取文件'%1'. @@ -8096,11 +8057,12 @@ Are you really want to continue? + Can't open file '%1' for write. 无法写入文件'%1'. - + Can't parse problem set file '%1':%2 无法解析试题集文件"%1":%2 @@ -8114,12 +8076,12 @@ Are you really want to continue? RegisterModel - + Register 寄存器 - + Value 值 @@ -8481,7 +8443,7 @@ Are you really want to continue? SettingsDialog - + Options 选项 @@ -8507,247 +8469,247 @@ Are you really want to continue? 取消 - + Appearence 外观 - - - - - - + + + + + + Environment 环境 - + File Association 文件关联 - + Shortcuts 快捷键 - + Folders 文件夹 - + Terminal 终端程序 - + Performance 性能 - - - + + + Compiler Set 编译器配置集 - - - + + + Compiler 编译器 - + Auto Link 自动链接 - - - - - - - + + + + + + + General 通用 - - - - - - - - - - - + + + + + + + + + + + Editor 编辑器 - + Font 字体 - + Copy & Export 复制/导出 - + Color 配色 - + Code Completion 代码补全 - + Symbol Completion 符号补全 - + Snippet 代码模板 - + Auto Syntax Checking 自动语法检查 - + Tooltips 信息提示 - + Auto save 自动保存 - + Misc 杂项 - - - - + + + + Program Runner 程序运行 - - + + Problem Set 试题集 - + Debugger 调试器 - - + + Code Formatter 代码排版 - + Program 程序 - - + + Tools 工具 - + Git Git - + Project Options 项目选项 - - - - - - - - - - + + + + + + + + + + Project 项目 - + Files 文件 - + Custom Compile options 自定义编译选项 - + Directories 文件夹 - + Precompiled Header 预编译头文件 - + Makefile Makefile - + Output 输出 - + DLL host DLL宿主 - + Version info 版本信息 - + Save Changes 保存修改 - + There are changes in the settings, do you want to save them before swtich to other page? 本页中有尚未保存的设置修改，是否保存后再切换到其他页？ @@ -8899,23 +8861,19 @@ Are you really want to continue? SynDocument - Can't open file '%1' for read! - 无法读取文件'%1'! + 无法读取文件'%1'! - Can't open file '%1' for save! - 无法写入文件'%2'! + 无法写入文件'%2'! SynEdit - - The highlighter seems to be in an infinite loop - 高亮处理进入了死循环 + 高亮处理进入了死循环 @@ -9016,27 +8974,27 @@ Are you really want to continue? 插入宏指令 - + Save Changes? 保存修改？ - + Do you want to save changes to the current tool? 您需要保存对当前工具的修改吗？ - + Choose Folder 选择文件夹 - + Select program 选择程序 - + Executable files (*.exe) 可执行文件 (*.exe) @@ -9132,49 +9090,49 @@ Are you really want to continue? WatchModel - + Save file '%1' failed. 保存文件'%1'失败。 - + Can't open file '%1' for write. 无法写入文件'%1'. - + Error in json file '%1':%2 : %3 JSON文件'%1':%2中存在错误：%3 - - + + Execute to evaluate 执行以求值 - - + + Not Valid 在当前作用域中无效 - + Can't open file '%1' for read. 无法读取文件'%1'. - + Expression 表达式 - + Type 类型 - + Value 值 diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts index 951a4bb1..64dca603 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts @@ -198,73 +198,6 @@ - - CharsetInfoManager - - Arabic - - - - Greek - - - - Baltic - - - - Western Europe - - - - Central Europe - - - - Cyrillic - - - - Turkish - - - - Northern Europe - - - - Hebrew - - - - Thai - - - - Japanese - - - - Chinese - - - - Korean - - - - Vietnamese - - - - Eastern Europe - - - - Celtic - - - ChooseThemeDialog @@ -1363,6 +1296,14 @@ UTF-8 BOM + + Max Undo Memory Usage + + + + MB + + EditorSnippetWidget @@ -5648,18 +5589,6 @@ destructor - - Can't open file '%1' to write! - - - - Failed to write data. - - - - Untitled - - The following %1 directories don't exist: @@ -5884,10 +5813,6 @@ Icon files - - Index %1 out of range - - bytes @@ -6406,24 +6331,6 @@ - - SynDocument - - Can't open file '%1' for read! - - - - Can't open file '%1' for save! - - - - - SynEdit - - The highlighter seems to be in an infinite loop - - - TodoModel diff --git a/libs/qsynedit/qsynedit/SynEdit.cpp b/libs/qsynedit/qsynedit/SynEdit.cpp index a207e9f8..21c9669f 100644 --- a/libs/qsynedit/qsynedit/SynEdit.cpp +++ b/libs/qsynedit/qsynedit/SynEdit.cpp @@ -6585,6 +6585,11 @@ void SynEdit::setUndoLimit(int size) mUndoList->setMaxUndoActions(size); } +void SynEdit::setUndoMemoryUsage(int size) +{ + mUndoList->setMaxMemoryUsage(size*1024*1024); +} + int SynEdit::charsInWindow() const { return mCharsInWindow; diff --git a/libs/qsynedit/qsynedit/SynEdit.h b/libs/qsynedit/qsynedit/SynEdit.h index c463c0e2..e411063e 100644 --- a/libs/qsynedit/qsynedit/SynEdit.h +++ b/libs/qsynedit/qsynedit/SynEdit.h @@ -334,6 +334,7 @@ public: int charWidth() const; void setUndoLimit(int size); + void setUndoMemoryUsage(int size); int gutterWidth() const; void setGutterWidth(int value); diff --git a/libs/qsynedit/qsynedit/TextBuffer.cpp b/libs/qsynedit/qsynedit/TextBuffer.cpp index bcc48070..01cb127a 100644 --- a/libs/qsynedit/qsynedit/TextBuffer.cpp +++ b/libs/qsynedit/qsynedit/TextBuffer.cpp @@ -825,6 +825,7 @@ SynDocumentLine::SynDocumentLine(): SynEditUndoList::SynEditUndoList():QObject() { mMaxUndoActions = 1024; + mMaxMemoryUsage = 50 * 1024 * 1024; mNextChangeNumber = 1; mInsideRedo = false; @@ -832,6 +833,7 @@ SynEditUndoList::SynEditUndoList():QObject() mBlockLock=0; mFullUndoImposible=false; mBlockCount=0; + mMemoryUsage=0; mLastPoppedItemChangeNumber=0; mInitialChangeNumber = 0; mLastRestoredItemChangeNumber=0; @@ -853,7 +855,9 @@ void SynEditUndoList::addChange(SynChangeReason reason, const BufferCoord &start changeNumber); // qDebug()<<"add change"<changeNumber(); mItems.append(item); + addMemoryUsage(item); ensureMaxEntries(); if (changeNumber>mNextChangeNumber) mNextChangeNumber=changeNumber; @@ -912,6 +917,7 @@ void SynEditUndoList::clear() mLastRestoredItemChangeNumber=0; mBlockCount=0; mBlockLock=0; + mMemoryUsage=0; } void SynEditUndoList::endBlock() @@ -941,6 +947,38 @@ unsigned int SynEditUndoList::getNextChangeNumber() return mNextChangeNumber++; } +void SynEditUndoList::addMemoryUsage(PSynEditUndoItem item) +{ + if (!item) + return; + int length=0; + foreach (const QString& s, item->changeText()) { + length+=s.length()+2; + } + mMemoryUsage += length * sizeof(QChar) ; +} + +void SynEditUndoList::reduceMemoryUsage(PSynEditUndoItem item) +{ + if (!item) + return; + int length=0; + foreach (const QString& s, item->changeText()) { + length+=s.length()+2; + } + mMemoryUsage -= length * sizeof(QChar) ; +} + +int SynEditUndoList::maxMemoryUsage() const +{ + return mMaxMemoryUsage; +} + +void SynEditUndoList::setMaxMemoryUsage(int newMaxMemoryUsage) +{ + mMaxMemoryUsage = newMaxMemoryUsage; +} + SynChangeReason SynEditUndoList::lastChangeReason() { if (mItems.count() == 0) @@ -978,6 +1016,7 @@ PSynEditUndoItem SynEditUndoList::popItem() } } mLastPoppedItemChangeNumber = item->changeNumber(); + reduceMemoryUsage(item); mItems.removeLast(); return item; } @@ -1040,14 +1079,20 @@ bool SynEditUndoList::fullUndoImposible() const void SynEditUndoList::ensureMaxEntries() { - if (mMaxUndoActions>0 && mBlockCount > mMaxUndoActions){ + if (mMaxUndoActions>0 && (mBlockCount > mMaxUndoActions || mMemoryUsage>mMaxMemoryUsage)){ mFullUndoImposible = true; - while (mBlockCount > mMaxUndoActions && !mItems.isEmpty()) { + while ((mBlockCount > mMaxUndoActions || mMemoryUsage>mMaxMemoryUsage) + && !mItems.isEmpty()) { //remove all undo item in block PSynEditUndoItem item = mItems.front(); size_t changeNumber = item->changeNumber(); - while (mItems.count()>0 && mItems.front()->changeNumber() == changeNumber) + while (mItems.count()>0) { + item = mItems.front(); + if (item->changeNumber()!=changeNumber) + break; + reduceMemoryUsage(item); mItems.removeFirst(); + } if (item->changeReason()!=SynChangeReason::GroupBreak) mBlockCount--; } diff --git a/libs/qsynedit/qsynedit/TextBuffer.h b/libs/qsynedit/qsynedit/TextBuffer.h index 054eca3d..a23c2818 100644 --- a/libs/qsynedit/qsynedit/TextBuffer.h +++ b/libs/qsynedit/qsynedit/TextBuffer.h @@ -233,21 +233,28 @@ public: bool fullUndoImposible() const; + int maxMemoryUsage() const; + void setMaxMemoryUsage(int newMaxMemoryUsage); + signals: void addedUndo(); protected: void ensureMaxEntries(); bool inBlock(); unsigned int getNextChangeNumber(); + void addMemoryUsage(PSynEditUndoItem item); + void reduceMemoryUsage(PSynEditUndoItem item); protected: size_t mBlockChangeNumber; int mBlockLock; int mBlockCount; // count of action blocks; + int mMemoryUsage; size_t mLastPoppedItemChangeNumber; size_t mLastRestoredItemChangeNumber; bool mFullUndoImposible; QVector mItems; int mMaxUndoActions; + int mMaxMemoryUsage; size_t mNextChangeNumber; size_t mInitialChangeNumber; bool mInsideRedo;