From 461df394cb061207ec585e0234f4808fdf2557ad Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Wed, 30 Mar 2022 20:15:15 +0800 Subject: [PATCH] - fix: when open a project, and it's missing compiler set getten reset, it's modification flag is not correctly set. --- NEWS.md | 1 + RedPandaIDE/debugger.cpp | 2 +- RedPandaIDE/project.cpp | 15 ++------------- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/NEWS.md b/NEWS.md index 8515fba9..a3956320 100644 --- a/NEWS.md +++ b/NEWS.md @@ -16,6 +16,7 @@ Red Panda C++ Version 1.0.2 - fix: can't stop a freeze program that has stdin redirected. - enhancement: context menu for problem cases table - fix: error in auto generate makefile under linux + - fix: when open a project, and it's missing compiler set getten reset, it's modification flag is not correctly set. Red Panda C++ Version 1.0.1 - fix: only convert project icon file when it's filename doesn't end with ".ico" diff --git a/RedPandaIDE/debugger.cpp b/RedPandaIDE/debugger.cpp index f5e367fe..a3f40936 100644 --- a/RedPandaIDE/debugger.cpp +++ b/RedPandaIDE/debugger.cpp @@ -2231,7 +2231,7 @@ bool WatchModel::hasChildren(const QModelIndex &parent) const return true; } WatchVar* item = static_cast(parent.internalPointer()); - return item->numChild>0; + return item->numChild>0 || item->hasMore; } RegisterModel::RegisterModel(QObject *parent):QAbstractTableModel(parent) diff --git a/RedPandaIDE/project.cpp b/RedPandaIDE/project.cpp index ff22deb8..f439dbf7 100644 --- a/RedPandaIDE/project.cpp +++ b/RedPandaIDE/project.cpp @@ -55,8 +55,8 @@ Project::Project(const QString &filename, const QString &name, &EditorList::getContentFromOpenedEditor,mEditorList, std::placeholders::_1, std::placeholders::_2)); if (name == DEV_INTERNAL_OPEN) { - open(); mModified = false; + open(); } else { mName = name; SimpleIni ini; @@ -1515,18 +1515,7 @@ void Project::loadOptions(SimpleIni& ini) +tr("It will be substituted by the global compiler set."), QMessageBox::Ok ); - mOptions.compilerSet = pSettings->compilerSets().defaultIndex(); - int compilerSetType = ini.GetLongValue("Project","CompilerSetType",-1); - if (compilerSetType>=0) { - for (int i=0;icompilerSets().size();i++) { - Settings::PCompilerSet pSet = pSettings->compilerSets().getSet(i); - if (pSet && pSet->compilerSetType() == compilerSetType) { - mOptions.compilerSet = i; - break; - } - } - } - setModified(true); + setCompilerSet(pSettings->compilerSets().defaultIndex()); } mOptions.compilerOptions = ini.GetValue("Project", "CompilerSettings", ""); mOptions.staticLink = ini.GetBoolValue("Project", "StaticLink", true);