From 284a8ed695cad93b8f93d52526026be83d6ece2d Mon Sep 17 00:00:00 2001 From: "royqh1979@gmail.com" Date: Mon, 15 Nov 2021 22:08:35 +0800 Subject: [PATCH] - fix: add unit to project not correctly set new unit file's encoding - fix: correctly set encoding for the new added project unit file - fix: if there's a project openned, new file should ask user if he want to add the new file to the project - fix: when adding a file openned in the editor to the project, properties of it are not correctly setted. - enhancement: when remove a file from the project, also ask if user want to remove it from disk - fix: double click a project's .dev file in the Files panel should load the project --- NEWS.md | 5 + RedPandaIDE/RedPandaIDE_zh_CN.qm | Bin 104937 -> 105123 bytes RedPandaIDE/RedPandaIDE_zh_CN.ts | 222 +++++++++++++++++-------------- RedPandaIDE/mainwindow.cpp | 108 +++++++++------ RedPandaIDE/mainwindow.h | 1 + RedPandaIDE/mainwindow.ui | 2 +- RedPandaIDE/project.cpp | 21 ++- RedPandaIDE/project.h | 2 +- 8 files changed, 209 insertions(+), 152 deletions(-) diff --git a/NEWS.md b/NEWS.md index b9300a12..e67be16f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,11 @@ Version 0.8.10 For Dev-C++ 7 Beta - fix: Shouldn't update auto link settings, if the header name to be modified is unchanged - fix: add unit to project not correctly set new unit file's encoding + - fix: correctly set encoding for the new added project unit file + - fix: if there's a project openned, new file should ask user if he want to add the new file to the project + - fix: when adding a file openned in the editor to the project, properties of it are not correctly setted. + - enhancement: when remove a file from the project, also ask if user want to remove it from disk + - fix: double click a project's .dev file in the Files panel should load the project Version 0.8.9 For Dev-C++ 7 Beta - fix: text color of labels in statusbar not correctly updated when change theme diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.qm b/RedPandaIDE/RedPandaIDE_zh_CN.qm index 0587e6c1a74433895334352184b9b04dd5d60750..a8bb9e703161aafbdea085697440192573bdadef 100644 GIT binary patch delta 6860 zcmYkAc|cA1`^TTpxo5ri+*yP`08)SxZHcqD^~A(=rHy(H%0AwQxwu@*P{Y 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 F{tsGMD{BA% delta 6591 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 N#Q@WipF3>x{tpr@^g93m diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.ts b/RedPandaIDE/RedPandaIDE_zh_CN.ts index 875cf2d7..0103efed 100644 --- a/RedPandaIDE/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/RedPandaIDE_zh_CN.ts @@ -82,12 +82,12 @@ 链接参数 - + Header exists 头文件已存在 - + Header already exists. 头文件已存在。 @@ -2857,11 +2857,11 @@ Are you really want to continue? - - - - - + + + + + Issues 编译器 @@ -3269,7 +3269,7 @@ Are you really want to continue? - + New Problem Set 新建试题集 @@ -3288,14 +3288,14 @@ Are you really want to continue? - + Save Problem Set 保存试题集 - + Load Problem Set 载入试题集 @@ -3630,7 +3630,7 @@ Are you really want to continue? - + Clear all breakpoints 删除所有断点 @@ -3731,7 +3731,7 @@ Are you really want to continue? - + Rename Symbol 重命名符号 @@ -3752,13 +3752,13 @@ Are you really want to continue? - + Export As RTF 导出为RTF - + Export As HTML 导出为HTML @@ -3824,7 +3824,7 @@ Are you really want to continue? - + Open Folder 打开文件夹 @@ -4055,7 +4055,7 @@ Are you really want to continue? - + Problem Set %1 试题集%1 @@ -4122,15 +4122,15 @@ Are you really want to continue? - - + + Bookmark Description 书签描述 - - + + Description: 描述： @@ -4294,183 +4294,203 @@ Are you really want to continue? - + Do you want to save it? 需要保存吗？ - - - - + + 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? 你真的想要做那些吗？ - + 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 无法使用模板创建项目 - + + Remove file + 删除文件 + + + + Remove the file from disk? + 同时从硬盘上删除文件？ + + + 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) - + The current problem set is not empty. 当前的试题集不是空的。 - + Problem %1 试题%1 - - + + Problem Set Files (*.pbs) 试题集文件 (*.pbs) - + Load Error 载入失败 - + Problem Case %1 试题案例%1 @@ -4485,11 +4505,11 @@ Are you really want to continue? - - - - - + + + + + Error 错误 @@ -4519,55 +4539,55 @@ Are you really want to continue? 是否保持它在小熊猫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个文件） @@ -4695,77 +4715,77 @@ Are you really want to continue? 无标题 - + Can't save file 无法保存文件 - + Can't save file '%1' 无法保存文件'%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++编辑器开发 @@ -5156,24 +5176,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' @@ -6483,7 +6503,7 @@ Are you really want to continue? 自动链接 - + @@ -6559,7 +6579,7 @@ Are you really want to continue? 杂项 - + Program Runner diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index abbce54d..58eb48a6 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -3211,6 +3211,15 @@ CPUDialog *MainWindow::cpuDialog() const void MainWindow::on_actionNew_triggered() { + if (mProject) { + if (QMessageBox::question(this, + tr("New Project File?"), + tr("Do you want to add the new file to the project?"), + QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) { + newProjectUnitFile(); + return; + } + } newEditor(); } @@ -4654,46 +4663,7 @@ void MainWindow::on_actionSaveAll_triggered() void MainWindow::on_actionProject_New_File_triggered() { - int idx = -1; - if (!mProject) - return; - QModelIndex current = ui->projectView->currentIndex(); - FolderNode * node = nullptr; - if (current.isValid()) { - node = static_cast(current.internalPointer()); - } - QString newFileName; - do { - newFileName = tr("untitled")+QString("%1").arg(getNewFileNumber()); - if (mProject->options().useGPP) { - newFileName+=".cpp"; - } else { - newFileName+=".c"; - } - } while (fileExists(QDir(mProject->directory()).absoluteFilePath(newFileName))); - - newFileName = QInputDialog::getText( - this, - tr("New Project File Name"), - tr("File Name:"), - QLineEdit::Normal, - newFileName); - if (newFileName.isEmpty()) - return; - if (fileExists(QDir(mProject->directory()).absoluteFilePath(newFileName))) { - QMessageBox::critical(this,tr("File Already Exists!"), - tr("File '%1' already exists!").arg(newFileName)); - return; - } - PProjectUnit newUnit = mProject->newUnit( - mProject->pointerToNode(node),newFileName); - idx = mProject->units().count()-1; - mProject->saveUnits(); - updateProjectView(); - Editor * editor = mProject->openUnit(idx); - //editor->setUseCppSyntax(mProject->options().useGPP); - //editor->setModified(true); - editor->activate(); + newProjectUnitFile(); } @@ -4742,9 +4712,14 @@ void MainWindow::on_actionRemove_from_project_triggered() continue; selected.insert(folderNode->unitIndex); }; + + bool removeFile = (QMessageBox::question(this,tr("Remove file"), + tr("Remove the file from disk?"), + QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes); + for (int i=mProject->units().count()-1;i>=0;i--) { if (selected.contains(i)) { - mProject->removeEditor(i,true); + mProject->removeUnit(i,true,removeFile); } } @@ -4952,6 +4927,50 @@ void MainWindow::prepareTabMessagesData() mTabMessagesData[widget]=info; } } + +void MainWindow::newProjectUnitFile() +{ + if (!mProject) + return; + int idx = -1; + QModelIndex current = ui->projectView->currentIndex(); + FolderNode * node = nullptr; + if (current.isValid()) { + node = static_cast(current.internalPointer()); + } + QString newFileName; + do { + newFileName = tr("untitled")+QString("%1").arg(getNewFileNumber()); + if (mProject->options().useGPP) { + newFileName+=".cpp"; + } else { + newFileName+=".c"; + } + } while (fileExists(QDir(mProject->directory()).absoluteFilePath(newFileName))); + + newFileName = QInputDialog::getText( + this, + tr("New Project File Name"), + tr("File Name:"), + QLineEdit::Normal, + newFileName); + if (newFileName.isEmpty()) + return; + if (fileExists(QDir(mProject->directory()).absoluteFilePath(newFileName))) { + QMessageBox::critical(this,tr("File Already Exists!"), + tr("File '%1' already exists!").arg(newFileName)); + return; + } + PProjectUnit newUnit = mProject->newUnit( + mProject->pointerToNode(node),newFileName); + idx = mProject->units().count()-1; + mProject->saveUnits(); + updateProjectView(); + Editor * editor = mProject->openUnit(idx); + //editor->setUseCppSyntax(mProject->options().useGPP); + //editor->setModified(true); + editor->activate(); +} void MainWindow::on_EditorTabsLeft_currentChanged(int) { Editor * editor = mEditorList->getEditor(-1,ui->EditorTabsLeft); @@ -5383,9 +5402,10 @@ void MainWindow::on_treeFiles_doubleClicked(const QModelIndex &index) QString filepath = mFileSystemModel.filePath(index); QFileInfo file(filepath); if (file.isFile()) { - Editor * editor = mEditorList->getEditorByFilename(filepath); - if (editor) { - editor->activate(); + if (getFileType(filepath)==FileType::Project) { + openProject(filepath); + } else { + openFile(filepath); } } } diff --git a/RedPandaIDE/mainwindow.h b/RedPandaIDE/mainwindow.h index 03a9b403..c11f45b7 100644 --- a/RedPandaIDE/mainwindow.h +++ b/RedPandaIDE/mainwindow.h @@ -226,6 +226,7 @@ private: void showHideMessagesTab(QWidget *widget, bool show); void prepareTabInfosData(); void prepareTabMessagesData(); + void newProjectUnitFile(); private slots: void onAutoSaveTimeout(); diff --git a/RedPandaIDE/mainwindow.ui b/RedPandaIDE/mainwindow.ui index 507115f3..70747547 100644 --- a/RedPandaIDE/mainwindow.ui +++ b/RedPandaIDE/mainwindow.ui @@ -85,7 +85,7 @@ QTabWidget::West - 1 + 3 true diff --git a/RedPandaIDE/project.cpp b/RedPandaIDE/project.cpp index fc228a73..3e55b7a3 100644 --- a/RedPandaIDE/project.cpp +++ b/RedPandaIDE/project.cpp @@ -340,7 +340,7 @@ void Project::rebuildNodes() emit nodesChanged(); } -bool Project::removeEditor(int index, bool doClose) +bool Project::removeUnit(int index, bool doClose , bool removeFile) { mModel.beginUpdate(); auto action = finally([this]{ @@ -357,6 +357,10 @@ bool Project::removeEditor(int index, bool doClose) return false; } + if (removeFile) { + QFile::remove(unit->fileName()); + } + //if not fUnits.GetItem(index).fNew then PFolderNode node = unit->node(); PFolderNode parent = node->parent.lock(); @@ -788,10 +792,17 @@ PProjectUnit Project::addUnit(const QString &inFileName, PFolderNode parentNode, newUnit = std::make_shared(this); // Set all properties - newUnit->setEncoding(toByteArray(mOptions.encoding)); newUnit->setFileName(QDir(directory()).filePath(inFileName)); newUnit->setNew(false); - newUnit->setEditor(nullptr); + Editor * e= pMainWindow->editorList()->getOpenedEditorByFilename(newUnit->fileName()); + if (e) { + newUnit->setEditor(e); + newUnit->setEncoding(e->encodingOption()); + e->setInProject(true); + } else { + newUnit->setEditor(nullptr); + newUnit->setEncoding(ENCODING_AUTO_DETECT); + } newUnit->setFolder(getFolderPath(parentNode)); newUnit->setNode(makeNewFileNode(extractFileName(newUnit->fileName()), false, parentNode)); newUnit->node()->unitIndex = mUnits.count(); @@ -1515,7 +1526,7 @@ void Project::removeFolderRecurse(PFolderNode node) } else if (childNode->unitIndex >= 0 && childNode->level > 0) { // Remove editor in folder from project int editorIndex = childNode->unitIndex; - if (!removeEditor(editorIndex,true)) + if (!removeUnit(editorIndex,true)) return; } } @@ -1920,7 +1931,7 @@ bool ProjectModel::setData(const QModelIndex &index, const QVariant &value, int // Remove it from the current project... int projindex = mProject->indexInUnits(newName); if (projindex>=0) { - mProject->removeEditor(projindex,false); + mProject->removeUnit(projindex,false); } // All references to the file are removed. Delete the file from disk diff --git a/RedPandaIDE/project.h b/RedPandaIDE/project.h index 3c37f000..e5f6f392 100644 --- a/RedPandaIDE/project.h +++ b/RedPandaIDE/project.h @@ -148,7 +148,7 @@ public: const QString& customFileName=""); Editor* openUnit(int index); void rebuildNodes(); - bool removeEditor(int index, bool doClose); + bool removeUnit(int index, bool doClose, bool removeFile = false); bool removeFolder(PFolderNode node); void resetParserProjectFiles(); void saveAll(); // save [Project] and all [UnitX]