From a3c335eed6018e372fd858fc5b142c4a29ef2698 Mon Sep 17 00:00:00 2001 From: royqh1979 Date: Mon, 25 Oct 2021 21:36:23 +0800 Subject: [PATCH] - fix: options not correctly set when change compiler set in the project settings - change: reset compiler settings when change the project compiler set --- NEWS.md | 2 + RedPandaIDE/RedPandaIDE_zh_CN.qm | Bin 99125 -> 99859 bytes RedPandaIDE/RedPandaIDE_zh_CN.ts | 230 ++++++++++-------- RedPandaIDE/mainwindow.cpp | 12 +- RedPandaIDE/project.cpp | 27 ++ RedPandaIDE/project.h | 2 + RedPandaIDE/projectoptions.h | 1 + RedPandaIDE/settings.cpp | 15 ++ RedPandaIDE/settings.h | 12 +- .../projectcompileparamaterswidget.cpp | 4 - .../projectcompileparamaterswidget.ui | 14 -- .../settingsdialog/projectcompilerwidget.cpp | 12 +- .../settingsdialog/projectcompilerwidget.ui | 36 ++- 13 files changed, 229 insertions(+), 138 deletions(-) diff --git a/NEWS.md b/NEWS.md index 2ae32135..a5b064f7 100644 --- a/NEWS.md +++ b/NEWS.md @@ -14,6 +14,8 @@ Version 0.7.3 - fix: compiler autolinks options widget don't show autolink infos - fix: autolink parameters are repeated when compile single files - enhancement: prompt for filename when create new project unit file + - fix: options not correctly set when change compiler set in the project settings + - change: reset compiler settings when change the project compiler set Version 0.7.2 - fix: rainbow parenthesis stop functioning when change editor's general options diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.qm b/RedPandaIDE/RedPandaIDE_zh_CN.qm index 7256ad45c418b3f5eb5eb3ca39e376d5c9e2cc24..c14595d9061a36f1995823e6bd68d7f4485dcb93 100644 GIT binary patch delta 7501 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 Tjrb+pr~ayOfpa5fKkEMgVF;&fsFAu%Sd-tF7F& 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 - - - - - + + + + + Issues 编译器 @@ -3466,7 +3466,7 @@ Are you really want to continue? - + Clear all breakpoints 删除所有断点 @@ -3567,7 +3567,7 @@ Are you really want to continue? - + Rename Symbol 重命名符号 @@ -3588,13 +3588,13 @@ Are you really want to continue? - + Export As RTF 导出为RTF - + Export As HTML 导出为HTML @@ -3640,7 +3640,7 @@ Are you really want to continue? - + Open Folder 打开文件夹 @@ -3891,15 +3891,15 @@ Are you really want to continue? - - + + Bookmark Description 书签描述 - - + + Description: 描述： @@ -4048,128 +4048,143 @@ Are you really want to continue? 保存失败 - + + Change Project Compiler Set + 改变项目编译器配置集 + + + + Change the project's compiler set will lose all custom compiler set options. + 改变项目的编译器配置集会导致所有的自定义编译器选项被重置。 + + + + Do you really want to do that? + 你真的想要做那些吗？ + + + Do you really want to clear all breakpoints in this file? 您真的要清除该文件的所有断点吗？ - + New project 新建项目 - + Close %1 and start new project? 关闭'%1'以打开新项目? - + Folder not exist 文件夹不存在 - + Folder '%1' doesn't exist. Create it now? 文件夹'%1'不存在。是否创建？ - + Can't create folder 无法创建文件夹 - + Failed to create folder '%1'. 创建文件夹'%1'失败。 - + Save new project as - + Red panda Dev-C++ project file (*.dev) 小熊猫Dev-C++项目文件 (*.dev) - + New project fail 新建项目失败 - + Can't assign project template 无法使用模板创建项目 - + untitled - 无标题 + 无标题 - + New Project File Name - + 新的项目文件名 - + File Name: - 文件名： + 文件名： - + File Already Exists! - + 文件已存在！ - + File '%1' already exists! - + 文件'%1'已经存在！ - + Add to project 添加到项目 - + 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) @@ -4187,8 +4202,8 @@ Are you really want to continue? - - + + Error 错误 @@ -4223,50 +4238,50 @@ Are you really want to continue? 打开 - + 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个文件） @@ -4348,67 +4363,67 @@ Are you really want to continue? 无法保存文件'%1'. - + Error Load File - + 载入文件错误 - + 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'。 - + Settings need update 设置需要更新 - + The compiler settings format of Dev-C++ has changed. Dev-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 Dev-C++ IDE 使用小熊猫Dev-C++编辑器开发 @@ -4422,31 +4437,26 @@ Are you really want to continue? - Add encoding options to compiler - 编译时加入文件编码参数 - - - - Statically link libraries - 静态链接所有库 - - - Additional build options: - 附加构建参数: + Add encoding options to compiler + 更多编译选项： - + Statically link libraries + 静态链接所有库 + + + C Compiler C编译器 - + C++ Compiler C++编译器 - + Linker 链接器 @@ -4512,17 +4522,17 @@ Are you really want to continue? 表单 - + Base compiler set: 基础编译器设置: - + Tab 1 标签1 - + Tab 2 标签2 @@ -4531,6 +4541,16 @@ Are you really want to continue? Customize (apply to this project only): 自定义设置(仅对本项目生效) + + + Statically link libraries + 静态链接所有库 + + + + Add encoding options to compiler + 在编译时加入字符集选项 + ProjectDLLHostWidget @@ -4794,24 +4814,24 @@ 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' @@ -5302,23 +5322,23 @@ Are you really want to continue? 只生成汇编代码(-S) - - + + Confirm 确认 - + The following problems were found during validation of compiler set "%1": 在验证编译器设置"%1"时遇到了下列问题： - + Compiler set not configuared. 未配置编译器设置。 - + Would you like Red Panda C++ to search for compilers in the following locations: <BR />'%1'<BR />'%2'? 您需要小熊猫C++在下列位置搜索编译器吗：<br />%1<br />%2 @@ -5344,13 +5364,13 @@ Are you really want to continue? - + No 否 - + Yes 是 @@ -6070,7 +6090,7 @@ Are you really want to continue? 自动链接 - + @@ -6146,7 +6166,7 @@ Are you really want to continue? 杂项 - + Program Runner 程序运行 diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 065e329e..deab36cc 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -3050,7 +3050,17 @@ void MainWindow::onCompilerSetChanged(int index) if (mProject) { Editor *e = mEditorList->getEditor(); if (!e || e->inProject()) { - mProject->options().compilerSet = index; + if(QMessageBox::warning( + e, + tr("Change Project Compiler Set"), + tr("Change the project's compiler set will lose all custom compiler set options.") + +"
" + + tr("Do you really want to do that?"), + QMessageBox::Yes | QMessageBox::No, + QMessageBox::No) != QMessageBox::Yes) { + return; + } + mProject->setCompilerSet(index); mProject->saveOptions(); return; } diff --git a/RedPandaIDE/project.cpp b/RedPandaIDE/project.cpp index c85ed724..0eda57c3 100644 --- a/RedPandaIDE/project.cpp +++ b/RedPandaIDE/project.cpp @@ -615,6 +615,14 @@ PFolderNode Project::pointerToNode(FolderNode *p, PFolderNode parent) return PFolderNode(); } +void Project::setCompilerSet(int compilerSetIndex) +{ + if (mOptions.compilerSet != compilerSetIndex) { + mOptions.compilerSet = compilerSetIndex; + updateCompilerSetType(); + } +} + bool Project::assignTemplate(const std::shared_ptr aTemplate) { if (!aTemplate) { @@ -716,6 +724,7 @@ void Project::saveOptions() ini.SetLongValue("Project","IncludeVersionInfo", mOptions.includeVersionInfo); ini.SetLongValue("Project","SupportXPThemes", mOptions.supportXPThemes); ini.SetLongValue("Project","CompilerSet", mOptions.compilerSet); + ini.SetLongValue("Project","CompilerSetType", mOptions.compilerSetType); ini.SetValue("Project","CompilerSettings", mOptions.compilerOptions); ini.SetLongValue("Project","StaticLink", mOptions.staticLink); ini.SetLongValue("Project","AddCharset", mOptions.addCharset); @@ -1370,6 +1379,11 @@ void Project::loadOptions(SimpleIni& ini) mOptions.compilerOptions = ini.GetValue("Project", "CompilerSettings", ""); mOptions.staticLink = ini.GetBoolValue("Project", "StaticLink", true); mOptions.addCharset = ini.GetBoolValue("Project", "AddCharset", true); + + mOptions.compilerSetType = ini.GetLongValue("Project","CompilerSetType",-1); + if (mOptions.compilerSetType<0) { + updateCompilerSetType(); + } bool useUTF8 = ini.GetBoolValue("Project", "UseUTF8", false); if (useUTF8) { mOptions.encoding = fromByteArray(ini.GetValue("Project","Encoding", ENCODING_UTF8)); @@ -1516,6 +1530,19 @@ void Project::updateFolderNode(PFolderNode node) } } +void Project::updateCompilerSetType() +{ + Settings::PCompilerSet defaultSet = pSettings->compilerSets().getSet(mOptions.compilerSet); + if (defaultSet) { + mOptions.compilerSetType=defaultSet->compilerSetType(); + mOptions.staticLink = defaultSet->staticLink(); + mOptions.compilerOptions = defaultSet->iniOptions(); + } else { + mOptions.compilerSetType=CST_DEBUG; + mOptions.staticLink = false; + } +} + const QList &Project::units() const { return mUnits; diff --git a/RedPandaIDE/project.h b/RedPandaIDE/project.h index 8bde8514..3c37f000 100644 --- a/RedPandaIDE/project.h +++ b/RedPandaIDE/project.h @@ -163,6 +163,7 @@ public: void updateFolders(); void updateNodeIndexes(); PFolderNode pointerToNode(FolderNode * p, PFolderNode parent=PFolderNode()); + void setCompilerSet(int compilerSetIndex); //void showOptions(); bool assignTemplate(const std::shared_ptr aTemplate); @@ -190,6 +191,7 @@ private: void open(); void removeFolderRecurse(PFolderNode node); void updateFolderNode(PFolderNode node); + void updateCompilerSetType(); private: QList mUnits; diff --git a/RedPandaIDE/projectoptions.h b/RedPandaIDE/projectoptions.h index e1710c71..1b3c9259 100644 --- a/RedPandaIDE/projectoptions.h +++ b/RedPandaIDE/projectoptions.h @@ -60,6 +60,7 @@ struct ProjectOptions{ bool includeVersionInfo; bool supportXPThemes; int compilerSet; + int compilerSetType; QByteArray compilerOptions; ProjectVersionInfo versionInfo; QString cmdLineArgs; diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp index c64d53d5..dcaa1a42 100644 --- a/RedPandaIDE/settings.cpp +++ b/RedPandaIDE/settings.cpp @@ -2204,6 +2204,16 @@ QByteArray Settings::CompilerSet::getCompilerOutput(const QString &binDir, const return result.trimmed(); } +int Settings::CompilerSet::compilerSetType() const +{ + return mCompilerSetType; +} + +void Settings::CompilerSet::setCompilerSetType(int newCompilerSetType) +{ + mCompilerSetType = newCompilerSetType; +} + void Settings::CompilerSet::setCompilerType(const QString &newCompilerType) { mCompilerType = newCompilerType; @@ -2318,14 +2328,17 @@ void Settings::CompilerSets::addSets(const QString &folder) platformName = "32-bit"; } baseSet->setName(baseName + " " + platformName + " Release"); + baseSet->setCompilerSetType(CompilerSetType::CST_RELEASE); setReleaseOptions(baseSet); baseSet = addSet(folder); baseSet->setName(baseName + " " + platformName + " Debug"); + baseSet->setCompilerSetType(CompilerSetType::CST_DEBUG); setDebugOptions(baseSet); baseSet = addSet(folder); baseSet->setName(baseName + " " + platformName + " Profiling"); + baseSet->setCompilerSetType(CompilerSetType::CST_PROFILING); setProfileOptions(baseSet); mDefaultIndex = mList.size() - 2; @@ -2543,6 +2556,7 @@ void Settings::CompilerSets::saveSet(int index) mSettings->mSettings.setValue("Name", pSet->name()); mSettings->mSettings.setValue("Target", pSet->target()); mSettings->mSettings.setValue("CompilerType", pSet->compilerType()); + mSettings->mSettings.setValue("CompilerSetType", pSet->compilerSetType()); // Paths savePathList("Bins",pSet->binDirs()); @@ -2605,6 +2619,7 @@ Settings::PCompilerSet Settings::CompilerSets::loadSet(int index) pSet->setName(mSettings->mSettings.value("Name").toString()); pSet->setTarget(mSettings->mSettings.value("Target").toString()); pSet->setCompilerType(mSettings->mSettings.value("CompilerType").toString()); + pSet->setCompilerSetType(mSettings->mSettings.value("CompilerSetType").toInt()); // Paths loadPathList("Bins",pSet->binDirs()); diff --git a/RedPandaIDE/settings.h b/RedPandaIDE/settings.h index 5ae18c6e..c9f36283 100644 --- a/RedPandaIDE/settings.h +++ b/RedPandaIDE/settings.h @@ -34,6 +34,12 @@ extern const char ValueToChar[28]; class Settings; +enum CompilerSetType { + CST_RELEASE, + CST_DEBUG, + CST_PROFILING +}; + typedef struct { QString name; // language table index of "Generate debugging info" QString section; // language table index of "C options" @@ -968,6 +974,9 @@ public: void setCompilerType(const QString &newCompilerType); + int compilerSetType() const; + void setCompilerSetType(int newCompilerSetType); + private: // Initialization void setExecutables(); @@ -1003,7 +1012,8 @@ public: QString mName; // "TDM-GCC 4.7.1 Release" QStringList mDefines; // list of predefined constants QString mTarget; // 'X86_64' / 'i686' - QString mCompilerType; + QString mCompilerType; // 'Clang' / 'GCC' + int mCompilerSetType; // RELEASE/ DEBUG/ Profile // User settings bool mUseCustomCompileParams; diff --git a/RedPandaIDE/settingsdialog/projectcompileparamaterswidget.cpp b/RedPandaIDE/settingsdialog/projectcompileparamaterswidget.cpp index f63fd089..dd931011 100644 --- a/RedPandaIDE/settingsdialog/projectcompileparamaterswidget.cpp +++ b/RedPandaIDE/settingsdialog/projectcompileparamaterswidget.cpp @@ -17,8 +17,6 @@ ProjectCompileParamatersWidget::~ProjectCompileParamatersWidget() void ProjectCompileParamatersWidget::doLoad() { - ui->chkAddCharset->setChecked(pMainWindow->project()->options().addCharset); - ui->chkStaticLink->setChecked(pMainWindow->project()->options().staticLink); ui->txtCCompiler->setPlainText(pMainWindow->project()->options().compilerCmd); ui->txtCPPCompiler->setPlainText(pMainWindow->project()->options().cppCompilerCmd); ui->txtLinker->setPlainText(pMainWindow->project()->options().linkerCmd); @@ -26,8 +24,6 @@ void ProjectCompileParamatersWidget::doLoad() void ProjectCompileParamatersWidget::doSave() { - pMainWindow->project()->options().addCharset = ui->chkAddCharset->isChecked(); - pMainWindow->project()->options().staticLink = ui->chkStaticLink->isChecked(); pMainWindow->project()->options().compilerCmd = ui->txtCCompiler->toPlainText(); pMainWindow->project()->options().cppCompilerCmd = ui->txtCPPCompiler->toPlainText(); pMainWindow->project()->options().linkerCmd = ui->txtLinker->toPlainText(); diff --git a/RedPandaIDE/settingsdialog/projectcompileparamaterswidget.ui b/RedPandaIDE/settingsdialog/projectcompileparamaterswidget.ui index 505a1617..a536b31e 100644 --- a/RedPandaIDE/settingsdialog/projectcompileparamaterswidget.ui +++ b/RedPandaIDE/settingsdialog/projectcompileparamaterswidget.ui @@ -14,20 +14,6 @@ Form - - - - Add encoding options to compiler - - - - - - - Statically link libraries - - - diff --git a/RedPandaIDE/settingsdialog/projectcompilerwidget.cpp b/RedPandaIDE/settingsdialog/projectcompilerwidget.cpp index d3448b1c..46329ad5 100644 --- a/RedPandaIDE/settingsdialog/projectcompilerwidget.cpp +++ b/RedPandaIDE/settingsdialog/projectcompilerwidget.cpp @@ -18,9 +18,10 @@ ProjectCompilerWidget::~ProjectCompilerWidget() void ProjectCompilerWidget::refreshOptions() { - Settings::PCompilerSet pSet = pSettings->compilerSets().defaultSet(); + Settings::PCompilerSet pSet = pSettings->compilerSets().getSet(ui->cbCompilerSet->currentIndex()); if (!pSet) return; + mOptions = pSet->iniOptions(); QTabWidget* pTab = ui->tabOptions; while (pTab->count()>0) { QWidget* p=pTab->widget(0); @@ -79,10 +80,15 @@ void ProjectCompilerWidget::refreshOptions() QSpacerItem* horizontalSpacer = new QSpacerItem(10, 100, QSizePolicy::Minimum, QSizePolicy::Expanding); pLayout->addItem(horizontalSpacer,row,0); } + + ui->chkStaticLink->setChecked(pSet->staticLink()); } void ProjectCompilerWidget::doLoad() { + ui->chkAddCharset->setChecked(pMainWindow->project()->options().addCharset); + ui->chkStaticLink->setChecked(pMainWindow->project()->options().staticLink); + mOptions = pMainWindow->project()->options().compilerOptions; ui->cbCompilerSet->setCurrentIndex(pMainWindow->project()->options().compilerSet); } @@ -113,8 +119,10 @@ void ProjectCompilerWidget::doSave() } } } - pMainWindow->project()->options().compilerSet = ui->cbCompilerSet->currentIndex(); + pMainWindow->project()->setCompilerSet(ui->cbCompilerSet->currentIndex()); pMainWindow->project()->options().compilerOptions = mOptions; + pMainWindow->project()->options().addCharset = ui->chkAddCharset->isChecked(); + pMainWindow->project()->options().staticLink = ui->chkStaticLink->isChecked(); pMainWindow->project()->saveOptions(); } diff --git a/RedPandaIDE/settingsdialog/projectcompilerwidget.ui b/RedPandaIDE/settingsdialog/projectcompilerwidget.ui index 5e1ae547..6de52b42 100644 --- a/RedPandaIDE/settingsdialog/projectcompilerwidget.ui +++ b/RedPandaIDE/settingsdialog/projectcompilerwidget.ui @@ -14,6 +14,9 @@ Form + + + @@ -30,17 +33,7 @@ - - - - Base compiler set: - - - - - - @@ -54,13 +47,34 @@ - + + + + Base compiler set: + + + + Customize (apply to this project only): + + + + Statically link libraries + + + + + + + Add encoding options to compiler + + +