diff --git a/NEWS.md b/NEWS.md index f3587685..46b9b802 100644 --- a/NEWS.md +++ b/NEWS.md @@ -10,6 +10,9 @@ Version 0.6.0 - enhancement: don't add encoding options when using clang to compile (clang only support utf-8) - enhancement: find occurence in project - implement: refactor in file + - enhancement: replace in files + - enhancement: refactor in project (using search symbol occurence and replace in files) + - fix: search in files Version 0.5.0 - enhancement: support C++ using type alias; diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.ts b/RedPandaIDE/RedPandaIDE_zh_CN.ts index 7ef8dcfc..62b012cc 100644 --- a/RedPandaIDE/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/RedPandaIDE_zh_CN.ts @@ -394,7 +394,7 @@ [说明] - + The compiler process for '%1' failed to start. 无法启动编译器进程'%1'。 @@ -403,27 +403,27 @@ 无法启动编译进程。 - + The compiler process crashed after starting successfully. 编译进程启动后崩溃。 - + The last waitFor...() function timed out. waitFor()函数等待超时。 - + An error occurred when attempting to write to the compiler process. 在向编译进程输入内容时出错。 - + An error occurred when attempting to read from the compiler process. 在从编译进程读取内容时出错。 - + An unknown error occurred. 发生了未知错误。 @@ -459,32 +459,47 @@ CompilerManager - - - - - + + + + + No compiler set 无编译器设置 - - - - - + + + + + No compiler set is configured. 没有配置编译器设置。 - - - - - + + + + + Can't start debugging. 无法启动调试器 + + + Encoding not support + 不支持字符编码 + + + + Clang only support utf-8 encoding. + Clang只支持UTF-8编码 + + + + Strings in the program might be wrongly processed. + 程序中的文字内容可能无法被正确处理和显示。 + CompilerSetDirectoriesWidget @@ -699,6 +714,25 @@ Are you really want to continue? 新名称 + + CppRefacter + + + + Rename Symbol Error + 重命名符号失败 + + + + Can't rename symbols not defined in this file. + 无法重命名不在本文件中定义的符号 + + + + New symbol already exists! + 新符号名称已被使用！ + + CustomMakefileInfoDialog @@ -2461,40 +2495,40 @@ Are you really want to continue? 小熊猫C++ - - + + Issues 编译器 - + Compile Log 编译日志 - + File 文件 - + Tools 工具 - - + + Run 运行 - + Edit 编辑 - + Project 项目 @@ -2509,91 +2543,90 @@ Are you really want to continue? 结构 - Files - 文件 + 文件 Resource 资源 - - - - + + + + Debug 调试 - + Evaluate: 求值 - + Debug Console 调试主控台 - + Call Stack 调用栈 - + Breakpoints 断点 - + Locals 本地变量 - - + + Search 查找 - + History: 历史： - + Search Again 重新查找 - + Replace with: 替换为： - + Replace 替换 - + Close 关闭 - + Execute 运行 - - + + Code 代码 - + Window 窗口 @@ -2606,627 +2639,643 @@ 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 单步进入 - + Memory 内存 - + Address Expression: Address: 地址表达式： - + TODO TODO - + Help 帮助 - + + Refactor + 重构 + + + Main 主工具栏 - + Compiler Set 编译器配置集 - - + + New Source File 新建源代码文件 - + 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 清除全部监视 - + 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 + + + File Encoding 文件编码 - + Recent Files 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -3235,433 +3284,454 @@ Are you really want to continue? 行:%1 列:%2 已选择:%3 总行数:%4 总长度:%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 清除 - + 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 清除所有断点 - + Rename File 重命名文件 - - + + Add Folder 添加文件夹 - + New folder 新文件夹 - + Folder name: 文件夹： - + Rename Folder 重命名 - + Remove Folder 删除文件夹 - + Sort By Type 按类型排序 - + Sort alphabetically 按名称排序 - + Show inherited members 显示继承的成员 - + Goto declaration 跳转到声明处 - + Goto definition 跳转到定义处 - + Character sets 字符集 - + %1 files autosaved 已自动保存%1个文件 - + Save project 保存项目 - + The project '%1' has modifications. 项目'%1'有改动。 - + Do you want to save it? 需要保存吗？ - + 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 无法使用模板创建项目 - + Add to project 添加到项目 - - - - - - - - - + + New Name + 新名称 + + + + + Replace Error + 替换出错 + + + + Can't open file '%1' for replace! + 无法打开文件'%1'进行替换！ + + + + Contents has changed since last search! + 内容和上次查找时不一致。 + + + + + + + + + + + Error 错误 - + Recent Projects 项目历史 - + File '%1' was changed. 磁盘文件'%1'已被修改。 - + Reload its content from disk? 是否重新读取它的内容？ - + File '%1' was removed. 磁盘文件'%1'已被删除。 - + Keep it open? 是否保持它在小熊猫C++中打开的编辑窗口？ - + Open 打开 - + Compile Failed 编译失败 - + Run Failed 运行失败 - - + + Confirm Convertion 确认转换 - - + + The editing file will be saved using %1 encoding. <br />This operation can't be reverted. <br />Are you sure to continue? 当前编辑器中的文件将会使用%1编码保存。<br />这项操作无法被撤回。<br />你确定要继续吗？ - + New Watch Expression 新监视表达式 - + Enter Watch Expression (it is recommended to use 'this->' for class members): 输入监视表达式 - + Parsing file %1 of %2: "%3" （%1/%2）正在解析文件"%3" - - + + Done parsing %1 files in %2 seconds 完成%1个文件的解析,用时%2秒 - + (%1 files per second) (每秒%1个文件） @@ -4495,175 +4565,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) @@ -4672,43 +4742,43 @@ 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"时遇到了下列问题： - + 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 @@ -5182,7 +5252,7 @@ Are you really want to continue? - + Find 查找 @@ -5198,13 +5268,18 @@ Are you really want to continue? - - + + Replace 替换 - + + Replace in files + 在文件中替换 + + + Replace this occurrence of ''%1''? 替换这里的"%1"？ @@ -5212,30 +5287,30 @@ Are you really want to continue? SearchResultListModel - + Current File: 当前文件： - + Files In Project: 项目中的文件： - + Open Files: 打开的文件： - + References to symbol '%1' at '%2':%3 - 符号'%1'出现在'%2':'%3' + 符号'%1'出现在'%2': %3 SearchResultTreeModel - + Line 行 @@ -5243,8 +5318,8 @@ Are you really want to continue? SearchResultTreeViewDelegate - - + + Line 行 diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 753aaddc..d1f38dbb 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -1272,9 +1272,10 @@ void MainWindow::debug() } } -void MainWindow::showSearchPanel() +void MainWindow::showSearchPanel(bool showReplace) { openCloseBottomPanel(true); + showSearchReplacePanel(showReplace); ui->tabMessages->setCurrentWidget(ui->tabSearch); } @@ -3539,8 +3540,7 @@ void MainWindow::on_actionFind_references_triggered() if (editor && editor->pointToCharLine(mEditorContextMenuPos,pos)) { CppRefacter refactor; refactor.findOccurence(editor,pos); - ui->tabMessages->setCurrentWidget(ui->tabSearch); - openCloseBottomPanel(true); + showSearchPanel(true); } } @@ -3973,6 +3973,37 @@ void MainWindow::on_actionRename_Symbol_triggered() return; } + BufferCoord oldCaretXY = editor->caretXY(); + if (editor->inProject() && mProject) { + mProject->cppParser()->parseFileList(); + BufferCoord pBeginPos,pEndPos; + QString phrase = getWordAtPosition(editor,oldCaretXY,pBeginPos,pEndPos,Editor::WordPurpose::wpInformation); + // Find it's definition + PStatement oldStatement = editor->parser()->findStatementOf( + editor->filename(), + phrase, + oldCaretXY.Line); + // definition of the symbol not found + if (!oldStatement) + return; + // found but not in this file + if (editor->filename() != oldStatement->fileName + || editor->filename() != oldStatement->definitionFileName) { + // it's defined in system header, dont rename + if (mProject->cppParser()->isSystemHeaderFile(oldStatement->fileName)) { + QMessageBox::critical(editor, + tr("Rename Error"), + tr("Symbol '%1' is defined in system header.") + .arg(oldStatement->fullName)); + return; + } + CppRefacter refactor; + refactor.findOccurence(editor,oldCaretXY); + showSearchPanel(true); + return; + } + } + bool ok; QString newWord = QInputDialog::getText(editor, tr("Rename Symbol"), @@ -3985,7 +4016,6 @@ void MainWindow::on_actionRename_Symbol_triggered() return; PCppParser parser = editor->parser(); - BufferCoord oldCaretXY = editor->caretXY(); //here we must reparse the file in sync, or rename may fail parser->parseFile(editor->filename(), editor->inProject(), false, false); CppRefacter refactor; @@ -3994,3 +4024,53 @@ void MainWindow::on_actionRename_Symbol_triggered() } + +void MainWindow::showSearchReplacePanel(bool show) +{ + ui->replacePanel->setVisible(show); + ui->cbSearchHistory->setDisabled(show); + if (show && mSearchResultModel.currentResults()) { + ui->cbReplaceInHistory->setCurrentText( + mSearchResultModel.currentResults()->keyword); + } + mSearchResultTreeModel->setSelectable(show); +} + + +void MainWindow::on_btnReplace_clicked() +{ + //select all items by default + PSearchResults results = mSearchResultModel.currentResults(); + if (!results) { + return; + } + QString newWord = ui->cbReplaceInHistory->currentText(); + foreach (const PSearchResultTreeItem& file, results->results) { + QStringList contents; + Editor* editor = mEditorList->getEditorByFilename(file->filename); + if (!editor) { + QMessageBox::critical(this, + tr("Replace Error"), + tr("Can't open file '%1' for replace!").arg(file->filename)); + return; + } + contents = editor->lines()->contents(); + for (int i=file->results.count()-1;i>=0;i--) { + const PSearchResultTreeItem& item = file->results[i]; + QString line = contents[item->line-1]; + if (line.mid(item->start-1,results->keyword.length())!=results->keyword) { + QMessageBox::critical(editor, + tr("Replace Error"), + tr("Contents has changed since last search!")); + return; + } + line.remove(item->start-1,results->keyword.length()); + line.insert(item->start-1, newWord); + contents[item->line-1] = line; + } + editor->selectAll(); + editor->setSelText(contents.join(editor->lineBreak())); + } + showSearchReplacePanel(false); + openCloseBottomPanel(false); +} diff --git a/RedPandaIDE/mainwindow.h b/RedPandaIDE/mainwindow.h index 75e86d15..c1c58419 100644 --- a/RedPandaIDE/mainwindow.h +++ b/RedPandaIDE/mainwindow.h @@ -72,7 +72,7 @@ public: void runExecutable(const QString& exeName, const QString& filename=QString()); void runExecutable(); void debug(); - void showSearchPanel(); + void showSearchPanel(bool showReplace = false); void applySettings(); void applyUISettings(); @@ -173,6 +173,8 @@ private: QKeySequence shortcut=QKeySequence()); void scanActiveProject(bool parse=false); void includeOrSkipDirs(const QStringList& dirs, bool skip); + void showSearchReplacePanel(bool show); + private slots: void onAutoSaveTimeout(); void onFileChanged(const QString& path); @@ -373,6 +375,8 @@ private slots: void on_actionRename_Symbol_triggered(); + void on_btnReplace_clicked(); + private: Ui::MainWindow *ui; EditorList *mEditorList; diff --git a/RedPandaIDE/mainwindow.ui b/RedPandaIDE/mainwindow.ui index eff80faf..8124e831 100644 --- a/RedPandaIDE/mainwindow.ui +++ b/RedPandaIDE/mainwindow.ui @@ -283,7 +283,7 @@ QTabWidget::South - 2 + 3 diff --git a/RedPandaIDE/qsynedit/Search.cpp b/RedPandaIDE/qsynedit/Search.cpp index fb09561a..974e4988 100644 --- a/RedPandaIDE/qsynedit/Search.cpp +++ b/RedPandaIDE/qsynedit/Search.cpp @@ -24,7 +24,7 @@ int SynSearch::resultCount() return mResults.count(); } -int SynSearch::findAll(const QString &keyword) +int SynSearch::findAll(const QString &text) { mResults.clear(); if (pattern().isEmpty()) @@ -33,18 +33,18 @@ int SynSearch::findAll(const QString &keyword) int next=-1; while (true) { if (options().testFlag(ssoMatchCase)) { - next = keyword.indexOf(pattern(),start,Qt::CaseSensitive); + next = text.indexOf(pattern(),start,Qt::CaseSensitive); } else { - next = keyword.indexOf(pattern(),start,Qt::CaseInsensitive); + next = text.indexOf(pattern(),start,Qt::CaseInsensitive); } if (next<0) { break; } - start = next + keyword.length(); + start = next + pattern().length(); if (options().testFlag(ssoWholeWord)) { - if (((next<=0) || isDelimitChar(keyword[next-1])) + if (((next<=0) || isDelimitChar(text[next-1])) && - ( (start>=keyword.length()) || isDelimitChar(keyword[start]) ) + ( (start>=text.length()) || isDelimitChar(text[start]) ) ) { mResults.append(next); } diff --git a/RedPandaIDE/qsynedit/Search.h b/RedPandaIDE/qsynedit/Search.h index 3032c8ed..54e2b0f2 100644 --- a/RedPandaIDE/qsynedit/Search.h +++ b/RedPandaIDE/qsynedit/Search.h @@ -14,7 +14,7 @@ public: int length(int aIndex) override; int result(int aIndex) override; int resultCount() override; - int findAll(const QString &keyword) override; + int findAll(const QString &text) override; QString replace(const QString &aOccurrence, const QString &aReplacement) override; private: bool isDelimitChar(QChar ch); diff --git a/RedPandaIDE/qsynedit/SearchBase.h b/RedPandaIDE/qsynedit/SearchBase.h index 9e3adacb..c832fd4f 100644 --- a/RedPandaIDE/qsynedit/SearchBase.h +++ b/RedPandaIDE/qsynedit/SearchBase.h @@ -26,7 +26,7 @@ public: virtual int length(int aIndex) = 0; virtual int result(int aIndex) = 0; virtual int resultCount() = 0; - virtual int findAll(const QString& keyword) = 0; + virtual int findAll(const QString& text) = 0; virtual QString replace(const QString& aOccurrence, const QString& aReplacement) = 0; SynSearchOptions options() const; virtual void setOptions(const SynSearchOptions &options); diff --git a/RedPandaIDE/qsynedit/SearchRegex.cpp b/RedPandaIDE/qsynedit/SearchRegex.cpp index aed1da7e..8e764ce2 100644 --- a/RedPandaIDE/qsynedit/SearchRegex.cpp +++ b/RedPandaIDE/qsynedit/SearchRegex.cpp @@ -26,13 +26,13 @@ int SynSearchRegex::resultCount() return mResults.size(); } -int SynSearchRegex::findAll(const QString &keyword) +int SynSearchRegex::findAll(const QString &text) { if (pattern().isEmpty()) return 0; mResults.clear(); mLengths.clear(); - QRegularExpressionMatchIterator it = mRegex.globalMatch(keyword); + QRegularExpressionMatchIterator it = mRegex.globalMatch(text); while (it.hasNext()) { QRegularExpressionMatch match = it.next(); mLengths.append(match.capturedLength()); diff --git a/RedPandaIDE/qsynedit/SearchRegex.h b/RedPandaIDE/qsynedit/SearchRegex.h index b85f43f9..1a49ca3b 100644 --- a/RedPandaIDE/qsynedit/SearchRegex.h +++ b/RedPandaIDE/qsynedit/SearchRegex.h @@ -15,7 +15,7 @@ public: int length(int aIndex) override; int result(int aIndex) override; int resultCount() override; - int findAll(const QString &keyword) override; + int findAll(const QString &text) override; QString replace(const QString &aOccurrence, const QString &aReplacement) override; void setPattern(const QString &value) override; void setOptions(const SynSearchOptions &options) override; diff --git a/RedPandaIDE/widgets/searchdialog.cpp b/RedPandaIDE/widgets/searchdialog.cpp index 484c6f26..64a7f41e 100644 --- a/RedPandaIDE/widgets/searchdialog.cpp +++ b/RedPandaIDE/widgets/searchdialog.cpp @@ -21,6 +21,7 @@ SearchDialog::SearchDialog(QWidget *parent) : mTabBar->addTab(tr("Find")); mTabBar->addTab(tr("Find in files")); mTabBar->addTab(tr("Replace")); + mTabBar->addTab(tr("Replace in files")); mTabBar->setExpanding(false); ui->dialogLayout->insertWidget(0,mTabBar); connect(mTabBar,&QTabBar::currentChanged,this, &SearchDialog::onTabChanged); @@ -101,7 +102,7 @@ void SearchDialog::replace(const QString &sFind, const QString &sReplace) void SearchDialog::onTabChanged() { bool isfind = (mTabBar->currentIndex() == 0); - bool isfindfiles = (mTabBar->currentIndex() == 1); + bool isfindfiles = (mTabBar->currentIndex() == 1 || mTabBar->currentIndex() == 3 ); bool isreplace = (mTabBar->currentIndex() == 2); ui->lblReplace->setVisible(isreplace); @@ -246,7 +247,7 @@ void SearchDialog::on_btnExecute_clicked() }); } - } else if (actionType == SearchAction::FindFiles) { + } else if (actionType == SearchAction::FindFiles || actionType == SearchAction::ReplaceFiles) { int fileSearched = 0; int fileHitted = 0; QString keyword = ui->cbFind->currentText(); @@ -339,7 +340,7 @@ void SearchDialog::on_btnExecute_clicked() // end; } if (findCount>0) - pMainWindow->showSearchPanel(); + pMainWindow->showSearchPanel(actionType == SearchAction::ReplaceFiles); } } diff --git a/RedPandaIDE/widgets/searchresultview.cpp b/RedPandaIDE/widgets/searchresultview.cpp index 09c00887..19b872a8 100644 --- a/RedPandaIDE/widgets/searchresultview.cpp +++ b/RedPandaIDE/widgets/searchresultview.cpp @@ -119,7 +119,8 @@ void SearchResultModel::removeSearchResults(int index) SearchResultTreeModel::SearchResultTreeModel(SearchResultModel *model, QObject *parent): QAbstractItemModel(parent), - mSearchResultModel(model) + mSearchResultModel(model), + mSelectable(false) { connect(mSearchResultModel,&SearchResultModel::currentChanged, this,&SearchResultTreeModel::onResultModelChanged); @@ -213,6 +214,21 @@ QVariant SearchResultTreeModel::data(const QModelIndex &index, int role) const .arg(item->text); } } + if (role == Qt::CheckStateRole && mSelectable) { + + PSearchResults results = mSearchResultModel->currentResults(); + + if (!results || !index.isValid() ) { + // This is nothing this function is supposed to handle + return QVariant(); + } + + if (item->parent==nullptr) { //is filename + return QVariant(); + } else { + return (item->selected)?Qt::Checked:Qt::Unchecked; + } + } return QVariant(); } @@ -256,6 +272,69 @@ void SearchResultTreeModel::onResultModelChanged() endResetModel(); } +Qt::ItemFlags SearchResultTreeModel::flags(const QModelIndex &index) const +{ + Qt::ItemFlags flags=Qt::ItemIsEnabled | Qt::ItemIsSelectable; + if (mSelectable) { + flags.setFlag(Qt::ItemIsUserCheckable); + } + return flags; +} + +bool SearchResultTreeModel::setData(const QModelIndex &index, const QVariant &value, int role) +{ + if (!index.isValid()){ + return false; + } + SearchResultTreeItem *item = static_cast(index.internalPointer()); + if (!item) + return false; + if (role == Qt::CheckStateRole && mSelectable) { + + PSearchResults results = mSearchResultModel->currentResults(); + + if (!results || !index.isValid() ) { + // This is nothing this function is supposed to handle + return false; + } + + if (item->parent==nullptr) { //is filename + return false; + } else { + item->selected = value.toBool(); + return true; + } + } + return false; + +} + +bool SearchResultTreeModel::selectable() const +{ + return mSelectable; +} + +void SearchResultTreeModel::setSelectable(bool newSelectable) +{ + if (newSelectable!=mSelectable) { + beginResetModel(); + mSelectable = newSelectable; + if (mSelectable) { + //select all items by default + PSearchResults results = mSearchResultModel->currentResults(); + if (results) { + foreach (const PSearchResultTreeItem& file, results->results) { + file->selected = false; + foreach (const PSearchResultTreeItem& item, file->results) { + item->selected = true; + } + } + } + } + endResetModel(); + } +} + SearchResultListModel::SearchResultListModel(SearchResultModel *model, QObject *parent): QAbstractListModel(parent), mSearchResultModel(model) diff --git a/RedPandaIDE/widgets/searchresultview.h b/RedPandaIDE/widgets/searchresultview.h index 49bbab23..9c9781e1 100644 --- a/RedPandaIDE/widgets/searchresultview.h +++ b/RedPandaIDE/widgets/searchresultview.h @@ -26,6 +26,7 @@ struct SearchResultTreeItem { QString text; SearchResultTreeItem* parent; SearchResultTreeItemList results; + bool selected; }; struct SearchResults{ @@ -98,10 +99,22 @@ public: QString& filename, int& line, int& startChar); + bool selectable() const; + void setSelectable(bool newSelectable); + public slots: void onResultModelChanged(); private: SearchResultModel *mSearchResultModel; + bool mSelectable; + + // QAbstractItemModel interface +public: + Qt::ItemFlags flags(const QModelIndex &index) const override; + + // QAbstractItemModel interface +public: + bool setData(const QModelIndex &index, const QVariant &value, int role) override; }; using PSearchResultTreeModel = std::shared_ptr;