From 0ccec06f3354bdde19520e807f79c1168e929fd5 Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Tue, 24 Jan 2023 11:31:30 +0800 Subject: [PATCH] add project encoding --- RedPandaIDE/compiler/projectcompiler.cpp | 2 + RedPandaIDE/editor.cpp | 48 +- RedPandaIDE/editor.h | 1 + RedPandaIDE/mainwindow.cpp | 5 +- RedPandaIDE/project.cpp | 48 +- .../settingsdialog/projectfileswidget.cpp | 6 +- RedPandaIDE/translations/RedPandaIDE_pt_BR.ts | 6 +- RedPandaIDE/translations/RedPandaIDE_zh_CN.ts | 774 +++++++++--------- RedPandaIDE/translations/RedPandaIDE_zh_TW.ts | 8 +- libs/redpanda_qt_utils/qt_utils/utils.h | 1 + 10 files changed, 460 insertions(+), 439 deletions(-) diff --git a/RedPandaIDE/compiler/projectcompiler.cpp b/RedPandaIDE/compiler/projectcompiler.cpp index 7b20817d..0da21744 100644 --- a/RedPandaIDE/compiler/projectcompiler.cpp +++ b/RedPandaIDE/compiler/projectcompiler.cpp @@ -427,6 +427,8 @@ void ProjectCompiler::writeMakeObjFilesRules(QFile &file) } else { sourceEncoding = targetEncoding; } + } else if (unit->encoding()==ENCODING_PROJECT) { + sourceEncoding=mProject->options().encoding; } else if (unit->encoding()==ENCODING_SYSTEM_DEFAULT) { sourceEncoding = defaultSystemEncoding; } else if (unit->encoding()!=ENCODING_ASCII && !unit->encoding().isEmpty()) { diff --git a/RedPandaIDE/editor.cpp b/RedPandaIDE/editor.cpp index 71e2903b..3381708e 100644 --- a/RedPandaIDE/editor.cpp +++ b/RedPandaIDE/editor.cpp @@ -94,6 +94,9 @@ Editor::Editor(QWidget *parent, const QString& filename, } QFileInfo fileInfo(mFilename); QSynedit::PSyntaxer syntaxer; + if (mProject && mEncodingOption==ENCODING_PROJECT) { + mEncodingOption=mProject->options().encoding; + } mFileEncoding = ENCODING_ASCII; if (!isNew) { try { @@ -107,12 +110,7 @@ Editor::Editor(QWidget *parent, const QString& filename, } else { syntaxer=syntaxerManager.getSyntaxer(QSynedit::ProgrammingLanguage::CPP); } - if (mEncodingOption==ENCODING_AUTO_DETECT) { - if (mFileEncoding==ENCODING_ASCII) - mEncodingOption=pSettings->editor().defaultEncoding(); - else - mEncodingOption=mFileEncoding; - } + resolveAutoDetectEncodingOption(); if (syntaxer) { setSyntaxer(syntaxer); setUseCodeFolding(true); @@ -239,15 +237,17 @@ void Editor::loadFile(QString filename) { if (mProject) { PProjectUnit unit = mProject->findUnit(this); if (unit) { - if (mEncodingOption==ENCODING_AUTO_DETECT) { - if (mFileEncoding==ENCODING_ASCII) - unit->setEncoding(mProject->options().encoding); - else - unit->setEncoding(mFileEncoding); - mEncodingOption=unit->encoding(); - } else { - unit->setEncoding(mEncodingOption); - } +// if (mEncodingOption==ENCODING_AUTO_DETECT) { +// if (mFileEncoding==ENCODING_ASCII) +// unit->setEncoding(mProject->options().encoding); +// else +// unit->setEncoding(mFileEncoding); +// mEncodingOption=unit->encoding(); +// } else { +// unit->setEncoding(mEncodingOption); +// } +// unit->setRealEncoding(mFileEncoding); + //unit->setEncoding(mEncodingOption); unit->setRealEncoding(mFileEncoding); } } @@ -278,9 +278,10 @@ void Editor::loadFile(QString filename) { void Editor::saveFile(QString filename) { QFile file(filename); - QByteArray encoding = mFileEncoding; - if (mEncodingOption!=ENCODING_AUTO_DETECT || mFileEncoding==ENCODING_ASCII) - encoding = mEncodingOption; +// QByteArray encoding = mFileEncoding; +// if (mEncodingOption != ENCODING_AUTO_DETECT || mFileEncoding==ENCODING_ASCII) +// encoding = mEncodingOption; + QByteArray encoding = mEncodingOption; // save backup // QString backupFilename=filename+".savebak"; // int count=1; @@ -541,6 +542,7 @@ void Editor::setEncodingOption(const QByteArray& encoding) noexcept{ } } else if (mParentPageControl) pMainWindow->updateForEncodingInfo(this); + resolveAutoDetectEncodingOption(); if (mProject) { PProjectUnit unit = mProject->findUnit(this); if (unit) { @@ -1958,6 +1960,16 @@ void Editor::onAutoBackupTimer() saveAutoBackup(); } +void Editor::resolveAutoDetectEncodingOption() +{ + if (mEncodingOption==ENCODING_AUTO_DETECT) { + if (mFileEncoding==ENCODING_ASCII) + mEncodingOption=pSettings->editor().defaultEncoding(); + else + mEncodingOption=mFileEncoding; + } +} + bool Editor::isBraceChar(QChar ch) { switch( ch.unicode()) { diff --git a/RedPandaIDE/editor.h b/RedPandaIDE/editor.h index 5615657e..89f1e04b 100644 --- a/RedPandaIDE/editor.h +++ b/RedPandaIDE/editor.h @@ -236,6 +236,7 @@ private slots: void onAutoBackupTimer(); private: + void resolveAutoDetectEncodingOption(); bool isBraceChar(QChar ch); bool shouldOpenInReadonly(); QChar getCurrentChar(); diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 87ce162d..2706a65f 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -469,14 +469,12 @@ void MainWindow::updateForEncodingInfo(const Editor* editor, bool clear) { .arg(QString(editor->encodingOption())) ); } - //ui->actionAuto_Detect->setEnabled(editor->inProject()); //ui->actionAuto_Detect->setChecked(editor->encodingOption() == ENCODING_AUTO_DETECT); ui->actionEncode_in_ANSI->setChecked(editor->encodingOption() == ENCODING_SYSTEM_DEFAULT); ui->actionEncode_in_UTF_8->setChecked(editor->encodingOption() == ENCODING_UTF8); ui->actionEncode_in_UTF_8_BOM->setChecked(editor->encodingOption() == ENCODING_UTF8_BOM); } else { mFileEncodingStatus->setText(""); - //ui->actionAuto_Detect->setEnabled(true); //ui->actionAuto_Detect->setChecked(false); ui->actionEncode_in_ANSI->setChecked(false); ui->actionEncode_in_UTF_8->setChecked(false); @@ -3335,7 +3333,7 @@ void MainWindow::buildEncodingMenu() mMenuEncoding = new QMenu(); mMenuEncoding->setTitle(tr("File Encoding")); - //mMenuEncoding->addAction(ui->actionAuto_Detect); + mMenuEncoding->addAction(ui->actionAuto_Detect); mMenuEncoding->addAction(ui->actionEncode_in_ANSI); mMenuEncoding->addAction(ui->actionEncode_in_UTF_8); mMenuEncoding->addAction(ui->actionEncode_in_UTF_8_BOM); @@ -4593,7 +4591,6 @@ void MainWindow::onClassBrowserRefreshEnd() void MainWindow::onProjectSwitchCustomViewMode() { mProject->setModelType(ProjectModelType::Custom); - qDebug()<<"3"; ui->projectView->expand( mProjectProxyModel->mapFromSource( mProject->model()->rootIndex())); diff --git a/RedPandaIDE/project.cpp b/RedPandaIDE/project.cpp index 4ee12e7d..4389c930 100644 --- a/RedPandaIDE/project.cpp +++ b/RedPandaIDE/project.cpp @@ -165,7 +165,7 @@ bool Project::unitsModifiedSince(const QDateTime& time) foreach(const PProjectUnit& unit, mUnits) { QFileInfo info(unit->fileName()); if (info.lastModified()>time) { - qDebug()<setPriority(ini.GetLongValue(groupName,"Priority", 1000)); newUnit->setOverrideBuildCmd(ini.GetBoolValue(groupName,"OverrideBuildCmd", false)); newUnit->setBuildCmd(fromByteArray(ini.GetValue(groupName,"BuildCmd", ""))); - QByteArray defaultEncoding = mOptions.encoding; - //Compatibility - if (ini.GetBoolValue(groupName,"DetectEncoding",false)){ - defaultEncoding = mOptions.encoding; - } - - newUnit->setEncoding(ini.GetValue(groupName, "FileEncoding",defaultEncoding)); + newUnit->setEncoding(ini.GetValue(groupName, "FileEncoding",ENCODING_PROJECT)); if (QTextCodec::codecForName(newUnit->encoding())==nullptr) { - newUnit->setEncoding(mOptions.encoding); + newUnit->setEncoding(ENCODING_PROJECT); } newUnit->setRealEncoding(ini.GetValue(groupName, "RealEncoding",ENCODING_ASCII)); @@ -764,11 +758,7 @@ bool Project::saveUnits() ini.SetValue(groupName,"BuildCmd", toByteArray(unit->buildCmd())); //ini.SetLongValue(groupName,"DetectEncoding", unit->encoding()==ENCODING_AUTO_DETECT); ini.Delete(groupName,"DetectEncoding"); - if (unit->encoding() != options().encoding - && unit->encoding()!=ENCODING_AUTO_DETECT) - ini.SetValue(groupName,"FileEncoding", unit->encoding()); - else - ini.Delete(groupName,"FileEncoding"); + ini.SetValue(groupName,"FileEncoding", unit->encoding()); ini.SetValue(groupName,"RealEncoding",unit->realEncoding()); } ini.SetLongValue("Project","UnitCount",count); @@ -802,15 +792,25 @@ void Project::associateEditorToUnit(Editor *editor, PProjectUnit unit) return; } if (editor) { - editor->setProject(this); - if (editor->encodingOption()==ENCODING_AUTO_DETECT) { - if (editor->fileEncoding()==ENCODING_ASCII) { - editor->setEncodingOption(mOptions.encoding); - } else { - editor->setEncodingOption(editor->fileEncoding()); - } + Editor * e= unitEditor(unit); + if (e) { + if (editor==e) + return; + e->setProject(nullptr); + e->close(); } - unit->setEncoding(editor->encodingOption()); + editor->setProject(this); +// if (editor->encodingOption()==ENCODING_AUTO_DETECT) { +// if (editor->fileEncoding()==ENCODING_ASCII) { +// editor->setEncodingOption(mOptions.encoding); +// } else { +// editor->setEncodingOption(editor->fileEncoding()); +// } +// } + if (editor->encodingOption()!=mOptions.encoding) + unit->setEncoding(editor->encodingOption()); + else if (editor->encodingOption()!=unit->encoding()) + unit->setEncoding(editor->encodingOption()); unit->setRealEncoding(editor->fileEncoding()); } } @@ -1234,7 +1234,7 @@ PProjectUnit Project::internalAddUnit(const QString &inFileName, PProjectModelNo // newUnit->setRealEncoding(e->fileEncoding()); // e->setProject(this); } else { - newUnit->setEncoding(options().encoding); + newUnit->setEncoding(ENCODING_PROJECT); } // Determine compilation flags @@ -2307,7 +2307,7 @@ ProjectUnit::ProjectUnit(Project* parent) mFileMissing = false; mPriority=0; mNew = true; - mEncoding=ENCODING_SYSTEM_DEFAULT; + mEncoding=ENCODING_PROJECT; mRealEncoding=""; } diff --git a/RedPandaIDE/settingsdialog/projectfileswidget.cpp b/RedPandaIDE/settingsdialog/projectfileswidget.cpp index ef88d851..80718f49 100644 --- a/RedPandaIDE/settingsdialog/projectfileswidget.cpp +++ b/RedPandaIDE/settingsdialog/projectfileswidget.cpp @@ -117,7 +117,7 @@ void ProjectFilesWidget::disableFileOptions() void ProjectFilesWidget::loadUnitEncoding(PProjectUnit unit) { - if (unit->encoding() == ENCODING_AUTO_DETECT + if (unit->encoding() == ENCODING_PROJECT || unit->encoding() == ENCODING_SYSTEM_DEFAULT || unit->encoding() == ENCODING_UTF8) { int index =ui->cbEncoding->findData(unit->encoding()); @@ -224,7 +224,7 @@ void ProjectFilesWidget::on_txtBuildCommand_textChanged() void ProjectFilesWidget::on_cbEncoding_currentTextChanged(const QString &) { QString userData = ui->cbEncoding->currentData().toString(); - if (userData == ENCODING_AUTO_DETECT + if (userData == ENCODING_PROJECT || userData == ENCODING_SYSTEM_DEFAULT || userData == ENCODING_UTF8) { PProjectUnit unit = currentUnit(); @@ -255,7 +255,7 @@ void ProjectFilesWidget::init() ui->spinPriority->setMaximum(9999); ui->cbEncodingDetail->setVisible(false); ui->cbEncoding->clear(); - ui->cbEncoding->addItem(tr("Auto detect"),ENCODING_AUTO_DETECT); + ui->cbEncoding->addItem(tr("Project(%1)").arg(QString(pMainWindow->project()->options().encoding)),ENCODING_PROJECT); ui->cbEncoding->addItem(tr("ANSI"),ENCODING_SYSTEM_DEFAULT); ui->cbEncoding->addItem(tr("UTF-8"),ENCODING_UTF8); foreach (const QString& langName, pCharsetInfoManager->languageNames()) { diff --git a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts index 05392d26..7d881650 100644 --- a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts +++ b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts @@ -5578,7 +5578,7 @@ Auto detect - Detecção automática + Detecção automática ANSI @@ -5588,6 +5588,10 @@ UTF-8 UTF-8 + + Project(%1) + + ProjectGeneralWidget diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts index 3c6ec5ad..09e37a21 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts @@ -1379,13 +1379,13 @@ Are you really want to continue? 失败 - - - - - - - + + + + + + + Error 错误 @@ -1394,8 +1394,8 @@ Are you really want to continue? 无法写入文件"%1" - - + + Error Load File 载入文件错误 @@ -1424,44 +1424,44 @@ Are you really want to continue? 继续保存？ - + 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+单击以获取更多信息 @@ -1470,27 +1470,27 @@ Are you really want to continue? 未找到符号'%1'! - + astyle not found 找不到astyle程序 - + Can't find astyle in "%1". 找不到astyle程序"%1". - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Readonly 只读 @@ -4147,18 +4147,18 @@ Are you really want to continue? MainWindow - + Red Panda C++ 小熊猫C++ - - - - - + + + + + Issues 编译器 @@ -4232,7 +4232,7 @@ Are you really want to continue? - + Debug Console 调试主控台 @@ -4366,8 +4366,8 @@ Are you really want to continue? - - + + Compile 编译 @@ -4444,9 +4444,9 @@ Are you really want to continue? - - - + + + Copy 复制 @@ -4457,7 +4457,7 @@ Are you really want to continue? - + Paste 粘贴 @@ -4468,8 +4468,8 @@ Are you really want to continue? - - + + Select All 选择全部 @@ -4595,38 +4595,38 @@ Are you really want to continue? - - + + New Problem Set 新建试题集 - + Add Problem 添加试题 - + Remove Problem 删除试题 - - + + Save Problem Set 保存试题集 - - + + Load Problem Set 载入试题集 @@ -4674,7 +4674,7 @@ Are you really want to continue? - + Remove Problem Case Remove Problem Set 删除试题集 @@ -4682,21 +4682,21 @@ Are you really want to continue? - + Open Anwser Source File 打开答案源代码文件 - + Run All Cases Run Current Case 运行所有案例 - + Problem Cases Validation Options 测试案例验证选项 @@ -4756,15 +4756,15 @@ Are you really want to continue? - - + + Import FPS Problem Set 导入FPS试题集 - - + + Export FPS Problem Set 导出FPS试题集 @@ -5006,7 +5006,7 @@ Are you really want to continue? - + Clear all breakpoints 删除所有断点 @@ -5227,7 +5227,7 @@ Are you really want to continue? - + New File 新建文件 @@ -5268,7 +5268,7 @@ Are you really want to continue? - + Rename Symbol 重命名符号 @@ -5289,13 +5289,13 @@ Are you really want to continue? - + Export As RTF 导出为RTF - + Export As HTML 导出为HTML @@ -5564,7 +5564,7 @@ Are you really want to continue? 运行参数... - + File Encoding 文件编码 @@ -5574,32 +5574,32 @@ Are you really want to continue? 文件历史 - - + - + + Debugging 正在调试 - - + - + + Running 正在运行 - - + - + + Compiling 正在编译 @@ -5613,17 +5613,17 @@ Are you really want to continue? 行: %1 列: %2 已选择 :%3 总行数: %4 总长度: %5 - + Read Only 只读 - + Insert 插入 - + Overwrite 覆写 @@ -5636,75 +5636,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 启用调试参数 @@ -5713,54 +5713,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 保存上次打开信息失败 @@ -5769,60 +5769,60 @@ Are you really want to continue? 无法删除旧上次打开信息文件'%1' - + Can't save last open info file '%1' 无法保存上次打开信息文件'%1' - - + + Load last open info error 载入上次打开信息失败 - - + + Can't load last open info file '%1' 无法载入上次打开信息文件'%1' - + Open Source File 打开源代码文件 - - + + Batch Set Cases 批量设置案例 - + Show detail debug logs 显示详细调试器日志 - + Copy all 全部复制 - + Go to Line 跳转到行 - + Line 行 - + Template Exists 模板已存在 - + Template %1 already exists. Do you want to overwrite? 模板%1已存在。是否覆盖？ @@ -5830,9 +5830,9 @@ Are you really want to continue? - - - + + + Clear 清除 @@ -5848,7 +5848,7 @@ Are you really want to continue? - + Problem Set %1 试题集%1 @@ -5869,68 +5869,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: 描述： @@ -5939,65 +5939,65 @@ Are you really want to continue? 在调试主控台中显示调试器输出 - + Remove this search 清除这次搜索 - + Clear all searches 删除所有搜索 - + Breakpoint condition... 断点条件... - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Remove All Breakpoints Remove all breakpoints 删除所有断点 - + Remove Breakpoint 删除当前断点 - + Rename File 重命名文件 - - + + Add Folder 添加文件夹 - - + + New folder 新文件夹 - + Folder name: 文件夹： - + Rename Folder 重命名 @@ -6006,167 +6006,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 选择答案源代码文件 @@ -6175,17 +6175,17 @@ Are you really want to continue? 中止 - + FPS Problem Set Files (*.fps;*.xml) FPS试题集文件(*.fps;*.xml) - + FPS Problem Set Files (*.fps) FPS试题集文件(*.fps) - + Export Error 导出时出错 @@ -6195,7 +6195,7 @@ Are you really want to continue? C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + New Folder %1 新建文件夹%1 @@ -6208,68 +6208,68 @@ Are you really want to continue? 无标题%1 - + Do you really want to delete %1? 你真的要删除%1吗？ - + Do you really want to delete %1 files? 你真的要删除%1个文件吗？ - + Save project 保存项目 - + The project '%1' has modifications. 项目'%1'有改动。 - - + + Do you want to save it? 需要保存吗？ - - + + File Changed 文件已发生变化 - + New Project File? 新建项目文件? - + Do you want to add the new file to the project? 您是否要将新建的文件加入项目? - - - - + + + + Save Error 保存失败 - + Change Project Compiler Set 改变项目编译器配置集 - + Change the project's compiler set will lose all custom compiler set options. 改变项目的编译器配置集会导致所有的自定义编译器选项被重置。 - - + + Do you really want to do that? 你真的想要那么做吗？ @@ -6278,12 +6278,12 @@ Are you really want to continue? 批量设置案例 - + Choose input files 选择输入数据文件 - + Input data files (*.in) 输入数据文件 (*.in) @@ -6292,78 +6292,78 @@ Are you really want to continue? 无标题%1 - + Modify Watch 修改监视表达式 - + Watch Expression 监视表达式 - + Do you really want to clear all breakpoints in this file? 您真的要清除该文件的所有断点吗？ - + New project 新建项目 - + Close %1 and start new project? 关闭'%1'以打开新项目? - + Folder not exist 文件夹不存在 - + Folder '%1' doesn't exist. Create it now? 文件夹'%1'不存在。是否创建？ - + Can't create folder 无法创建文件夹 - + Failed to create folder '%1'. 创建文件夹'%1'失败。 - + Save new project as - + Folder %1 is not empty. 文件夹%1不是空的。 - + Do you really want to delete it? 你真的要删除它吗？ - + Change working folder 改变工作文件夹 - + File '%1' is not in the current working folder. File '%1' is not in the current working folder 文件'%1'不在当前工作文件夹中。 - + Do you want to change working folder to '%1'? 是否将工作文件夹改设为'%1'? @@ -6372,28 +6372,28 @@ Are you really want to continue? 正在删除试题... - + Can't Commit 无法提交 - + Git needs user info to commit. Git需要用信息进行提交。 - + Choose Input Data File 选择输入数据文件 - - + + All files (*.*) 所有文件 (*.*) - + Choose Expected Output Data File Choose Expected Input Data File 选择期望输出文件 @@ -6405,59 +6405,59 @@ Are you really want to continue? - + Choose Working Folder 选择工作文件夹 - - + + Header Exists 头文件已存在 - - + + Header file "%1" already exists! 头文件"%1"已存在！ - + Source Exists 源文件已存在！ - + Source file "%1" already exists! 源文件"%1"已存在！ - + Can't commit! 无法提交！ - + The following files are in conflicting: 下列文件处于冲突状态，请解决后重新添加和提交： - + Commit Message 提交信息 - + Commit Message: 提交信息： - + Commit Failed 提交失败 - + Commit message shouldn't be empty! 提交信息不能为空！ @@ -6466,22 +6466,22 @@ Are you really want to continue? 小熊猫Dev-C++项目文件 (*.dev) - + New project fail 新建项目失败 - + Can't assign project template 无法使用模板创建项目 - + Remove file 删除文件 - + Remove the file from disk? 同时从硬盘上删除文件？ @@ -6490,129 +6490,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 @@ -6623,14 +6623,14 @@ Are you really want to continue? - - - - - - - - + + + + + + + + Error 错误 @@ -6640,96 +6640,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个文件） @@ -7132,105 +7132,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++编辑器开发 @@ -7350,42 +7350,42 @@ Are you really want to continue? - 资源文件: %1 - + Compiling project changes... 正在编译项目修改... - + - Project Filename: %1 - 项目文件名: %1 - + - Compiler Set Name: %1 - 编译器配置: %1 - + Make program '%1' doesn't exists! Make程序“%1”不存在！ - + Please check the "program" page of compiler settings. 请检查编译器配置中的“程序”页。 - + Processing makefile: 正在处理makefile... - + - makefile processer: %1 - makefile处理器: %1 - + - Command: %1 %2 - 命令: %1 %2 @@ -7545,9 +7545,13 @@ Are you really want to continue? 自定义构建命令 - Auto detect - 自动检测 + 自动检测 + + + + Project(%1) + 项目缺省(%1) @@ -7723,32 +7727,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' @@ -8694,7 +8698,7 @@ Are you really want to continue? - + Can't open file '%1' for write. 无法写入文件'%1'. @@ -9402,18 +9406,18 @@ Are you really want to continue? 性能 - - - + + + Compiler Set 编译器配置集 - - - + + + Compiler @@ -9425,7 +9429,7 @@ Are you really want to continue? 自动链接 - + @@ -9502,15 +9506,15 @@ Are you really want to continue? 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 @@ -9881,7 +9885,7 @@ Are you really want to continue? 插入宏指令 - + Save Changes? 保存修改？ @@ -9890,37 +9894,37 @@ Are you really want to continue? 您需要保存对当前工具的修改吗？ - + Do you want to save changes to "%1"? - + 要保存对"%1"的修改吗？ - + Error - 错误 + 错误 - + Title shouldn't be empty! - + 标题不可以为空！ - + untitled - 无标题 + 无标题 - + Choose Folder 选择文件夹 - + Select program 选择程序 - + Executable files (*.exe) 可执行文件 (*.exe) diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts index 3160e19c..e6057524 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts @@ -5353,10 +5353,6 @@ Override build command: - - Auto detect - - ANSI @@ -5365,6 +5361,10 @@ UTF-8 + + Project(%1) + + ProjectGeneralWidget diff --git a/libs/redpanda_qt_utils/qt_utils/utils.h b/libs/redpanda_qt_utils/qt_utils/utils.h index a468bd7c..ed7078cd 100644 --- a/libs/redpanda_qt_utils/qt_utils/utils.h +++ b/libs/redpanda_qt_utils/qt_utils/utils.h @@ -39,6 +39,7 @@ class QTextCodec; #define ENCODING_UTF32_BOM "UTF-32 BOM" #define ENCODING_SYSTEM_DEFAULT "SYSTEM" #define ENCODING_ASCII "ASCII" +#define ENCODING_PROJECT "PROJECT" enum class NewlineType { Windows,