From 89ee9d8914908e554c09cd5b22aedc57d1e33a9c Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Wed, 4 Jan 2023 11:01:34 +0800 Subject: [PATCH] - fix: Crash when find occurrences in a project that has missing files. rename FileEndType to NewlineType --- NEWS.md | 2 + RedPandaIDE/cpprefacter.cpp | 30 +- RedPandaIDE/cpprefacter.h | 1 + RedPandaIDE/mainwindow.cpp | 23 +- RedPandaIDE/mainwindow.h | 2 + RedPandaIDE/translations/RedPandaIDE_pt_BR.ts | 6 +- RedPandaIDE/translations/RedPandaIDE_zh_CN.ts | 786 +++++++++--------- RedPandaIDE/translations/RedPandaIDE_zh_TW.ts | 8 +- libs/qsynedit/qsynedit/TextBuffer.cpp | 28 +- libs/qsynedit/qsynedit/TextBuffer.h | 6 +- .../qsynedit/exporter/synexporter.cpp | 12 +- libs/qsynedit/qsynedit/exporter/synexporter.h | 6 +- libs/redpanda_qt_utils/qt_utils/utils.h | 2 +- 13 files changed, 472 insertions(+), 440 deletions(-) diff --git a/NEWS.md b/NEWS.md index 6b90d7f0..331d6042 100644 --- a/NEWS.md +++ b/NEWS.md @@ -12,6 +12,8 @@ Red Panda C++ Version 2.8 - fix: Error When save project units' encoding settings. - enhancement: Waiting for syntax parsers to finish before saving files, to prevent data lost caused by syntax parsering crash. - fix: Restore main window and cpu info window will set wrong font in the cpu info. + - enhancement: Let encoding options in the statusbar more explicit. + - fix: Crash when find occurrences in a project that has missing files. Red Panda C++ Version 2.7 diff --git a/RedPandaIDE/cpprefacter.cpp b/RedPandaIDE/cpprefacter.cpp index d2639b2c..1d518231 100644 --- a/RedPandaIDE/cpprefacter.cpp +++ b/RedPandaIDE/cpprefacter.cpp @@ -50,11 +50,15 @@ bool CppRefacter::findOccurence(Editor *editor, const QSynedit::BufferCoord &pos if (!statement) return false; - std::shared_ptr project = pMainWindow->project(); - if (editor->inProject() && project) { - doFindOccurenceInProject(statement,project,editor->parser()); - } else { + if (statement->scope == StatementScope::Local) { doFindOccurenceInEditor(statement,editor,editor->parser()); + } else { + std::shared_ptr project = pMainWindow->project(); + if (editor->inProject() && project) { + doFindOccurenceInProject(statement,project,editor->parser()); + } else { + doFindOccurenceInEditor(statement,editor,editor->parser()); + } } pMainWindow->searchResultModel()->notifySearchResultsUpdated(); return true; @@ -88,10 +92,10 @@ bool CppRefacter::findOccurence(const QString &statementFullname, SearchFileScop if (!statement) return false; - if (scope == SearchFileScope::wholeProject) { - doFindOccurenceInProject(statement,project,parser); - } else if (scope == SearchFileScope::currentFile) { + if (statement->scope == StatementScope::Local || scope == SearchFileScope::currentFile) { doFindOccurenceInEditor(statement, editor,parser); + } else if (scope == SearchFileScope::wholeProject) { + doFindOccurenceInProject(statement,project,parser); } pMainWindow->searchResultModel()->notifySearchResultsUpdated(); return true; @@ -163,6 +167,7 @@ void CppRefacter::doFindOccurenceInEditor(PStatement statement , Editor *editor, ); PSearchResultTreeItem item = findOccurenceInFile( editor->filename(), + editor->encodingOption(), statement, parser); if (item && !(item->results.isEmpty())) { @@ -181,6 +186,7 @@ void CppRefacter::doFindOccurenceInProject(PStatement statement, std::shared_ptr if (isCFile(unit->fileName()) || isHFile(unit->fileName())) { PSearchResultTreeItem item = findOccurenceInFile( unit->fileName(), + unit->encoding(), statement, parser); if (item && !(item->results.isEmpty())) { @@ -192,6 +198,7 @@ void CppRefacter::doFindOccurenceInProject(PStatement statement, std::shared_ptr PSearchResultTreeItem CppRefacter::findOccurenceInFile( const QString &filename, + const QByteArray& fileEncoding, const PStatement &statement, const PCppParser& parser) { @@ -203,9 +210,16 @@ PSearchResultTreeItem CppRefacter::findOccurenceInFile( if (pMainWindow->editorList()->getContentFromOpenedEditor( filename,buffer)){ editor.document()->setContents(buffer); + } else if (!fileExists(filename)){ + return parentItem; } else { QByteArray encoding; - editor.document()->loadFromFile(filename,ENCODING_AUTO_DETECT,encoding); + try { + editor.document()->loadFromFile(filename,fileEncoding,encoding); + } catch (FileError e) { + //don't handle it; + return parentItem; + } } editor.setSyntaxer(syntaxerManager.getSyntaxer(QSynedit::ProgrammingLanguage::CPP)); int posY = 0; diff --git a/RedPandaIDE/cpprefacter.h b/RedPandaIDE/cpprefacter.h index 39119daa..a8815c85 100644 --- a/RedPandaIDE/cpprefacter.h +++ b/RedPandaIDE/cpprefacter.h @@ -42,6 +42,7 @@ private: void doFindOccurenceInProject(PStatement statement, std::shared_ptr project, const PCppParser& parser); PSearchResultTreeItem findOccurenceInFile( const QString& filename, + const QByteArray& fileEncoding, const PStatement& statement, const PCppParser& parser); void renameSymbolInFile( diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 9eed6dbb..3c4ac922 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -137,9 +137,9 @@ MainWindow::MainWindow(QWidget *parent) mFileEncodingStatus = new LabelWithMenu(); mFileModeStatus = new QLabel(); - mFileInfoStatus->setStyleSheet("margin-left:10px; margin-right:10px"); - mFileEncodingStatus->setStyleSheet("margin-left:10px; margin-right:10px"); - mFileModeStatus->setStyleSheet("margin-left:10px; margin-right:10px"); + mFileInfoStatus->setStyleSheet("margin-left:5px; margin-right:5px"); + mFileEncodingStatus->setStyleSheet("margin-left:5px; margin-right:5px"); + mFileModeStatus->setStyleSheet("margin-left:5px; margin-right:5px"); prepareTabInfosData(); prepareTabMessagesData(); ui->statusbar->insertPermanentWidget(0,mFileModeStatus); @@ -459,12 +459,12 @@ void MainWindow::updateForEncodingInfo(const Editor* editor, bool clear) { if (!clear && editor!=nullptr) { if (editor->encodingOption() != editor->fileEncoding()) { mFileEncodingStatus->setText( - QString("%1(%2)") + QString(" %1(%2) ") .arg(QString(editor->encodingOption()) ,QString(editor->fileEncoding()))); } else { mFileEncodingStatus->setText( - QString("%1") + QString(" %1 ") .arg(QString(editor->encodingOption())) ); } @@ -1323,12 +1323,10 @@ void MainWindow::updateStatusbarForLineCol(const Editor* e, bool clear) { if (!clear && e!=nullptr) { int col = e->charToColumn(e->caretY(),e->caretX()); - QString msg = tr("Line:%1 Col:%2 Selected:%3 Lines:%4 Length:%5") + QString msg = tr("Line: %1 Col: %2 Lines: %3") .arg(e->caretY()) .arg(col) - .arg(e->selText().length()) - .arg(e->document()->count()) - .arg(e->document()->getTextLength()); + .arg(e->document()->count()); mFileInfoStatus->setText(msg); } else { mFileInfoStatus->setText(""); @@ -3350,6 +3348,12 @@ void MainWindow::buildEncodingMenu() ui->actionEncode_in_UTF_8_BOM->setCheckable(true); } +void MainWindow::buildNewlineMenu() +{ + mMenuNewline = new QMenu(this); + mMenuNewline->setTitle(tr("Newline")); +} + void MainWindow::maximizeEditor() { if (ui->tabExplorer->isShrinked() && ui->tabExplorer->isShrinked()) { @@ -9252,6 +9256,7 @@ void MainWindow::on_actionToggle_Readonly_triggered() editor->setReadOnly(!editor->readOnly()); editor->updateCaption(); updateEditorActions(editor); + updateForStatusbarModeInfo(editor); } } diff --git a/RedPandaIDE/mainwindow.h b/RedPandaIDE/mainwindow.h index 8ab87452..fdc1e0c8 100644 --- a/RedPandaIDE/mainwindow.h +++ b/RedPandaIDE/mainwindow.h @@ -275,6 +275,7 @@ private: void initToolButtons(); void buildContextMenus(); void buildEncodingMenu(); + void buildNewlineMenu(); void maximizeEditor(); QStringList getBinDirsForCurrentEditor(); QStringList getDefaultCompilerSetBinDirs(); @@ -778,6 +779,7 @@ private: LabelWithMenu *mFileEncodingStatus; QLabel *mFileModeStatus; QMenu *mMenuEncoding; + QMenu *mMenuNewline; QMenu *mMenuExport; QMenu *mMenuEncodingList; QMenu *mMenuRecentFiles; diff --git a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts index 4c0ec0d2..80c0f008 100644 --- a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts +++ b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts @@ -4046,7 +4046,7 @@ Line:%1 Col:%2 Selected:%3 Lines:%4 Length:%5 - Linha:%1 Coluna:%2 Seleção:%3 Linhas:%4 Tamanho:%5 + Linha:%1 Coluna:%2 Seleção:%3 Linhas:%4 Tamanho:%5 Read Only @@ -4924,6 +4924,10 @@ Toggle Readonly + + Line: %1 Col: %2 Lines: %3 + + NewClassDialog diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts index dfcd511e..575da5df 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts @@ -1078,18 +1078,18 @@ Are you really want to continue? CppRefacter - - + + Rename Symbol Error 重命名符号失败 - + Can't rename symbols not defined in this file. 无法重命名不在本文件中定义的符号 - + New symbol already exists! 新符号名称已被使用！ @@ -1377,13 +1377,13 @@ Are you really want to continue? 失败 - - - - - - - + + + + + + + Error 错误 @@ -1392,44 +1392,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 +1438,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 只读 @@ -4100,18 +4100,18 @@ Are you really want to continue? MainWindow - + Red Panda C++ 小熊猫C++ - - - - - + + + + + Issues 编译器 @@ -4185,7 +4185,7 @@ Are you really want to continue? - + Debug Console 调试主控台 @@ -4261,7 +4261,7 @@ Are you really want to continue? 工具栏2 - + New 新建 @@ -4319,8 +4319,8 @@ Are you really want to continue? - - + + Compile 编译 @@ -4397,9 +4397,9 @@ Are you really want to continue? - - - + + + Copy 复制 @@ -4410,7 +4410,7 @@ Are you really want to continue? - + Paste 粘贴 @@ -4421,8 +4421,8 @@ Are you really want to continue? - - + + Select All 选择全部 @@ -4548,38 +4548,38 @@ Are you really want to continue? - - + + New Problem Set 新建试题集 - + Add Problem 添加试题 - + Remove Problem 删除试题 - - + + Save Problem Set 保存试题集 - - + + Load Problem Set 载入试题集 @@ -4627,7 +4627,7 @@ Are you really want to continue? - + Remove Problem Case Remove Problem Set 删除试题集 @@ -4635,21 +4635,21 @@ Are you really want to continue? - + Open Anwser Source File 打开答案源代码文件 - + Run All Cases Run Current Case 运行所有案例 - + Problem Cases Validation Options 测试案例验证选项 @@ -4709,15 +4709,15 @@ Are you really want to continue? - - + + Import FPS Problem Set 导入FPS试题集 - - + + Export FPS Problem Set 导出FPS试题集 @@ -4954,7 +4954,7 @@ Are you really want to continue? - + Clear all breakpoints 删除所有断点 @@ -5165,7 +5165,7 @@ Are you really want to continue? - + New File 新建文件 @@ -5206,7 +5206,7 @@ Are you really want to continue? - + Rename Symbol 重命名符号 @@ -5227,13 +5227,13 @@ Are you really want to continue? - + Export As RTF 导出为RTF - + Export As HTML 导出为HTML @@ -5502,42 +5502,42 @@ Are you really want to continue? 运行参数... - + File Encoding 文件编码 - + Recent Files 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -5546,23 +5546,22 @@ 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 + 行: %1 列: %2 已选择 :%3 总行数: %4 总长度: %5 - + Read Only 只读 - + Insert 插入 - + Overwrite 覆写 @@ -5575,75 +5574,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 启用调试参数 @@ -5652,54 +5651,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 保存上次打开信息失败 @@ -5708,60 +5707,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已存在。是否覆盖？ @@ -5769,25 +5768,25 @@ Are you really want to continue? - - - + + + Clear 清除 - + Export 导出 - + Insert Snippet 插入代码段 - - + + Problem Set %1 试题集%1 @@ -5808,68 +5807,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: 描述： @@ -5878,65 +5877,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 重命名 @@ -5945,157 +5944,162 @@ 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编码 - + %1 files autosaved 已自动保存%1个文件 - + Set answer to... 设置答案源代码... - + select other file... 选择其他文件... - + Select Answer Source File 选择答案源代码文件 @@ -6104,17 +6108,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 导出时出错 @@ -6124,7 +6128,7 @@ Are you really want to continue? C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + New Folder %1 新建文件夹%1 @@ -6137,68 +6141,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? 你真的想要那么做吗？ @@ -6207,12 +6211,12 @@ Are you really want to continue? 批量设置案例 - + Choose input files 选择输入数据文件 - + Input data files (*.in) 输入数据文件 (*.in) @@ -6221,78 +6225,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'? @@ -6301,28 +6305,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 选择期望输出文件 @@ -6334,59 +6338,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! 提交信息不能为空！ @@ -6395,22 +6399,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? 同时从硬盘上删除文件？ @@ -6419,246 +6423,246 @@ 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 - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + 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个文件） @@ -7061,105 +7065,105 @@ Are you really want to continue? 无法保存文件'%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++编辑器开发 @@ -7652,32 +7656,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' @@ -8102,7 +8106,7 @@ Are you really want to continue? 生成调试信息(-g3) - + Would you like Red Panda C++ to search for compilers in PATH? 您同意小熊猫C++在PATH路径中寻找gcc编译器吗？ @@ -8215,7 +8219,7 @@ Are you really want to continue? 只生成汇编代码(-S) - + Confirm 确认 @@ -8236,13 +8240,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 @@ -8612,7 +8616,7 @@ Are you really want to continue? - + Can't open file '%1' for write. 无法写入文件'%1'. @@ -9320,18 +9324,18 @@ Are you really want to continue? 性能 - - - + + + Compiler Set 编译器配置集 - - - + + + Compiler @@ -9343,7 +9347,7 @@ Are you really want to continue? 自动链接 - + @@ -9420,15 +9424,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 da8e39d7..a768d15d 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts @@ -3893,10 +3893,6 @@ Clear History - - Line:%1 Col:%2 Selected:%3 Lines:%4 Length:%5 - - Read Only @@ -4741,6 +4737,10 @@ Toggle Readonly + + Line: %1 Col: %2 Lines: %3 + + NewClassDialog diff --git a/libs/qsynedit/qsynedit/TextBuffer.cpp b/libs/qsynedit/qsynedit/TextBuffer.cpp index f03b8a38..0f32968b 100644 --- a/libs/qsynedit/qsynedit/TextBuffer.cpp +++ b/libs/qsynedit/qsynedit/TextBuffer.cpp @@ -43,7 +43,7 @@ Document::Document(const QFont& font, const QFont& nonAsciiFont, QObject *parent { mAppendNewLineAtEOF = true; - mFileEndingType = FileEndingType::Windows; + mNewlineType = NewlineType::Windows; mIndexOfLongestLine = -1; mUpdateCount = 0; mCharWidth = mFontMetrics.horizontalAdvance("M"); @@ -147,12 +147,12 @@ int Document::lengthOfLongestLine() { QString Document::lineBreak() const { - switch(mFileEndingType) { - case FileEndingType::Linux: + switch(mNewlineType) { + case NewlineType::Unix: return "\n"; - case FileEndingType::Windows: + case NewlineType::Windows: return "\r\n"; - case FileEndingType::Mac: + case NewlineType::MacOld: return "\r"; } return "\n"; @@ -321,7 +321,7 @@ int Document::getTextLength() int Result = 0; foreach (const PDocumentLine& line, mLines ) { Result += line->fString.length(); - if (mFileEndingType == FileEndingType::Windows) { + if (mNewlineType == NewlineType::Windows) { Result += 2; } else { Result += 1; @@ -542,7 +542,7 @@ void Document::loadFromFile(const QString& filename, const QByteArray& encoding, { QMutexLocker locker(&mMutex); QFile file(filename); - if (!file.open(QFile::ReadOnly )) + if (!file.open(QFile::ReadOnly)) throw FileError(tr("Can't open file '%1' for read!").arg(file.fileName())); beginUpdate(); internalClear(); @@ -573,11 +573,11 @@ void Document::loadFromFile(const QString& filename, const QByteArray& encoding, codec = QTextCodec::codecForName(ENCODING_UTF8); } if (line.endsWith("\r\n")) { - mFileEndingType = FileEndingType::Windows; + mNewlineType = NewlineType::Windows; } else if (line.endsWith("\n")) { - mFileEndingType = FileEndingType::Linux; + mNewlineType = NewlineType::Unix; } else if (line.endsWith("\r")) { - mFileEndingType = FileEndingType::Mac; + mNewlineType = NewlineType::MacOld; } internalClear(); while (true) { @@ -780,16 +780,16 @@ void Document::internalClear() } } -FileEndingType Document::getFileEndingType() +NewlineType Document::getNewlineType() { QMutexLocker locker(&mMutex); - return mFileEndingType; + return mNewlineType; } -void Document::setFileEndingType(const FileEndingType &fileEndingType) +void Document::setNewlineType(const NewlineType &fileEndingType) { QMutexLocker locker(&mMutex); - mFileEndingType = fileEndingType; + mNewlineType = fileEndingType; } bool Document::empty() diff --git a/libs/qsynedit/qsynedit/TextBuffer.h b/libs/qsynedit/qsynedit/TextBuffer.h index 4931f55c..a8ac3800 100644 --- a/libs/qsynedit/qsynedit/TextBuffer.h +++ b/libs/qsynedit/qsynedit/TextBuffer.h @@ -98,8 +98,8 @@ public: bool getAppendNewLineAtEOF(); void setAppendNewLineAtEOF(bool appendNewLineAtEOF); - FileEndingType getFileEndingType(); - void setFileEndingType(const FileEndingType &fileEndingType); + NewlineType getNewlineType(); + void setNewlineType(const NewlineType &fileEndingType); bool empty(); @@ -143,7 +143,7 @@ private: int mCharWidth; //int mCount; //int mCapacity; - FileEndingType mFileEndingType; + NewlineType mNewlineType; bool mAppendNewLineAtEOF; int mIndexOfLongestLine; int mUpdateCount; diff --git a/libs/qsynedit/qsynedit/exporter/synexporter.cpp b/libs/qsynedit/qsynedit/exporter/synexporter.cpp index e9b18b1b..eb13d9b3 100644 --- a/libs/qsynedit/qsynedit/exporter/synexporter.cpp +++ b/libs/qsynedit/qsynedit/exporter/synexporter.cpp @@ -32,7 +32,7 @@ SynExporter::SynExporter(const QByteArray charset):mCharset(charset) mForegroundColor = QGuiApplication::palette().color(QPalette::Text); mUseBackground = false; mExportAsText = false; - mFileEndingType = FileEndingType::Windows; + mFileEndingType = NewlineType::Windows; clear(); setTitle(""); } @@ -211,12 +211,12 @@ void SynExporter::setUseBackground(bool Value) } } -FileEndingType SynExporter::fileEndingType() const +NewlineType SynExporter::fileEndingType() const { return mFileEndingType; } -void SynExporter::setFileEndingType(const FileEndingType &fileEndingType) +void SynExporter::setFileEndingType(const NewlineType &fileEndingType) { mFileEndingType = fileEndingType; } @@ -389,11 +389,11 @@ void SynExporter::setOnFormatToken(const FormatTokenHandler &onFormatToken) QString SynExporter::lineBreak() { switch(mFileEndingType) { - case FileEndingType::Linux: + case NewlineType::Unix: return "\n"; - case FileEndingType::Windows: + case NewlineType::Windows: return "\r\n"; - case FileEndingType::Mac: + case NewlineType::MacOld: return "\r"; } return "\n"; diff --git a/libs/qsynedit/qsynedit/exporter/synexporter.h b/libs/qsynedit/qsynedit/exporter/synexporter.h index 39a73413..ee84b603 100644 --- a/libs/qsynedit/qsynedit/exporter/synexporter.h +++ b/libs/qsynedit/qsynedit/exporter/synexporter.h @@ -78,8 +78,8 @@ public: bool useBackground() const; void setUseBackground(bool Value); - FileEndingType fileEndingType() const; - void setFileEndingType(const FileEndingType &fileEndingType); + NewlineType fileEndingType() const; + void setFileEndingType(const NewlineType &fileEndingType); /** * @brief The clipboard format the exporter creates as native format. @@ -119,7 +119,7 @@ protected: QMap mReplaceReserved; QString mTitle; bool mUseBackground; - FileEndingType mFileEndingType; + NewlineType mFileEndingType; QString lineBreak(); diff --git a/libs/redpanda_qt_utils/qt_utils/utils.h b/libs/redpanda_qt_utils/qt_utils/utils.h index 554a0c69..68d8d370 100644 --- a/libs/redpanda_qt_utils/qt_utils/utils.h +++ b/libs/redpanda_qt_utils/qt_utils/utils.h @@ -36,7 +36,7 @@ class QTextCodec; #define ENCODING_SYSTEM_DEFAULT "SYSTEM" #define ENCODING_ASCII "ASCII" -enum class FileEndingType { +enum class NewlineType { Windows, Unix, MacOld