From ea265488352b23e31b2e7095f9949617f344116f Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Thu, 12 Jan 2023 16:53:00 +0800 Subject: [PATCH] - enhancement: Add "Open files in editor" in the search panel - enhancement: Auto disable the "in project" option in the "search in files" dialog, if no project is opened. - enhancement: Auto disable the "search again" button in the search panel if the current search history item is search in the project, and no project is opened. --- NEWS.md | 3 + RedPandaIDE/cpprefacter.cpp | 26 +- RedPandaIDE/mainwindow.cpp | 91 +- RedPandaIDE/mainwindow.ui | 9 +- RedPandaIDE/settings.cpp | 14 + RedPandaIDE/settings.h | 4 + RedPandaIDE/translations/RedPandaIDE_pt_BR.ts | 4 + RedPandaIDE/translations/RedPandaIDE_zh_CN.ts | 1238 +++++++++-------- RedPandaIDE/translations/RedPandaIDE_zh_TW.ts | 4 + RedPandaIDE/widgets/searchinfiledialog.cpp | 5 + libs/qsynedit/qsynedit/qsynedit.cpp | 1 - 11 files changed, 761 insertions(+), 638 deletions(-) diff --git a/NEWS.md b/NEWS.md index 1dca3dc9..fd83ad62 100644 --- a/NEWS.md +++ b/NEWS.md @@ -28,6 +28,9 @@ Red Panda C++ Version 2.8 - enhancement: Rename symbols won't remove all breakpoints/bookmarks - enhancement: Batch replace won't remove all breakpoints/bookmarks - enhancement: Execute parameters can be used in debug. + - enhancement: Add "Open files in editor" in the search panel + - enhancement: Auto disable the "in project" option in the "search in files" dialog, if no project is opened. + - enhancement: Auto disable the "search again" button in the search panel if the current search history item is search in the project, and no project is opened. Red Panda C++ Version 2.7 diff --git a/RedPandaIDE/cpprefacter.cpp b/RedPandaIDE/cpprefacter.cpp index 3cc51f53..d428f93d 100644 --- a/RedPandaIDE/cpprefacter.cpp +++ b/RedPandaIDE/cpprefacter.cpp @@ -324,9 +324,17 @@ void CppRefacter::renameSymbolInFile(const QString &filename, const PStatement & } else { Editor editor(nullptr); QByteArray encoding; - editor.document()->loadFromFile(filename,ENCODING_AUTO_DETECT,encoding); - QStringList newContents; editor.setSyntaxer(syntaxerManager.getSyntaxer(QSynedit::ProgrammingLanguage::CPP)); + try { + editor.document()->loadFromFile(filename,ENCODING_AUTO_DETECT,encoding); + } catch(FileError e) { + QMessageBox::critical(pMainWindow, + tr("Rename Symbol Error"), + e.reason()); + return; + } + + QStringList newContents; int posY = 0; while (posY < editor.document()->count()) { QString line = editor.document()->getLine(posY); @@ -365,8 +373,16 @@ void CppRefacter::renameSymbolInFile(const QString &filename, const PStatement & } QByteArray realEncoding; QFile file(filename); - editor.document()->saveToFile(file,ENCODING_AUTO_DETECT, - pSettings->editor().defaultEncoding(), - realEncoding); + try { + editor.document()->saveToFile(file,ENCODING_AUTO_DETECT, + pSettings->editor().defaultEncoding(), + realEncoding); + } catch(FileError e) { + QMessageBox::critical(pMainWindow, + tr("Rename Symbol Error"), + e.reason()); + return; + } + } } diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 6a0fa032..d47dd37e 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -934,6 +934,7 @@ void MainWindow::applySettings() void MainWindow::applyUISettings() { const Settings::UI& settings = pSettings->ui(); + ui->chkOpenFileInEditors->setChecked(settings.openEditorsWhenReplace()); restoreGeometry(settings.mainWindowGeometry()); restoreState(settings.mainWindowState()); ui->actionTool_Window_Bars->setChecked(settings.showToolWindowBars()); @@ -5030,6 +5031,8 @@ void MainWindow::closeProject(bool refreshEditor) updateProjectView(); mClosingProject=false; } + if (refreshEditor) + on_cbSearchHistory_currentIndexChanged(ui->cbSearchHistory->currentIndex()); } void MainWindow::updateProjectView() @@ -5203,6 +5206,7 @@ void MainWindow::closeEvent(QCloseEvent *event) { if (mCPUDialog) mCPUDialog->close(); Settings::UI& settings = pSettings->ui(); + settings.setOpenEditorsWhenReplace(ui->chkOpenFileInEditors->isChecked()); settings.setMainWindowState(saveState()); settings.setMainWindowGeometry(saveGeometry()); settings.setBottomPanelIndex(ui->tabMessages->currentIndex()); @@ -6197,7 +6201,12 @@ void MainWindow::on_cbSearchHistory_currentIndexChanged(int index) mSearchResultModel.setCurrentIndex(index); PSearchResults results = mSearchResultModel.results(index); if (results) { - ui->btnSearchAgain->setEnabled(true); + if (results->searchType==SearchType::Search + && results->scope==SearchFileScope::wholeProject + && pMainWindow->project()==nullptr) + ui->btnSearchAgain->setEnabled(false); + else + ui->btnSearchAgain->setEnabled(true); } else { ui->btnSearchAgain->setEnabled(false); } @@ -6212,6 +6221,9 @@ void MainWindow::on_btnSearchAgain_clicked() if (!results) return; if (results->searchType == SearchType::Search){ + if (results->scope==SearchFileScope::wholeProject + && pMainWindow->project()==nullptr) + return; mSearchInFilesDialog->findInFiles(results->keyword, results->scope, results->options); @@ -7705,34 +7717,79 @@ void MainWindow::on_btnReplace_clicked() } QString newWord = ui->cbReplaceInHistory->currentText(); foreach (const PSearchResultTreeItem& file, results->results) { - QStringList contents; - Editor* editor = openFile(file->filename); - if (!editor) { - QMessageBox::critical(this, - tr("Replace Error"), - tr("Can't open file '%1' for replace!").arg(file->filename)); - return; + QVector selections; + foreach(const PSearchResultTreeItem& item,file->results) { + if (item->selected) { + selections.push_back(item); + } } - editor->clearSelection(); - editor->addGroupBreak(); - editor->beginUndoBlock(); - for (int i=file->results.count()-1;i>=0;i--) { - const PSearchResultTreeItem& item = file->results[i]; - if (!item->selected) - continue; + if (selections.isEmpty()) + continue; + Editor* editor = nullptr; + if (ui->chkOpenFileInEditors->isChecked()) { + editor = openFile(file->filename); + if (!editor) { + QMessageBox::critical(this, + tr("Replace Error"), + tr("Can't open file '%1' for replace!").arg(file->filename)); + return; + } + } else { + editor = mEditorList->getOpenedEditorByFilename(file->filename); + } + bool needSave=false; + std::shared_ptr pEditor; + if (editor) { + editor->clearSelection(); + editor->addGroupBreak(); + editor->beginUndoBlock(); + } else { + needSave=true; + pEditor = std::make_shared(nullptr); + editor = pEditor.get(); + QByteArray encoding; + editor->setSyntaxer(syntaxerManager.getSyntaxer(QSynedit::ProgrammingLanguage::CPP)); + try { + editor->document()->loadFromFile(file->filename,ENCODING_AUTO_DETECT,encoding); + } catch(FileError e) { + QMessageBox::critical(this, + tr("Replace Error"), + e.reason()); + return; + } + } + while (!selections.isEmpty()) { + const PSearchResultTreeItem& item = selections.back(); + selections.pop_back(); QString line = editor->document()->getLine(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!")); - editor->endUndoBlock(); + if (!needSave) + editor->endUndoBlock(); return; } line.remove(item->start-1,results->keyword.length()); line.insert(item->start-1, newWord); editor->replaceLine(item->line,line); } - editor->endUndoBlock(); + if (!needSave) { + editor->endUndoBlock(); + } else { + QByteArray realEncoding; + QFile toFile(file->filename); + try { + editor->document()->saveToFile(toFile,ENCODING_AUTO_DETECT, + pSettings->editor().defaultEncoding(), + realEncoding); + } catch(FileError e) { + QMessageBox::critical(this, + tr("Replace Error"), + e.reason()); + return; + } + } } showSearchReplacePanel(false); stretchMessagesPanel(false); diff --git a/RedPandaIDE/mainwindow.ui b/RedPandaIDE/mainwindow.ui index fcbeb283..9eff24ba 100644 --- a/RedPandaIDE/mainwindow.ui +++ b/RedPandaIDE/mainwindow.ui @@ -929,7 +929,7 @@ QTabWidget::South - 6 + 3 @@ -1445,6 +1445,13 @@ + + + + Open file in editors + + + diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp index 9b53da5d..46379629 100644 --- a/RedPandaIDE/settings.cpp +++ b/RedPandaIDE/settings.cpp @@ -5272,6 +5272,16 @@ void Settings::UI::setProblemOrder(int newProblemOrder) mProblemOrder = newProblemOrder; } +bool Settings::UI::openEditorsWhenReplace() const +{ + return mOpenEditorsWhenReplace; +} + +void Settings::UI::setOpenEditorsWhenReplace(bool newOpenEditorsWhenReplace) +{ + mOpenEditorsWhenReplace = newOpenEditorsWhenReplace; +} + int Settings::UI::bookmarkOrder() const { return mBookmarkOrder; @@ -5644,6 +5654,8 @@ void Settings::UI::setMainWindowState(const QByteArray &newMainWindowState) void Settings::UI::doSave() { + saveValue("open_editor_when_batch_replace",mOpenEditorsWhenReplace); + saveValue("main_window_state",mMainWindowState); saveValue("main_window_geometry",mMainWindowGeometry); saveValue("bottom_panel_index",mBottomPanelIndex); @@ -5707,6 +5719,8 @@ void Settings::UI::doSave() void Settings::UI::doLoad() { + mOpenEditorsWhenReplace=boolValue("open_editor_when_batch_replace",true); + mMainWindowState = value("main_window_state",QByteArray()).toByteArray(); mMainWindowGeometry = value("main_window_geometry",QByteArray()).toByteArray(); mBottomPanelIndex = intValue("bottom_panel_index",0); diff --git a/RedPandaIDE/settings.h b/RedPandaIDE/settings.h index dd6308a8..76746f3b 100644 --- a/RedPandaIDE/settings.h +++ b/RedPandaIDE/settings.h @@ -1122,7 +1122,11 @@ public: int problemOrder() const; void setProblemOrder(int newProblemOrder); + bool openEditorsWhenReplace() const; + void setOpenEditorsWhenReplace(bool newOpenEditorsWhenReplace); + private: + bool mOpenEditorsWhenReplace; QByteArray mMainWindowState; QByteArray mMainWindowGeometry; int mBottomPanelIndex; diff --git a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts index f212a42d..2cfdea8d 100644 --- a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts +++ b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts @@ -4940,6 +4940,10 @@ Newline + + Open file in editors + + NewClassDialog diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts index 8ee6ca60..e99eebb5 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts @@ -193,17 +193,17 @@ p, li { white-space: pre-wrap; } BacktraceModel - + Function 函数 - + Filename 文件名 - + Line 行 @@ -249,17 +249,17 @@ p, li { white-space: pre-wrap; } BreakpointModel - + Filename 文件名 - + Line 行 - + Condition 条件 @@ -1080,6 +1080,8 @@ Are you really want to continue? + + Rename Symbol Error 重命名符号失败 @@ -1313,27 +1315,27 @@ Are you really want to continue? 无法在"%1"找到gdb server - + Execute to evaluate 执行以求值 - + 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'. @@ -1342,22 +1344,22 @@ Are you really want to continue? 不在当前语境中 - + Compile 编译 - + Source file is more recent than executable. 源文件比程序文件新。 - + Recompile? 重新编译？ - + Signal "%1" Received: 收到信号"%1": @@ -1377,13 +1379,13 @@ Are you really want to continue? 失败 - - - - - - - + + + + + + + Error 错误 @@ -1392,44 +1394,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+单击以获取更多信息 @@ -1438,27 +1440,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 只读 @@ -4110,18 +4112,18 @@ Are you really want to continue? MainWindow - + Red Panda C++ 小熊猫C++ - - - - + - + + + + Issues 编译器 @@ -4140,8 +4142,8 @@ Are you really want to continue? 工具 - - + + Run 运行 @@ -4153,25 +4155,25 @@ Are you really want to continue? - + Project 项目 - + Watch 监视 - + Structure 结构 - + Files 文件 @@ -4182,9 +4184,9 @@ Are you really want to continue? - - - + + + Debug 调试 @@ -4195,7 +4197,7 @@ Are you really want to continue? - + Debug Console 调试主控台 @@ -4217,7 +4219,7 @@ Are you really want to continue? - + Search 查找 @@ -4237,12 +4239,12 @@ Are you really want to continue? 替换为： - + Replace 替换 - + Close 关闭 @@ -4276,73 +4278,73 @@ Are you really want to continue? 新建 - + 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 选择输入文件 @@ -4366,230 +4368,230 @@ 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 载入试题集 @@ -4605,81 +4607,81 @@ Are you really want to continue? 地址表达式： - + 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 期望输出 @@ -4719,15 +4721,15 @@ Are you really want to continue? - - + + Import FPS Problem Set 导入FPS试题集 - - + + Export FPS Problem Set 导出FPS试题集 @@ -4737,435 +4739,440 @@ Are you really want to continue? 消息 - + + Open file in editors + 在编辑器中打开文件 + + + Choose Expected Output File 选择期望输出文件 - + 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 从项目创建模板 - + Goto block start 跳转到代码段开始 - + Ctrl+Alt+Up Ctrl+Alt+Up - + Goto block end 跳转到代码段结束 - + Ctrl+Alt+Down Ctrl+Alt+Down - + Switch header/source 切换头文件/源文件 - + Switch Header/Source 切换头文件/源文件 - + Generate Assembly 生成汇编 - + Trim trailing spaces 删除行尾空格 - + Toggle Readonly 切换只读模式 @@ -5174,200 +5181,200 @@ 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+] @@ -5376,50 +5383,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 新建头文件... @@ -5429,47 +5436,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 删除到行首 @@ -5478,27 +5485,27 @@ Are you really want to continue? C/C++参考 - + EGE Manual EGE图形库手册 - + Add Bookmark 添加书签 - + Remove Bookmark 删除书签 - + Modify Bookmark Description 修改书签说明 - + Locate in Files View 在文件视图中定位 @@ -5507,12 +5514,12 @@ Are you really want to continue? 打开文件夹 - + Running Parameters... 运行参数... - + File Encoding 文件编码 @@ -5522,32 +5529,32 @@ Are you really want to continue? 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -5561,17 +5568,17 @@ Are you really want to continue? 行: %1 列: %2 已选择 :%3 总行数: %4 总长度: %5 - + Read Only 只读 - + Insert 插入 - + Overwrite 覆写 @@ -5584,75 +5591,75 @@ Are you really want to continue? 你确定要关闭'%1'吗？ - - + + Confirm 确认 - - - + + + Source file is not compiled. 源文件尚未编译。 - - + + Compile now? 现在编译？ - - + + Source file is more recent than executable. 源文件比可执行程序新。 - + Recompile now? 重新编译？ - - - - + + + + Wrong Compiler Settings 错误的编译器设置 - - - - + + + + Compiler is set not to generate executable. 编译器被设置为不生成可执行文件。 - - + + We need the executabe to run problem case. 我们需要可执行文件来运行试题案例。 - + No compiler set 无编译器设置 - + No compiler set is configured. 没有配置编译器设置。 - + Can't start debugging. 无法启动调试器 - - + + Enable debugging 启用调试参数 @@ -5661,54 +5668,54 @@ Are you really want to continue? 当前编译设置中未启用调试选项(-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'不存在。 - - + + Please correct this before start debugging 请在调试前改正设置。 - + Recompile? 重新编译？ - - + + Save last open info error 保存上次打开信息失败 @@ -5717,70 +5724,70 @@ 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已存在。是否覆盖？ - - - - - - + + + + + + Clear 清除 @@ -5796,7 +5803,7 @@ Are you really want to continue? - + Problem Set %1 试题集%1 @@ -5817,68 +5824,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: 描述： @@ -5887,65 +5894,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 重命名 @@ -5954,167 +5961,167 @@ Are you really want to continue? 您没有使用DEBUG编译配置。 - - + + Do you want to set it now? 要现在去修改设置吗？ - + Rename Problem Set 修改试题集名称 - + Can't open last open information file '%1' for write! 无法写入配置文件'%1'。 - + Rename Problem 修改试题名称 - + Line: %1 Col: %2 Lines: %3 行: %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 选择答案源代码文件 @@ -6123,17 +6130,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 导出时出错 @@ -6143,7 +6150,7 @@ Are you really want to continue? C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + New Folder %1 新建文件夹%1 @@ -6156,68 +6163,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? 你真的想要那么做吗？ @@ -6226,12 +6233,12 @@ Are you really want to continue? 批量设置案例 - + Choose input files 选择输入数据文件 - + Input data files (*.in) 输入数据文件 (*.in) @@ -6240,78 +6247,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'? @@ -6320,28 +6327,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 选择期望输出文件 @@ -6351,61 +6358,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! 提交信息不能为空！ @@ -6414,22 +6421,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? 同时从硬盘上删除文件？ @@ -6438,127 +6445,129 @@ Are you really want to continue? 无标题 - + New Project File Name 新的项目文件名 - + File Name: 文件名： - + File Already Exists! 文件已存在！ - + File '%1' already exists! 文件'%1'已经存在！ - + Add to project 添加到项目 - - + + You are not using a Debug compiler setting. 您没有使用Debug编译器设置。 - + Please use a Debug compiler set, or enable the "generate debugging info (-g3)" and disable the "strip additional info (-s)" options in the compiler settings. 请在工具栏中选择Debug编译器配置集，或者在编译器配置集设置中启用“生成调试信息(-g3)”并禁用“剥除附加信息(-s)”选项。 - + Please choose a Debug compiler set in the toolbar, or enable the "generate debugging info (-g3)" and disable the "strip additional info (-s)" options in the compiler set settings's "settings" page. 请在工具栏中选择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 @@ -6569,16 +6578,16 @@ Are you really want to continue? - - - - - - - - - - + + + + + + + + + + Error 错误 @@ -6588,96 +6597,96 @@ Are you really want to continue? 项目历史 - + 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个文件） @@ -7967,32 +7976,33 @@ Are you really want to continue? 保存修改后的内容到"%s"？ - + Dev C++ Project files Dev C++项目文件 - + C files C语言文件 - + C++ files C++语言文件 - + Header files 头文件 - + Icon files 图标文件 - + + All files Text files 所有文件 @@ -8670,12 +8680,12 @@ Are you really want to continue? RegisterModel - + Register 寄存器 - + Value 值 @@ -9339,18 +9349,18 @@ Are you really want to continue? 性能 - - - + + + Compiler Set 编译器配置集 - - - + + + Compiler @@ -9362,7 +9372,7 @@ Are you really want to continue? 自动链接 - + @@ -9439,15 +9449,15 @@ Are you really want to continue? 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 @@ -9946,14 +9956,14 @@ Are you really want to continue? JSON文件'%1':%2中存在错误：%3 - - + + Execute to evaluate 执行以求值 - - + + Not Valid 在当前作用域中无效 @@ -9962,17 +9972,17 @@ Are you really want to continue? 无法读取文件'%1'. - + Expression 表达式 - + Type 类型 - + Value 值 diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts index 49aa590b..71747afd 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts @@ -4753,6 +4753,10 @@ Newline + + Open file in editors + + NewClassDialog diff --git a/RedPandaIDE/widgets/searchinfiledialog.cpp b/RedPandaIDE/widgets/searchinfiledialog.cpp index c7c717af..50392a4a 100644 --- a/RedPandaIDE/widgets/searchinfiledialog.cpp +++ b/RedPandaIDE/widgets/searchinfiledialog.cpp @@ -163,6 +163,8 @@ void SearchInFileDialog::doSearch(bool replace) } pMainWindow->searchResultModel()->notifySearchResultsUpdated(); } else if (ui->rbProject->isChecked()) { + if (!pMainWindow->project()) + return; PSearchResults results = pMainWindow->searchResultModel()->addSearchResults( keyword, mSearchOptions, @@ -277,6 +279,9 @@ std::shared_ptr SearchInFileDialog::batchFindInEditor(QSyn void SearchInFileDialog::showEvent(QShowEvent *event) { QDialog::showEvent(event); + ui->rbProject->setEnabled(pMainWindow->project()!=nullptr); + if (ui->rbProject->isChecked() && !ui->rbProject->isEnabled()) + ui->rbCurrentFile->setChecked(true); if (pSettings->environment().language()=="zh_CN") { ui->txtRegExpHelp->setText( QString("

(?)

") diff --git a/libs/qsynedit/qsynedit/qsynedit.cpp b/libs/qsynedit/qsynedit/qsynedit.cpp index 5dc263d2..67ec21ad 100644 --- a/libs/qsynedit/qsynedit/qsynedit.cpp +++ b/libs/qsynedit/qsynedit/qsynedit.cpp @@ -4373,7 +4373,6 @@ void QSynEdit::doUndoItem() break; } case ChangeReason::ReplaceLine: - qDebug()<changeStartPos().line<changeText(); mRedoList->addRedo( item->changeReason(), item->changeStartPos(),