diff --git a/NEWS.md b/NEWS.md index a4fb1e04..25cd99f0 100644 --- a/NEWS.md +++ b/NEWS.md @@ -5,6 +5,8 @@ Red Panda C++ Version 2.11 - enhancement: Differentiate class and constructors in syntax color and jupming to declarations. - enhancement: Improve parsing for operator overloading. - fix: Parser can't correctly differentiate function and var initialization. + - fix: Respect encoding "Project default" when search/find occurrencies/open project units. + - enhancement: Show progress dialog when search/find occurrencies in large projects. Red Panda C++ Version 2.10 diff --git a/RedPandaIDE/RedPandaIDE.pro b/RedPandaIDE/RedPandaIDE.pro index a72ab0ef..eab934af 100644 --- a/RedPandaIDE/RedPandaIDE.pro +++ b/RedPandaIDE/RedPandaIDE.pro @@ -10,7 +10,7 @@ isEmpty(APP_NAME) { } isEmpty(APP_VERSION) { - APP_VERSION = 2.10 + APP_VERSION = 2.11 } macos: { diff --git a/RedPandaIDE/cpprefacter.cpp b/RedPandaIDE/cpprefacter.cpp index d428f93d..f72abe8f 100644 --- a/RedPandaIDE/cpprefacter.cpp +++ b/RedPandaIDE/cpprefacter.cpp @@ -21,6 +21,7 @@ #include "editorlist.h" #include #include +#include #include #include "syntaxermanager.h" #include "project.h" @@ -182,11 +183,25 @@ void CppRefacter::doFindOccurenceInProject(PStatement statement, std::shared_ptr statement->fullName, SearchFileScope::wholeProject ); + QProgressDialog progressDlg( + tr("Searching..."), + tr("Abort"), + 0, + pMainWindow->project()->unitList().count(), + pMainWindow); + progressDlg.setWindowModality(Qt::WindowModal); + int i=0; foreach (const PProjectUnit& unit, project->unitList()) { + i++; if (isCFile(unit->fileName()) || isHFile(unit->fileName())) { + progressDlg.setValue(i); + progressDlg.setLabelText(tr("Searching...")+"
"+unit->fileName()); + + if (progressDlg.wasCanceled()) + break; PSearchResultTreeItem item = findOccurenceInFile( unit->fileName(), - unit->encoding(), + unit->encoding()==ENCODING_PROJECT?project->options().encoding:unit->encoding(), statement, parser); if (item && !(item->results.isEmpty())) { diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 96636816..93949442 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -1445,6 +1445,8 @@ Editor* MainWindow::openFile(const QString &filename, bool activate, QTabWidget* QByteArray encoding = unit ? unit->encoding() : (pSettings->editor().autoDetectFileEncoding()? ENCODING_AUTO_DETECT : pSettings->editor().defaultEncoding()); Project * pProject = (inProject?mProject.get():nullptr); + if (pProject && encoding==ENCODING_PROJECT) + encoding=pProject->options().encoding; editor = mEditorList->newEditor(filename,encoding, pProject, false, page); // if (mProject) { @@ -3103,6 +3105,8 @@ void MainWindow::loadLastOpens() QByteArray encoding = unit ? unit->encoding() : (pSettings->editor().autoDetectFileEncoding()? ENCODING_AUTO_DETECT : pSettings->editor().defaultEncoding()); Project* pProject = (inProject?mProject.get():nullptr); + if (pProject && encoding==ENCODING_PROJECT) + encoding=pProject->options().encoding; Editor * editor = mEditorList->newEditor(editorFilename, encoding, pProject,false,page); if (inProject && editor) { diff --git a/RedPandaIDE/project.cpp b/RedPandaIDE/project.cpp index 4389c930..4bfd325f 100644 --- a/RedPandaIDE/project.cpp +++ b/RedPandaIDE/project.cpp @@ -370,6 +370,9 @@ Editor* Project::openUnit(PProjectUnit& unit, bool forceOpen) { } QByteArray encoding; encoding = unit->encoding(); + if (encoding==ENCODING_PROJECT) + encoding=options().encoding; + editor = mEditorList->newEditor(unit->fileName(), encoding, this, false); if (editor) { //editor->setProject(this); @@ -397,6 +400,8 @@ Editor *Project::openUnit(PProjectUnit &unit, const PProjectEditorLayout &layout } QByteArray encoding; encoding = unit->encoding(); + if (encoding==ENCODING_PROJECT) + encoding=options().encoding; editor = mEditorList->newEditor(unit->fileName(), encoding, this, false); if (editor) { //editor->setInProject(true); @@ -807,10 +812,12 @@ void Project::associateEditorToUnit(Editor *editor, PProjectUnit unit) // editor->setEncodingOption(editor->fileEncoding()); // } // } - if (editor->encodingOption()!=mOptions.encoding) - unit->setEncoding(editor->encodingOption()); - else if (editor->encodingOption()!=unit->encoding()) + if (unit->encoding()==ENCODING_PROJECT) { + if (editor->encodingOption()!=mOptions.encoding) + unit->setEncoding(editor->encodingOption()); + } else if (editor->encodingOption()!=unit->encoding()) { unit->setEncoding(editor->encodingOption()); + } unit->setRealEncoding(editor->fileEncoding()); } } @@ -952,7 +959,7 @@ bool Project::assignTemplate(const std::shared_ptr aTemplate, b Editor * editor = mEditorList->newEditor( unit->fileName(), - unit->encoding(), + unit->encoding()==ENCODING_PROJECT?options().encoding:unit->encoding(), this, true); diff --git a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts index 7d881650..18a8adf4 100644 --- a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts +++ b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts @@ -6835,6 +6835,14 @@ Search in Files + + Searching... + + + + Abort + + SearchResultListModel diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts index 91dc156b..964d2125 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts @@ -1382,10 +1382,10 @@ Are you really want to continue? - - - - + + + + Error 错误 @@ -1434,34 +1434,34 @@ Are you really want to continue? 文件%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+单击以获取更多信息 @@ -1470,27 +1470,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 只读 @@ -4154,11 +4154,11 @@ Are you really want to continue? - - - - - + + + + + Issues 编译器 @@ -4444,9 +4444,9 @@ Are you really want to continue? - - - + + + Copy 复制 @@ -4457,7 +4457,7 @@ Are you really want to continue? - + Paste 粘贴 @@ -4468,8 +4468,8 @@ Are you really want to continue? - - + + Select All 选择全部 @@ -4595,38 +4595,38 @@ Are you really want to continue? - - + + New Problem Set 新建试题集 - + Add Problem 添加试题 - + Remove Problem 删除试题 - - + + Save Problem Set 保存试题集 - - + + Load Problem Set 载入试题集 @@ -4674,7 +4674,7 @@ Are you really want to continue? - + Remove Problem Case Remove Problem Set 删除试题集 @@ -4682,21 +4682,21 @@ Are you really want to continue? - + Open Anwser Source File 打开答案源代码文件 - + Run All Cases Run Current Case 运行所有案例 - + Problem Cases Validation Options 测试案例验证选项 @@ -4756,15 +4756,15 @@ Are you really want to continue? - - + + Import FPS Problem Set 导入FPS试题集 - - + + Export FPS Problem Set 导出FPS试题集 @@ -5006,7 +5006,7 @@ Are you really want to continue? - + Clear all breakpoints 删除所有断点 @@ -5227,7 +5227,7 @@ Are you really want to continue? - + New File 新建文件 @@ -5268,7 +5268,7 @@ Are you really want to continue? - + Rename Symbol 重命名符号 @@ -5289,13 +5289,13 @@ Are you really want to continue? - + Export As RTF 导出为RTF - + Export As HTML 导出为HTML @@ -5564,7 +5564,7 @@ Are you really want to continue? 运行参数... - + File Encoding 文件编码 @@ -5668,22 +5668,22 @@ Are you really want to continue? - - + + Wrong Compiler Settings 错误的编译器设置 - - + + Compiler is set not to generate executable. 编译器被设置为不生成可执行文件。 - + We need the executabe to run problem case. 我们需要可执行文件来运行试题案例。 @@ -5749,7 +5749,7 @@ Are you really want to continue? - + Please correct this before start debugging 请在调试前改正设置。 @@ -5759,8 +5759,8 @@ Are you really want to continue? 重新编译？ - - + + Save last open info error 保存上次打开信息失败 @@ -5769,60 +5769,60 @@ Are you really want to continue? 无法删除旧上次打开信息文件'%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已存在。是否覆盖？ @@ -5830,9 +5830,9 @@ Are you really want to continue? - - - + + + Clear 清除 @@ -5848,7 +5848,7 @@ Are you really want to continue? - + Problem Set %1 试题集%1 @@ -5881,56 +5881,56 @@ Are you really want to continue? 项目已经被修改过，是否需要重新构建？ - + 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: 描述： @@ -5939,65 +5939,65 @@ 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 重命名 @@ -6012,17 +6012,17 @@ Are you really want to continue? 要现在去修改设置吗？ - + Rename Problem Set 修改试题集名称 - + Can't open last open information file '%1' for write! 无法写入配置文件'%1'。 - + Rename Problem 修改试题名称 @@ -6032,141 +6032,141 @@ Are you really want to continue? 行: %1 列: %2 总行数: %3 - + Goto Url 跳转到试题网址 - + Add Problem Case 添加试题案例 - + 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 跳转到定义处 - + In current file 仅当前文件 - + In current project 整个项目 - - + + 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编码 - + Newline 换行符 - + %1 files autosaved 已自动保存%1个文件 - + Set answer to... 设置答案源代码... - + select other file... 选择其他文件... - + Select Answer Source File 选择答案源代码文件 @@ -6175,17 +6175,17 @@ Are you really want to continue? 中止 - + FPS Problem Set Files (*.fps;*.xml) FPS试题集文件(*.fps;*.xml) - + FPS Problem Set Files (*.fps) FPS试题集文件(*.fps) - + Export Error 导出时出错 @@ -6195,7 +6195,7 @@ Are you really want to continue? C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + New Folder %1 新建文件夹%1 @@ -6208,68 +6208,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? 你真的想要那么做吗？ @@ -6278,12 +6278,12 @@ Are you really want to continue? 批量设置案例 - + Choose input files 选择输入数据文件 - + Input data files (*.in) 输入数据文件 (*.in) @@ -6292,78 +6292,78 @@ Are you really want to continue? 无标题%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'? @@ -6372,28 +6372,28 @@ Are you really want to continue? 正在删除试题... - + 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 选择期望输出文件 @@ -6405,59 +6405,59 @@ Are you really want to continue? - + 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! 提交信息不能为空！ @@ -6466,22 +6466,22 @@ Are you really want to continue? 小熊猫Dev-C++项目文件 (*.dev) - + New project fail 新建项目失败 - + Can't assign project template 无法使用模板创建项目 - + Remove file 删除文件 - + Remove the file from disk? 同时从硬盘上删除文件？ @@ -6490,27 +6490,27 @@ Are you really want to continue? 无标题 - + New Project File Name 新的项目文件名 - + File Name: 文件名： - + File Already Exists! 文件已存在！ - + File '%1' already exists! 文件'%1'已经存在！ - + Add to project 添加到项目 @@ -6531,88 +6531,88 @@ Are you really want to continue? 请在工具栏中选择Debug编译器配置集，或者在“编译器配置集”设置的“编译/链接选项”页中<b>启用</b>“生成调试信息(-g3)”、<b>禁用</b>“剥除附件信息(-3)”。 - + 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 @@ -6624,13 +6624,13 @@ Are you really want to continue? - - - - - - - + + + + + + + Error 错误 @@ -6651,85 +6651,85 @@ Are you really want to continue? 清除历史 - - + + 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个文件） @@ -8001,7 +8001,7 @@ Are you really want to continue? QApplication - + Error 错误 @@ -8072,7 +8072,7 @@ Are you really want to continue? 无法写入配置文件夹"%1" - + Can't load autolink settings 无法载入自动链接设置 @@ -8676,12 +8676,12 @@ Are you really want to continue? 无标题 - + constructor 构造函数 - + destructor 析构函数 @@ -9163,6 +9163,17 @@ Are you really want to continue? Continue Replace 继续替换 + + + + Searching... + 正在查找... + + + + Abort + 中止 + SearchResultListModel @@ -9408,7 +9419,7 @@ Are you really want to continue? - + Compiler Set @@ -9417,7 +9428,7 @@ Are you really want to continue? - + Compiler @@ -9429,7 +9440,7 @@ Are you really want to continue? 自动链接 - + @@ -9506,15 +9517,15 @@ Are you really want to continue? 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts index e6057524..bbd0a07e 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts @@ -6388,6 +6388,14 @@ Search in Files + + Searching... + + + + Abort + + SearchResultListModel diff --git a/RedPandaIDE/widgets/searchinfiledialog.cpp b/RedPandaIDE/widgets/searchinfiledialog.cpp index 50392a4a..276edd05 100644 --- a/RedPandaIDE/widgets/searchinfiledialog.cpp +++ b/RedPandaIDE/widgets/searchinfiledialog.cpp @@ -26,6 +26,7 @@ #include "../settings.h" #include #include +#include SearchInFileDialog::SearchInFileDialog(QWidget *parent) : @@ -170,7 +171,23 @@ void SearchInFileDialog::doSearch(bool replace) mSearchOptions, SearchFileScope::wholeProject ); + QByteArray projectEncoding = pMainWindow->project()->options().encoding; + QProgressDialog progressDlg( + tr("Searching..."), + tr("Abort"), + 0, + pMainWindow->project()->unitList().count(), + pMainWindow); + + progressDlg.setWindowModality(Qt::WindowModal); + int i=0; foreach (PProjectUnit unit, pMainWindow->project()->unitList()) { + i++; + progressDlg.setValue(i); + progressDlg.setLabelText(tr("Searching...")+"
"+unit->fileName()); + + if (progressDlg.wasCanceled()) + break; Editor * e = pMainWindow->project()->unitEditor(unit); QString curFilename = unit->fileName(); if (e) { @@ -187,8 +204,11 @@ void SearchInFileDialog::doSearch(bool replace) } } else if (fileExists(curFilename)) { QSynedit::QSynEdit editor; + QByteArray encoding=unit->encoding(); + if (encoding==ENCODING_PROJECT) + encoding = projectEncoding; QByteArray realEncoding; - editor.document()->loadFromFile(curFilename,ENCODING_AUTO_DETECT, realEncoding); + editor.document()->loadFromFile(curFilename,encoding, realEncoding); fileSearched++; PSearchResultTreeItem parentItem = batchFindInEditor( &editor, @@ -200,7 +220,6 @@ void SearchInFileDialog::doSearch(bool replace) fileHitted++; results->results.append(parentItem); } - } } pMainWindow->searchResultModel()->notifySearchResultsUpdated(); diff --git a/Red_Panda_CPP.pro b/Red_Panda_CPP.pro index 5b6f2583..1baca10a 100644 --- a/Red_Panda_CPP.pro +++ b/Red_Panda_CPP.pro @@ -12,6 +12,10 @@ consolepauser.subdir = tools/consolepauser redpanda_qt_utils.subdir = libs/redpanda_qt_utils qsynedit.subdir = libs/qsynedit +APP_NAME = RedPandaCPP + +APP_VERSION = 2.11 + # Add the dependencies so that the RedPandaIDE project can add the depended programs # into the main app bundle RedPandaIDE.depends = astyle consolepauser qsynedit @@ -31,10 +35,6 @@ redpanda-git-askpass.subdir = tools/redpanda-git-askpass RedPandaIDE.depends += redpanda-git-askpass } -APP_NAME = RedPandaCPP - -APP_VERSION = 2.10 - linux: { isEmpty(PREFIX) { PREFIX = /usr/local