diff --git a/NEWS.md b/NEWS.md index 47803aaa..6421b36c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -34,6 +34,7 @@ Red Panda C++ Version 2.24 - enhancement: Better layout for compiler options page. - enhancement: False branches are displayed as comments. - enhancement: Support SDCC Project. + - enhancement: 3 compare mode for problem cases. Red Panda C++ Version 2.23 diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 527fb16e..a66ef292 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -130,6 +130,11 @@ MainWindow::MainWindow(QWidget *parent) { ui->setupUi(this); + ui->cbProblemCaseValidateType->blockSignals(true); + ui->cbProblemCaseValidateType->addItem(tr("Exact")); + ui->cbProblemCaseValidateType->addItem(tr("Ignore leading/trailing spaces")); + ui->cbProblemCaseValidateType->addItem(tr("Ignore spaces")); + ui->cbProblemCaseValidateType->blockSignals(false); addActions( this->findChildren(QString(), Qt::FindChildrenRecursively)); //custom actions @@ -968,7 +973,7 @@ void MainWindow::applySettings() showHideMessagesTab(ui->tabProblem, pSettings->ui().showProblem() && pSettings->executor().enableProblemSet()); - ui->chkIgnoreSpaces->setChecked(pSettings->executor().ignoreSpacesWhenValidatingCases()); + ui->cbProblemCaseValidateType->setCurrentIndex((int)(pSettings->executor().problemCaseValidateType())); ui->actionInterrupt->setVisible(pSettings->debugger().useGDBServer()); //icon sets for editors updateEditorSettings(); @@ -6057,7 +6062,7 @@ void MainWindow::onOJProblemCaseFinished(const QString& id, int current, int tot if (row>=0) { POJProblemCase problemCase = mOJProblemModel.getCase(row); ProblemCaseValidator validator; - problemCase->testState = validator.validate(problemCase,pSettings->executor().ignoreSpacesWhenValidatingCases())? + problemCase->testState = validator.validate(problemCase,pSettings->executor().problemCaseValidateType())? ProblemCaseTestState::Passed: ProblemCaseTestState::Failed; mOJProblemModel.update(row); @@ -9623,14 +9628,6 @@ void MainWindow::on_actionToggle_Messages_Panel_triggered() stretchMessagesPanel(ui->tabMessages->isShrinked()); } - -void MainWindow::on_chkIgnoreSpaces_stateChanged(int /*arg1*/) -{ - pSettings->executor().setIgnoreSpacesWhenValidatingCases(ui->chkIgnoreSpaces->isChecked()); -} - - - void MainWindow::on_actionRaylib_Manual_triggered() { if (pSettings->environment().language()=="zh_CN") { @@ -10087,3 +10084,10 @@ bool MainWindow::openingFiles() const return mOpeningFiles; } + +void MainWindow::on_cbProblemCaseValidateType_currentIndexChanged(int index) +{ + pSettings->executor().setProblemCaseValidateType((ProblemCaseValidateType)index); + pSettings->executor().save(); +} + diff --git a/RedPandaIDE/mainwindow.h b/RedPandaIDE/mainwindow.h index ea7c34ee..38243840 100644 --- a/RedPandaIDE/mainwindow.h +++ b/RedPandaIDE/mainwindow.h @@ -767,8 +767,6 @@ private slots: void on_actionToggle_Messages_Panel_triggered(); - void on_chkIgnoreSpaces_stateChanged(int arg1); - void on_actionRaylib_Manual_triggered(); void on_actionSelect_Word_triggered(); @@ -850,6 +848,8 @@ private slots: void on_actionTurtle_Graphics_Manual_triggered(); + void on_cbProblemCaseValidateType_currentIndexChanged(int index); + private: Ui::MainWindow *ui; bool mFullInitialized; diff --git a/RedPandaIDE/mainwindow.ui b/RedPandaIDE/mainwindow.ui index 5cac26f6..4a0ec2ca 100644 --- a/RedPandaIDE/mainwindow.ui +++ b/RedPandaIDE/mainwindow.ui @@ -965,7 +965,7 @@ QTabWidget::South - 1 + 6 @@ -2060,11 +2060,7 @@ - - - Ignore Spaces - - + diff --git a/RedPandaIDE/problems/problemcasevalidator.cpp b/RedPandaIDE/problems/problemcasevalidator.cpp index 5fddfb85..cc4b1c6f 100644 --- a/RedPandaIDE/problems/problemcasevalidator.cpp +++ b/RedPandaIDE/problems/problemcasevalidator.cpp @@ -15,14 +15,13 @@ * along with this program. If not, see . */ #include "problemcasevalidator.h" -#include "../utils.h" ProblemCaseValidator::ProblemCaseValidator() { } -bool ProblemCaseValidator::validate(POJProblemCase problemCase, bool ignoreSpaces) +bool ProblemCaseValidator::validate(POJProblemCase problemCase, ProblemCaseValidateType type) { if (!problemCase) return false; @@ -44,18 +43,31 @@ bool ProblemCaseValidator::validate(POJProblemCase problemCase, bool ignoreSpace } } int count=std::min(output.count(), expected.count()); - for (int i=0;ifirstDiffLine = i; - return false; - } - } else { + switch(type) { + case ProblemCaseValidateType::Exact: + for (int i=0;ifirstDiffLine = i; return false; } } + break; + case ProblemCaseValidateType::IgnoreLeadingTrailingSpaces: + for (int i=0;ifirstDiffLine = i; + return false; + } + } + break; + case ProblemCaseValidateType::IgnoreSpaces: + for (int i=0;ifirstDiffLine = i; + return false; + } + } + break; } if (output.count()firstDiffLine=output.count(); diff --git a/RedPandaIDE/problems/problemcasevalidator.h b/RedPandaIDE/problems/problemcasevalidator.h index 0b66e94c..909c6815 100644 --- a/RedPandaIDE/problems/problemcasevalidator.h +++ b/RedPandaIDE/problems/problemcasevalidator.h @@ -18,12 +18,13 @@ #define PROBLEMCASEVALIDATOR_H #include "ojproblemset.h" +#include "../utils.h" class ProblemCaseValidator { public: ProblemCaseValidator(); - bool validate(POJProblemCase problemCase,bool ignoreSpaces); + bool validate(POJProblemCase problemCase, ProblemCaseValidateType type); private: bool equalIgnoringSpaces(const QString& s1, const QString& s2); QStringList split(const QString& s); diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp index 857fdb91..d5a47c02 100644 --- a/RedPandaIDE/settings.cpp +++ b/RedPandaIDE/settings.cpp @@ -2458,31 +2458,6 @@ void Settings::CompilerSet::setExecutables() mMake = findProgramInBinDirs(MAKE_PROGRAM); #ifdef Q_OS_WIN mResourceCompiler = findProgramInBinDirs(WINDRES_PROGRAM); - if (mMake.isEmpty()) { - mMake = findProgramInBinDirs(MAKE2_PROGRAM); - } - if (mMake.isEmpty()) { - QSet searched; - - QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); - QString path = env.value("PATH"); - QStringList pathList = path.split(PATH_SEPARATOR); - QString folder; - for (int i=pathList.count()-1;i>=0;i--) { - folder = pathList[i]; - if (searched.contains(folder)) - continue; - searched.insert(folder); - QDir dir(folder); - if (dir.exists(MAKE_PROGRAM)) { - mMake = dir.absoluteFilePath(MAKE_PROGRAM); - break; - } else if (dir.exists(MAKE2_PROGRAM)) { - mMake = dir.absoluteFilePath(MAKE2_PROGRAM); - break; - } - } - } #endif } @@ -3962,16 +3937,6 @@ void Settings::Executor::setCompetivieCompanionPort(int newCompetivieCompanionPo mCompetivieCompanionPort = newCompetivieCompanionPort; } -bool Settings::Executor::ignoreSpacesWhenValidatingCases() const -{ - return mIgnoreSpacesWhenValidatingCases; -} - -void Settings::Executor::setIgnoreSpacesWhenValidatingCases(bool newIgnoreSpacesWhenValidatingCases) -{ - mIgnoreSpacesWhenValidatingCases = newIgnoreSpacesWhenValidatingCases; -} - bool Settings::Executor::caseEditorFontOnlyMonospaced() const { return mCaseEditorFontOnlyMonospaced; @@ -4022,6 +3987,16 @@ void Settings::Executor::setRedirectStderrToToolLog(bool newRedirectStderrToTool mRedirectStderrToToolLog = newRedirectStderrToToolLog; } +ProblemCaseValidateType Settings::Executor::problemCaseValidateType() const +{ + return mProblemCaseValidateType; +} + +void Settings::Executor::setProblemCaseValidateType(ProblemCaseValidateType newProblemCaseValidateType) +{ + mProblemCaseValidateType = newProblemCaseValidateType; +} + bool Settings::Executor::convertHTMLToTextForInput() const { return mConvertHTMLToTextForInput; @@ -4096,7 +4071,7 @@ void Settings::Executor::doSave() saveValue("competitive_companion_port", mCompetivieCompanionPort); saveValue("input_convert_html", mConvertHTMLToTextForInput); saveValue("expected_convert_html", mConvertHTMLToTextForExpected); - saveValue("ignore_spaces_when_validating_cases", mIgnoreSpacesWhenValidatingCases); + saveValue("problem_case_validate_type", (int)mProblemCaseValidateType); saveValue("redirect_stderr_to_toollog", mRedirectStderrToToolLog); saveValue("case_editor_font_name",mCaseEditorFontName); saveValue("case_editor_font_size",mCaseEditorFontSize); @@ -4131,7 +4106,7 @@ void Settings::Executor::doLoad() mCompetivieCompanionPort = intValue("competitive_companion_port",10045); mConvertHTMLToTextForInput = boolValue("input_convert_html", false); mConvertHTMLToTextForExpected = boolValue("expected_convert_html", false); - mIgnoreSpacesWhenValidatingCases = boolValue("ignore_spaces_when_validating_cases",false); + mProblemCaseValidateType =(ProblemCaseValidateType)intValue("problem_case_validate_type", (int)ProblemCaseValidateType::Exact); mRedirectStderrToToolLog = boolValue("redirect_stderr_to_toollog", false); #ifdef Q_OS_WIN diff --git a/RedPandaIDE/settings.h b/RedPandaIDE/settings.h index f1860e02..ccf0eb30 100644 --- a/RedPandaIDE/settings.h +++ b/RedPandaIDE/settings.h @@ -904,9 +904,6 @@ public: int competivieCompanionPort() const; void setCompetivieCompanionPort(int newCompetivieCompanionPort); - bool ignoreSpacesWhenValidatingCases() const; - void setIgnoreSpacesWhenValidatingCases(bool newIgnoreSpacesWhenValidatingCases); - const QString &caseEditorFontName() const; void setCaseEditorFontName(const QString &newCaseEditorFontName); @@ -934,6 +931,9 @@ public: bool redirectStderrToToolLog() const; void setRedirectStderrToToolLog(bool newRedirectStderrToToolLog); + ProblemCaseValidateType problemCaseValidateType() const; + void setProblemCaseValidateType(ProblemCaseValidateType newProblemCaseValidateType); + private: // general bool mPauseConsole; @@ -950,6 +950,7 @@ public: bool mConvertHTMLToTextForInput; bool mConvertHTMLToTextForExpected; bool mIgnoreSpacesWhenValidatingCases; + ProblemCaseValidateType mProblemCaseValidateType; bool mRedirectStderrToToolLog; QString mCaseEditorFontName; int mCaseEditorFontSize; diff --git a/RedPandaIDE/settingsdialog/executorproblemsetwidget.cpp b/RedPandaIDE/settingsdialog/executorproblemsetwidget.cpp index 9dff813d..02d9b2f4 100644 --- a/RedPandaIDE/settingsdialog/executorproblemsetwidget.cpp +++ b/RedPandaIDE/settingsdialog/executorproblemsetwidget.cpp @@ -24,6 +24,10 @@ ExecutorProblemSetWidget::ExecutorProblemSetWidget(const QString& name, const QS ui(new Ui::ExecutorProblemSetWidget) { ui->setupUi(this); + ui->cbProblemCaseValidateType->addItem(tr("Exact")); + ui->cbProblemCaseValidateType->addItem(tr("Ignore leading/trailing spaces")); + ui->cbProblemCaseValidateType->addItem(tr("Ignore spaces")); + } ExecutorProblemSetWidget::~ExecutorProblemSetWidget() @@ -39,7 +43,7 @@ void ExecutorProblemSetWidget::doLoad() ui->chkConvertInputHTML->setChecked(pSettings->executor().convertHTMLToTextForInput()); ui->chkConvertExpectedHTML->setChecked(pSettings->executor().convertHTMLToTextForExpected()); - ui->chkIgnoreSpacesWhenValidatingCases->setChecked(pSettings->executor().ignoreSpacesWhenValidatingCases()); + ui->cbProblemCaseValidateType->setCurrentIndex((int)(pSettings->executor().problemCaseValidateType())); ui->chkRedirectStderr->setChecked(pSettings->executor().redirectStderrToToolLog()); ui->cbFont->setCurrentFont(QFont(pSettings->executor().caseEditorFontName())); @@ -58,7 +62,7 @@ void ExecutorProblemSetWidget::doSave() pSettings->executor().setCompetivieCompanionPort(ui->spinPortNumber->value()); pSettings->executor().setConvertHTMLToTextForInput(ui->chkConvertInputHTML->isChecked()); pSettings->executor().setConvertHTMLToTextForExpected(ui->chkConvertExpectedHTML->isChecked()); - pSettings->executor().setIgnoreSpacesWhenValidatingCases(ui->chkIgnoreSpacesWhenValidatingCases->isChecked()); + pSettings->executor().setProblemCaseValidateType((ProblemCaseValidateType)(ui->cbProblemCaseValidateType->currentIndex())); pSettings->executor().setRedirectStderrToToolLog(ui->chkRedirectStderr->isChecked()); pSettings->executor().setCaseEditorFontName(ui->cbFont->currentFont().family()); pSettings->executor().setCaseEditorFontOnlyMonospaced(ui->chkOnlyMonospaced->isChecked()); @@ -79,4 +83,3 @@ void ExecutorProblemSetWidget::on_chkOnlyMonospaced_stateChanged(int ) ui->cbFont->setFontFilters(QFontComboBox::FontFilter::AllFonts); } } - diff --git a/RedPandaIDE/settingsdialog/executorproblemsetwidget.h b/RedPandaIDE/settingsdialog/executorproblemsetwidget.h index 3488c023..7c14f92b 100644 --- a/RedPandaIDE/settingsdialog/executorproblemsetwidget.h +++ b/RedPandaIDE/settingsdialog/executorproblemsetwidget.h @@ -39,6 +39,7 @@ protected: void doSave() override; private slots: void on_chkOnlyMonospaced_stateChanged(int arg1); + }; #endif // EXECUTORPROBLEMSETWIDGET_H diff --git a/RedPandaIDE/settingsdialog/executorproblemsetwidget.ui b/RedPandaIDE/settingsdialog/executorproblemsetwidget.ui index b8b3134b..29114c5b 100644 --- a/RedPandaIDE/settingsdialog/executorproblemsetwidget.ui +++ b/RedPandaIDE/settingsdialog/executorproblemsetwidget.ui @@ -7,7 +7,7 @@ 0 0 545 - 503 + 516 @@ -125,10 +125,44 @@ - - - Ignore spaces when validating problem cases - + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Problem Case Validate type + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + diff --git a/RedPandaIDE/systemconsts.h b/RedPandaIDE/systemconsts.h index 153f70e5..5244582b 100644 --- a/RedPandaIDE/systemconsts.h +++ b/RedPandaIDE/systemconsts.h @@ -40,7 +40,6 @@ #define SDCC_PROGRAM "sdcc.exe" #define PACKIHX_PROGRAM "packihx.exe" #define MAKEBIN_PROGRAM "makebin.exe" -#define MAKE2_PROGRAM "make.exe" #elif defined(Q_OS_LINUX) #define CONSOLE_PAUSER "consolepauser" #define ASSEMBLER "nasm" diff --git a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts index 4fa2732d..537d8075 100644 --- a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts +++ b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts @@ -2079,7 +2079,7 @@ Ignore spaces when validating problem cases - Ignorar espaços ao validar casos de problemas + Ignorar espaços ao validar casos de problemas Timeout for Case Valdation @@ -2137,6 +2137,22 @@ Redirect STDERR to Tools output panel + + Problem Case Validate type + + + + Exact + + + + Ignore leading/trailing spaces + + + + Ignore spaces + + FileAssociationModel @@ -4925,7 +4941,7 @@ Ignore Spaces - Ignorar espaços + Ignorar espaços Raylib Manual @@ -5319,6 +5335,18 @@ Turtle Graphics Tutorial + + Exact + + + + Ignore leading/trailing spaces + + + + Ignore spaces + + MemoryModel @@ -5467,10 +5495,6 @@ Icon Info: - - TextLabel - - NewProjectUnitDialog diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts index cf66bb4b..7740bf99 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts @@ -2886,27 +2886,31 @@ Are you really want to continue? 将标准输出内容重定向到工具输出面板 - - Ignore spaces when validating problem cases - 在验证测试案例时忽略结果中的空格 + + Problem Case Validate type + 试题案例验证方式 - + Ignore spaces when validating problem cases + 在验证测试案例时忽略结果中的空格 + + + Case Valdation Limit 测试案例验证的资源限制 - + Time Limit 时间限制 - + Memory Limit 内存限制 - + kb kb @@ -2915,7 +2919,7 @@ Are you really want to continue? 试题案例超时时间 - + ms 毫秒 @@ -2924,25 +2928,40 @@ Are you really want to continue? 秒 - + Case Editor Font 试题案例数据编辑字体 - + Font Size: 大小: - + Font: 字体: - + Only Monospaced 仅使用等宽字体 + + + Exact + 完全一致 + + + + Ignore leading/trailing spaces + 忽略行首/行尾空格 + + + + Ignore spaces + 忽略多余空格 + FileAssociationModel @@ -4382,18 +4401,18 @@ Are you really want to continue? MainWindow - + Red Panda C++ 小熊猫C++ - - + - + - + + Issues 编译器 @@ -4412,8 +4431,8 @@ Are you really want to continue? 工具 - - + + Run 运行 @@ -4425,25 +4444,25 @@ Are you really want to continue? - + Project 项目 - + Watch 监视 - + Structure 结构 - + Files 文件 @@ -4454,9 +4473,9 @@ Are you really want to continue? - - - + + + Debug 调试 @@ -4467,7 +4486,7 @@ Are you really want to continue? - + Debug Console 调试主控台 @@ -4489,7 +4508,7 @@ Are you really want to continue? - + Search 查找 @@ -4514,7 +4533,7 @@ Are you really want to continue? 替换 - + Close 关闭 @@ -4543,70 +4562,70 @@ Are you really want to continue? 工具栏2 - + New 新建 - + Ctrl+N Ctrl+N - + Open... 打开... - + Ctrl+O Ctrl+O - + Save 保存 - + Ctrl+S Ctrl+S - + Save As... 另存为... - + Save As 另存为 - + Save All 全部保存 - + Ctrl+Shift+S Ctrl+Shift+S - + Options 选项 - - + + Compile 编译 - + Tools Output 工具输出 @@ -4636,7 +4655,7 @@ Are you really want to continue? 选择 - + F9 F9 @@ -4645,123 +4664,123 @@ Are you really want to continue? 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编码 @@ -4770,93 +4789,93 @@ Are you really want to continue? 编译运行 - + 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 载入试题集 @@ -4878,20 +4897,20 @@ Are you really want to continue? - + TODO TODO - + Bookmark 书签 - + Problem 试题 @@ -4904,7 +4923,7 @@ Are you really want to continue? - + Remove Problem Case Remove Problem Set 删除试题集 @@ -4912,21 +4931,21 @@ Are you really want to continue? - + Open Anwser Source File 打开答案源代码文件 - + Run All Cases Run Current Case 运行所有案例 - + Problem Cases Validation Options 测试案例验证选项 @@ -4986,15 +5005,15 @@ Are you really want to continue? - - + + Import FPS Problem Set 导入FPS试题集 - - + + Export FPS Problem Set 导出FPS试题集 @@ -5014,450 +5033,449 @@ Are you really want to continue? 选择期望输出文件 - Ignore Spaces - 忽略空格 + 忽略空格 - + New C/C++ File 新建C/C++文件 - + New Source File 新建源代码文件 - + Ctrl+K, Ctrl+S - + 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 新建项目文件 - + Ctrl+F12 Ctrl+F12 - + F1 F1 - + New GAS File 新建GNU汇编文件 - + GNU Assembler Manual GNU汇编器手册 - + x86 Assembly Language Reference Manual X86汇编语言参考手册 - + IA-32 Assembly Language Reference Manual IA32汇编语言参考手册 - + Add Watchpoint... 添加变量断点... - + Add a watchpoint that's triggered when it's modified. 添加一个变量断点。当该变量的值被改动时程序暂停。 - + New Text File 新建文本文件 - + Page Up 向上翻页 - + Page Down 向下翻页 - + Goto Line Start 跳转到行首 - + Goto Line End 跳转到行尾 - + Goto File Start 跳转倒文件开头 - + Goto File End 跳转到文件结尾 - + Page Up and Select 向上翻页并选中 - + Page Down and Select 向下翻页并选中 - + Goto Page Start 跳转到页首 - + Goto Page End 跳转到页尾 - + Goto Page Start and Select 跳转到行首并选中 - + Goto Page End and Select 跳转到页尾并选中 - + Goto Line Start and Select 跳转到行首并选中 - + Goto Line End and Select 跳转到行尾并选中 - + Goto File Start and Select 跳转到文件开头并选中 - + Goto File End and Select 跳转到文件结尾并选中 - + Close Others 关闭其他窗口 - + OI Wiki OI Wiki - + Turtle Graphics Tutorial 海龟作图教程 @@ -5466,7 +5484,7 @@ Are you really want to continue? 关闭其他窗口 - + Move Selection Up 向上移动选中的行 @@ -5476,132 +5494,132 @@ Are you really want to continue? 移动光标 - + 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 切换只读模式 - + Submit Issues 反馈与建议 - + Document 使用说明 @@ -5610,199 +5628,199 @@ Are you really want to continue? 保存为模板... - + New File 新建文件 - + Add to project... 添加到项目... - + Remove from project 从项目删除 - + View Makefile 查看Makefile - + Clean 清理构建文件 - + Open Folder in Explorer 在浏览器中打开 - + Open In Terminal 在终端中打开 - + About 关于 - - + + Rename Symbol 重命名符号 - + Shift+F6 Shift+F6 - + Print... 打印... - + Ctrl+P Ctrl+P - - + + Export As RTF 导出为RTF - - + + Export As HTML 导出为HTML - + Move To Other View 移动到其他视图 - + Ctrl+M Ctrl+M - - + + C++ Reference C++参考手册 - + C Reference C参考手册 - + Show Tool Panels 显示全部工具面板 - + Create Git Repository Create Repository 创建Git仓库 - + Commit 提交(Commit) - + Revert 撤销(Revert) - + Reset 回滚(Reset) - + Add Files 添加文件 - + Restore 还原(Restore) - + Website 官方网站 - + Branch/Switch 分支切换（Switch） - + Merge 合并（Merge） - - + + Show Log Log 显示日志(Log) - + Remotes... 远程仓库... - + Fetch 取回(Fetch) - + Pull 拉取(Pull) - + Push 推送(Push) - + Hide Non Support Files 隐藏不支持的文件 - + Toggle Block Comment 切换块注释 - + Alt+Shift+A Alt+Shift+A - + Match Bracket 匹配当前括号 - + Ctrl+] Ctrl+] @@ -5811,50 +5829,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 新建头文件... @@ -5864,47 +5882,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 删除到行首 @@ -5913,27 +5931,27 @@ Are you really want to continue? C/C++参考 - + EGE Manual EGE图形库手册 - + Add Bookmark 添加书签 - + Remove Bookmark 删除书签 - + Modify Bookmark Description 修改书签说明 - + Locate in Files View 在文件视图中定位 @@ -5942,47 +5960,47 @@ Are you really want to continue? 打开文件夹 - + Running Parameters... 运行参数... - + File Encoding 文件编码 - + Recent Files 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -5996,17 +6014,17 @@ Are you really want to continue? 行: %1 列: %2 已选择 :%3 总行数: %4 总长度: %5 - + Read Only 只读 - + Insert 插入 - + Overwrite 覆写 @@ -6023,7 +6041,7 @@ Are you really want to continue? 确认 - + Source file is not compiled. 源文件尚未编译。 @@ -6040,39 +6058,39 @@ Are you really want to continue? 重新编译？ - - - - + + + + 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. 无法启动调试器 @@ -6093,33 +6111,33 @@ Are you really want to continue? 项目尚未构建。是否构建？ - + 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 请在调试前改正设置。 @@ -6128,8 +6146,8 @@ Are you really want to continue? 重新编译？ - - + + Save last open info error 保存上次打开信息失败 @@ -6138,37 +6156,37 @@ 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 打开源代码文件 - - - + + + Correct compile settings for debug 纠正调试用编译设置 - - + + The generated executable won't have debug symbol infos, and can't be debugged. 生成的可执行文件中会缺少调试符号信息，因此无法编译。 @@ -6177,81 +6195,81 @@ Are you really want to continue? 如果你正在使用Release版的编译器设置集，请在工具栏中将其改为Debug版本。 - - - + + + Or you can manually change the following settings in the options dialog's compiler set page: 您也可以手动在选项对话框的编译器设置页中修正下列选项： - - - + + + - Turned on the "Generate debug info (-g3)" option. - 打开“生成调试信息(-g3)"选项. - - - + + + - Turned off the "Strip executable (-s)" option. - 关闭"剥除附加信息(-s)"选项. - - - + + + - Turned off the "Optimization level (-O)" option or set it to "Debug (-Og)". - 关闭"优化级别(-O)选项，或将其设置为"调试(-Og)"级别. - - - - + + + + You should recompile after change the compiler set or it's settings. 在更换编译器设置集或修改其设置后，需要重新编译. - - - + + + Do you want to mannually change the compiler set settings now? 您现在就要手动修改编译器设置集的设置吗？ - - + + 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已存在。是否覆盖？ @@ -6259,25 +6277,25 @@ Are you really want to continue? - - - + + + Clear 清除 - + Export 导出 - + Insert Snippet 插入代码段 - - + + Problem Set %1 试题集%1 @@ -6306,56 +6324,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: 描述： @@ -6364,65 +6382,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 重命名 @@ -6435,22 +6453,22 @@ Are you really want to continue? 要现在去修改设置吗？ - + 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 @@ -6475,12 +6493,12 @@ Are you really want to continue? 是否现在去改正? - + Missing Project Files 项目文件缺失 - + The following files is missing, can't build the project: 下列项目文件缺失，无法构建项目: @@ -6497,187 +6515,187 @@ Are you really want to continue? 请取消该设置，重新编译然后重新启动调试。 - + 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 在文件资源管理器中打开 - + Character sets 字符集 - + Convert to %1 转换为%1编码 - + Newline 换行符 - + %1 files autosaved 已自动保存%1个文件 - + Set answer to... 设置答案源代码... - + select other file... 选择其他文件... - + Select Answer Source File 选择答案源代码文件 - + Watchpoint hitted 变量断点被触发 - + Value of "%1" has changed: "%1"的值发生了变化: - + New value: %1 新值: %1 - + Project folder removed. 项目文件夹被删除 - + Folder for project '%1' was removed. 项目"%1"的文件夹已被外部程序删除. - + It will be closed. 项目将被关闭. - + Save settings failed! 保存设置失败 - + Watchpoint variable name 被监控的变量 - + Stop execution when the following variable is modified (it must be visible from the currect scope): 当下面的变量被修改时暂停执行（该变量必须可以从当前程序处访问）： @@ -6686,17 +6704,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 导出时出错 @@ -6706,7 +6724,7 @@ Are you really want to continue? C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + New Folder %1 新建文件夹%1 @@ -6719,13 +6737,13 @@ Are you really want to continue? 无标题%1 - - + + Do you really want to delete %1? 你真的要删除%1吗？ - + Do you really want to delete %1 files? 你真的要删除%1个文件吗？ @@ -6738,7 +6756,7 @@ Are you really want to continue? 变量"%1"有改动： - + Old value: %1 旧值: %1 @@ -6747,63 +6765,63 @@ Are you really want to continue? 新值: %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? 你真的想要那么做吗？ @@ -6812,12 +6830,12 @@ Are you really want to continue? 批量设置案例 - + Choose input files 选择输入数据文件 - + Input data files (*.in) 输入数据文件 (*.in) @@ -6826,78 +6844,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'? @@ -6906,28 +6924,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 选择期望输出文件 @@ -6937,61 +6955,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! 提交信息不能为空！ @@ -7000,22 +7018,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? 同时从硬盘上删除文件？ @@ -7024,27 +7042,27 @@ Are you really want to continue? 无标题 - + New Project File Name 新的项目文件名 - + File Name: 文件名： - + File Already Exists! 文件已存在！ - + File '%1' already exists! 文件'%1'已经存在！ - + Add to project 添加到项目 @@ -7061,12 +7079,12 @@ 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. 本操作会删除此试题的所有案例。 @@ -7075,7 +7093,7 @@ Are you really want to continue? 调试失败 - + The executable doesn't have symbol table, and can't be debugged. 可执行文件中没有符号表信息，无法调试。 @@ -7100,122 +7118,122 @@ Are you really want to continue? 您也可以删除所有断点，打开“CPU信息窗口”，然后调试汇编代码。 - + Failed to generate the executable. 未能生成可执行文件。 - + Please check detail info in "Tools Output" panel. 请查看“工具输出”面板中的详细信息。 - + 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 清除历史 @@ -7224,8 +7242,8 @@ Are you really want to continue? 编译生成的可执行文件中没有符号表，无法被调试。 - - + + Version Control 版本控制 @@ -7234,87 +7252,102 @@ Are you really want to continue? 请在工具栏中选用Debug编译器配置集，或者在选项对话框的编辑器配置集页中勾选“生成调试信息(-g3)"选项。 - + 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 确认转换 - - - + + Exact + 完全一致 + + + + Ignore leading/trailing spaces + 忽略行首/行尾空格 + + + + Ignore spaces + 忽略多余空格 + + + + + If you are using the Release compiler set, please use choose the Debug version from toolbar. 如果你正在使用Release版的编译器设置集，请在工具栏中将其改为Debug版本。 - - - - + + + + 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个文件） @@ -7474,27 +7507,26 @@ Are you really want to continue? C++语言项目 - + Icon Info: 图标信息: - TextLabel - 文字标签 + 文字标签 - + Name: 项目名称： - + Create in 创建在 - + Use as the default project location 设为默认项目位置 @@ -7503,7 +7535,7 @@ Are you really want to continue? 文件夹： - + ... ... @@ -8695,13 +8727,13 @@ Are you really want to continue? QObject - + Save 保存 - + Save changes to %1? 将修改保存到"%1"？ @@ -8881,7 +8913,7 @@ Are you really want to continue? 生成调试信息(-g3) - + Would you like Red Panda C++ to search for compilers in PATH? 您同意小熊猫C++在PATH路径中寻找gcc编译器吗？ @@ -9022,7 +9054,7 @@ Are you really want to continue? 只生成汇编代码(-S) - + Confirm 确认 @@ -9043,13 +9075,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 @@ -10610,18 +10642,18 @@ Are you really want to continue? 性能 - - - - + + + + Compiler Set 编译器配置集 - - + + Compiler @@ -10633,7 +10665,7 @@ Are you really want to continue? 自动链接 - + @@ -10709,15 +10741,15 @@ Are you really want to continue? 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 @@ -10776,8 +10808,8 @@ Are you really want to continue? 项目选项 - - + + diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts index af62ffb6..bc147095 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts @@ -1910,10 +1910,6 @@ Port Number - - Ignore spaces when validating problem cases - - Case Editor Font @@ -1966,6 +1962,22 @@ Redirect STDERR to Tools output panel + + Problem Case Validate type + + + + Exact + + + + Ignore leading/trailing spaces + + + + Ignore spaces + + FileAssociationModel @@ -4660,10 +4672,6 @@ Rename - - Ignore Spaces - - Raylib Manual @@ -5048,6 +5056,18 @@ Turtle Graphics Tutorial + + Exact + + + + Ignore leading/trailing spaces + + + + Ignore spaces + + MemoryModel @@ -5192,10 +5212,6 @@ Icon Info: - - TextLabel - - NewProjectUnitDialog diff --git a/RedPandaIDE/utils.h b/RedPandaIDE/utils.h index 18a54f81..d36af8ee 100644 --- a/RedPandaIDE/utils.h +++ b/RedPandaIDE/utils.h @@ -107,6 +107,12 @@ enum class SplitProcessCommandQuoteType { Double }; +enum class ProblemCaseValidateType { + Exact, + IgnoreLeadingTrailingSpaces, + IgnoreSpaces +}; + FileType getFileType(const QString& filename); QStringList splitProcessCommand(const QString& cmd);