From 425b4a4e96b570f03583a48eaede649cec3a892c Mon Sep 17 00:00:00 2001 From: "royqh1979@gmail.com" Date: Tue, 1 Feb 2022 16:17:28 +0800 Subject: [PATCH] fix: crash while delete headers created by new header dialog --- NEWS.md | 1 + RedPandaIDE/RedPandaIDE_zh_CN.ts | 977 ++++++++++-------- RedPandaIDE/compiler/projectcompiler.cpp | 4 +- RedPandaIDE/editorlist.cpp | 7 + RedPandaIDE/mainwindow.cpp | 100 +- RedPandaIDE/mainwindow.h | 2 + RedPandaIDE/mainwindow.ui | 15 +- RedPandaIDE/project.cpp | 20 +- RedPandaIDE/projectoptions.cpp | 2 +- RedPandaIDE/projectoptions.h | 2 +- RedPandaIDE/projecttemplate.cpp | 2 +- RedPandaIDE/settings.cpp | 24 + RedPandaIDE/settings.h | 8 + .../settingsdialog/projectgeneralwidget.cpp | 4 +- RedPandaIDE/widgets/newclassdialog.cpp | 1 + RedPandaIDE/widgets/newheaderdialog.cpp | 54 + RedPandaIDE/widgets/newheaderdialog.h | 14 + RedPandaIDE/widgets/newheaderdialog.ui | 147 +-- RedPandaIDE/widgets/newprojectdialog.cpp | 2 +- 19 files changed, 843 insertions(+), 543 deletions(-) diff --git a/NEWS.md b/NEWS.md index de985d37..21ea194a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -6,6 +6,7 @@ Red Panda C++ Version 0.14.1 - enhancement: display localzed icon set name in the option dialog - enhancement: new sky blue icon set, contributed by Alan-CRL - enhancement: show caret at once, when edition finished + - enhancement: new header dialog for project Red Panda C++ Version 0.14.0 - enhancement: custom icon set ( in the configuration folder) diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.ts b/RedPandaIDE/RedPandaIDE_zh_CN.ts index 7d735c6f..0e15c66e 100644 --- a/RedPandaIDE/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/RedPandaIDE_zh_CN.ts @@ -129,17 +129,17 @@ p, li { white-space: pre-wrap; } AppTheme - + Theme file '%1' doesn't exist! 主题文件"%1"不存在！ - + Error in json file '%1':%2 : %3 JSON文件'%1':%2中存在错误：%3 - + Can't open the theme file '%1' for read. 无法读取主题文件"%1"! @@ -2037,12 +2037,12 @@ Are you really want to continue? 大小: - + English 英语 - + Simplified Chinese 简体中文 @@ -2074,46 +2074,57 @@ Are you really want to continue? 表单 - + Configuration folder: Confirugration folder: 配置文件夹： - - - - + + + + + Open in browser 在文件浏览器中打开 - + Custom icon sets folder: 自定义图标集文件夹: - + Remove all custom settings and exit 删除所有的自定义设置并退出程序 - + + Custom theme folder: + 自定义主题文件夹 + + + + Open custom theme folder in file browser + 在文件浏览器中打开自定义主题文件夹 + + + Confirm 确认 - + Do you really want to delete all custom settings? 你真的要删除所有自定义设置吗？ - + Error 错误 - + Failed to delete custom settings. 删除自定义设置失败 @@ -3254,70 +3265,70 @@ Are you really want to continue? MainWindow - + Red Panda C++ 小熊猫C++ - - + - + - + + Issues 编译器 - - + + Compile Log 编译日志 - + File 文件 - + Tools 工具 + - Run 运行 - + Edit 编辑 - - + + Project 项目 - + Watch 监视 - + Structure 结构 - + Files 文件 @@ -3326,85 +3337,85 @@ Are you really want to continue? 资源 - - + + + - - + Debug 调试 - + Evaluate: 求值 - - + + Debug Console 调试主控台 - + Call Stack 调用栈 - + Breakpoints 断点 - + Locals 局部变量 - - - + + + Search 查找 - + History: 历史： - + Search Again 重新查找 - + Replace with: 替换为： - + Replace 替换 - + Close 关闭 - + Execute 运行 - - + + Code 代码 - + Window 窗口 @@ -3417,262 +3428,262 @@ 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 编译 - + F9 F9 - + F10 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编码 + - Compile & Run 编译运行 - + F11 F11 + - Rebuild All 全部重编译 - + F12 F12 - + Stop Execution 停止执行 - + F6 F6 - + F5 F5 - + Step Over 单步跳过 - + F7 F7 - + Step Into 单步进入 - - + + Problem Set 试题集 - + New Problem Set 新建试题集 @@ -3691,599 +3702,606 @@ Are you really want to continue? - + Save Problem Set 保存试题集 - + Load Problem Set 载入试题集 - + Memory 内存 - + Address Expression: Address: 地址表达式： - + Cancel 取消 - - + + TODO TODO - - + + Bookmark 书签 - - - - + + + + Problem 试题 - - + + Add Probem Case 添加试题案例 - - + + Remove Problem Case Remove Problem Set 删除试题集 - - + + Open Anwser Source File 打开答案源代码文件 - - + + Run All Cases Run Current Case 运行所有案例 - + Problem Cases Validation Options 测试案例验证选项 - + %v/%m %v/%m - + Output 输出 - + Input 输入 - + Expected 期望输出 - + Help 帮助 - + Refactor 重构 - + View 视图 - + Tool Windows 工具窗口 - + Main 主工具栏 - + Compiler Set 编译器配置集 + - New Source File 新建源代码文件 - + 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 跳转到声明处 - + Goto Definition 跳转到定义处 - + Find references 查找符号的引用 - + Open containing folder 打开所在的文件夹 - + Ctrl+B Ctrl+B - + Open a terminal here 打开命令行窗口 - + File Properties... 文件属性... - + Close Project 关闭项目 - + Project options 项目属性 - + New Project... 新建项目... - + 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参考手册 - + Tool Window Bars 工具窗口栏 - + 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 + 新建头文件... + Insert Line 插入行 - + 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 删除到行首 @@ -4292,78 +4310,78 @@ Are you really want to continue? C/C++参考 - + EGE Manual EGE图形库手册 - + Add Bookmark 添加书签 - + Remove Bookmark 删除书签 - + Modify Bookmark Description 修改书签说明 - + Locate in Files View 在文件视图中定位 - - + + Open Folder 打开文件夹 - + Running Parameters... 运行参数... - + File Encoding 文件编码 - + Recent Files 文件历史 - - - - - - + + + + + + Debugging 正在调试 - - - - - - + + + + + + Running 正在运行 - - - - - - + + + + + + Compiling 正在编译 @@ -4372,193 +4390,193 @@ Are you really want to continue? 行:%1 列:%2 已选择:%3 总行数:%4 总长度:%5 - + Line:%1 Col:%2 Selected:%3 Lines:%4 Length:%5 Line: %1 Col: %2 Selected: %3 Lines: %4 Length: %5 行: %1 列: %2 已选择 :%3 总行数: %4 总长度: %5 - + Read Only 只读 - + Insert 插入 - + Overwrite 覆写 - + Close project 关闭项目 - + Are you sure you want to close %1? 你确定要关闭'%1'吗？ - - + + Confirm 确认 - - - + + + Source file is not compiled. 源文件尚未编译。 - - + + Compile now? 现在编译？ - - + + Source file is more recent than executable. 源文件比可执行程序新。 - + Recompile now? 重新编译？ - + No compiler set 无编译器设置 - + No compiler set is configured. 没有配置编译器设置。 - + Can't start debugging. 无法启动调试器 - - + + Enable debugging 启用调试参数 - - + + You have not enabled debugging info (-g3) and/or stripped it from the executable (-s) in Compiler Options.<BR /><BR />Do you want to correct this now? 当前编译设置中未启用调试选项(-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'不存在。 - + Recompile? 重新编译？ - - + + Save last open info error 保存上次打开信息失败 - + Can't remove old last open information file '%1' 无法删除旧上次打开信息文件'%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 打开源代码文件 - + Show detail debug logs 显示详细调试器日志 - + Copy all 全部复制 - - + + Clear 清除 - + Export 导出 - + Insert Snippet 插入代码段 - - + + Problem Set %1 试题集%1 @@ -4579,68 +4597,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: 描述： @@ -4649,469 +4667,491 @@ 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 重命名 - + Remove Folder 删除文件夹 - + Sort By Type 按类型排序 - + Sort alphabetically 按名称排序 - + Show inherited members 显示继承的成员 - + Goto declaration 跳转到声明处 - + Goto definition 跳转到定义处 - + Open in Editor 在编辑器中打开 - + Open in External Program 使用外部程序打开 - + Open in Terminal 在终端中打开 - + Open in Windows Explorer 在Windows浏览器中打开 - + Character sets 字符集 - + %1 files autosaved 已自动保存%1个文件 - + Set answer to... 设置答案源代码... - + select other file... 选择其他文件... - + Select Answer Source File 选择答案源代码文件 - + C/C++Source Files (*.c *.cpp *.cc *.cxx) C/C++Source Files (*.c *.cpp *.cc *.cxx C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + 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? 你真的想要做那些吗？ - + 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 + + + + Header Exists + 头文件已存在 + + + + + Header file "%1" already exists! + 头文件"%1"已存在！ + + + + Source Exists + 源文件已存在！ + + + + Source file "%1" already exists! + 源文件"%1"已存在！ + 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 添加到项目 - + 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 载入主题失败 - + 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个文件） @@ -5173,6 +5213,49 @@ Are you really want to continue? 路径 + + NewHeaderDialog + + Dialog + 对话框 + + + + New Header + 新建头文件 + + + + Header: + 头文件名 + + + + + Browse + 浏览 + + + + Path: + 路径: + + + + Create + 创建 + + + + Cancel + 取消 + + + + Path + 路径 + + NewProjectDialog @@ -7182,7 +7265,7 @@ Are you really want to continue? 自动链接 - + @@ -7258,15 +7341,15 @@ Are you really want to continue? 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 diff --git a/RedPandaIDE/compiler/projectcompiler.cpp b/RedPandaIDE/compiler/projectcompiler.cpp index 381f0eb0..a7bce0f8 100644 --- a/RedPandaIDE/compiler/projectcompiler.cpp +++ b/RedPandaIDE/compiler/projectcompiler.cpp @@ -54,7 +54,7 @@ void ProjectCompiler::createStandardMakeFile() newMakeFile(file); file.write("$(BIN): $(OBJ)\n"); if (!mOnlyCheckSyntax) { - if (mProject->options().useGPP) { + if (mProject->options().isCpp) { writeln(file,"\t$(CPP) $(LINKOBJ) -o $(BIN) $(LIBS)"); } else writeln(file,"\t$(CC) $(LINKOBJ) -o $(BIN) $(LIBS)"); @@ -80,7 +80,7 @@ void ProjectCompiler::createDynamicMakeFile() newMakeFile(file); writeln(file,"$(BIN): $(LINKOBJ)"); if (!mOnlyCheckSyntax) { - if (mProject->options().useGPP) { + if (mProject->options().isCpp) { file.write("\t$(CPP) -mdll $(LINKOBJ) -o $(BIN) $(LIBS) -Wl,--output-def,$(DEF),--out-implib,$(STATIC)"); } else { file.write("\t$(CC) -mdll $(LINKOBJ) -o $(BIN) $(LIBS) -Wl,--output-def,$(DEF),--out-implib,$(STATIC)"); diff --git a/RedPandaIDE/editorlist.cpp b/RedPandaIDE/editorlist.cpp index 1551f297..4ebf7ccc 100644 --- a/RedPandaIDE/editorlist.cpp +++ b/RedPandaIDE/editorlist.cpp @@ -55,6 +55,13 @@ Editor* EditorList::newEditor(const QString& filename, const QByteArray& encodin Editor * e = new Editor(parentPageControl,filename,encoding,inProject,newFile,parentPageControl); connect(e, &Editor::renamed, this, &EditorList::onEditorRenamed); updateLayout(); + if (pMainWindow->project()){ + PProjectUnit unit = pMainWindow->project()->findUnitByFilename(filename); + if (unit) { + pMainWindow->project()->associateEditorToUnit(e,unit); + e->setInProject(true); + } + } return e; } diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index bd7f81de..0ab9ca91 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -38,6 +38,7 @@ #include "widgets/ojproblempropertywidget.h" #include "iconsmanager.h" #include "widgets/newclassdialog.h" +#include "widgets/newheaderdialog.h" #include #include @@ -166,6 +167,10 @@ MainWindow::MainWindow(QWidget *parent) mMenuNew->setTitle(tr("New")); mMenuNew->addAction(ui->actionNew); mMenuNew->addAction(ui->actionNew_Project); + mMenuNew->addSeparator(); + mMenuNew->addAction(ui->actionNew_Class); + mMenuNew->addAction(ui->actionNew_Header); + ui->menuFile->insertMenu(ui->actionOpen,mMenuNew); @@ -474,6 +479,7 @@ void MainWindow::updateProjectActions() ui->actionProject_options->setEnabled(hasProject); ui->actionClose_Project->setEnabled(hasProject); ui->actionNew_Class->setEnabled(hasProject); + ui->actionNew_Header->setEnabled(hasProject); ui->actionProject_Open_Folder_In_Explorer->setEnabled(hasProject); ui->actionProject_Open_In_Terminal->setEnabled(hasProject); updateCompileActions(); @@ -1010,9 +1016,9 @@ void MainWindow::openFile(const QString &filename, QTabWidget* page) QByteArray encoding = unit ? unit->encoding() : ENCODING_AUTO_DETECT; editor = mEditorList->newEditor(filename,encoding, inProject, false, page); - if (mProject) { - mProject->associateEditorToUnit(editor,unit); - } +// if (mProject) { +// mProject->associateEditorToUnit(editor,unit); +// } editor->activate(); this->updateForEncodingInfo(); } catch (FileError e) { @@ -2042,14 +2048,11 @@ void MainWindow::loadLastOpens() bool inProject = (mProject && unit); QByteArray encoding = unit ? unit->encoding() : ENCODING_AUTO_DETECT; Editor * editor = mEditorList->newEditor(editorFilename, encoding, inProject,false,page); - if (mProject) { - mProject->associateEditorToUnit(editor,unit); - } +// if (mProject) { +// mProject->associateEditorToUnit(editor,unit); +// } if (!editor) continue; -// if (mProject) { -// mProject->associateEditor(editor); -// } BufferCoord pos; pos.Char = lastOpenIni.GetLongValue(sectionName,"CursorCol", 1); pos.Line = lastOpenIni.GetLongValue(sectionName,"CursorRow", 1); @@ -2915,6 +2918,8 @@ void MainWindow::onProjectViewContextMenu(const QPoint &pos) QMenu menu(this); updateProjectActions(); menu.addAction(ui->actionProject_New_File); + menu.addAction(ui->actionNew_Class); + menu.addAction(ui->actionNew_Header); menu.addAction(ui->actionAdd_to_project); if (!onFolder) { menu.addAction(ui->actionRemove_from_project); @@ -5327,7 +5332,7 @@ void MainWindow::newProjectUnitFile() QString newFileName; do { newFileName = tr("untitled")+QString("%1").arg(getNewFileNumber()); - if (mProject->options().useGPP) { + if (mProject->options().isCpp) { newFileName+=".cpp"; } else { newFileName+=".c"; @@ -6148,6 +6153,55 @@ void MainWindow::on_actionDelete_to_Word_End_triggered() } +void MainWindow::on_actionNew_Header_triggered() +{ + if (!mProject) + return; + NewHeaderDialog dialog; + dialog.setPath(mProject->folder()); + if (dialog.exec()==QDialog::Accepted) { + QDir dir(dialog.path()); + if (dialog.headerName().isEmpty() + || !dir.exists()) + return; + QString headerFilename = includeTrailingPathDelimiter(dialog.path())+dialog.headerName(); + if (fileExists(headerFilename)){ + QMessageBox::critical(this, + tr("Header Exists"), + tr("Header file \"%1\" already exists!").arg(headerFilename)); + return; + } + QString header_macro = QFileInfo(dialog.headerName()).baseName().toUpper()+"_H"; + QStringList header; + QString indents; + if (pSettings->editor().tabToSpaces()) { + indents = QString(pSettings->editor().tabWidth(),' '); + } else { + indents = "\t"; + } + header.append(QString("#ifndef %1").arg(header_macro)); + header.append(QString("#define %1").arg(header_macro)); + header.append(""); + header.append("#endif"); + stringsToFile(header, headerFilename); + + mProject->addUnit(headerFilename,mProject->rootNode(),false); + mProject->cppParser()->addFileToScan(headerFilename); + mProject->rebuildNodes(); + mProject->saveUnits(); + parseFileList(mProject->cppParser()); + updateProjectView(); + + Editor * editor = mEditorList->getEditorByFilename(headerFilename); + if (editor){ + editor->activate(); + } + } + pSettings->ui().setNewClassDialogWidth(dialog.width()); + pSettings->ui().setNewClassDialogHeight(dialog.height()); +} + + void MainWindow::on_actionNew_Class_triggered() { if (!mProject) @@ -6161,6 +6215,20 @@ void MainWindow::on_actionNew_Class_triggered() || dialog.headerName().isEmpty() || !dir.exists()) return; + QString headerFilename = includeTrailingPathDelimiter(dialog.path())+dialog.headerName(); + QString sourceFilename = includeTrailingPathDelimiter(dialog.path())+dialog.sourceName(); + if (fileExists(headerFilename)){ + QMessageBox::critical(this, + tr("Header Exists"), + tr("Header file \"%1\" already exists!").arg(headerFilename)); + return; + } + if (fileExists(sourceFilename)){ + QMessageBox::critical(this, + tr("Source Exists"), + tr("Source file \"%1\" already exists!").arg(sourceFilename)); + return; + } QString header_macro = dialog.className().toUpper()+"_H"; QStringList header; QString indents; @@ -6180,13 +6248,11 @@ void MainWindow::on_actionNew_Class_triggered() header.append("};"); header.append(""); header.append("#endif"); - QString headerFilename = includeTrailingPathDelimiter(dialog.path())+dialog.headerName(); stringsToFile(header, headerFilename); QStringList source; source.append(QString("#include \"%1\"").arg(dialog.headerName())); source.append(""); source.append(""); - QString sourceFilename = includeTrailingPathDelimiter(dialog.path())+dialog.sourceName(); stringsToFile(source, sourceFilename); mProject->addUnit(headerFilename,mProject->rootNode(),false); @@ -6197,8 +6263,14 @@ void MainWindow::on_actionNew_Class_triggered() mProject->saveUnits(); parseFileList(mProject->cppParser()); updateProjectView(); + + Editor * editor = mEditorList->getEditorByFilename(headerFilename); + if (editor){ + editor->activate(); + } + editor = mEditorList->getEditorByFilename(sourceFilename); } - pSettings->ui().setNewClassDialogWidth(dialog.width()); - pSettings->ui().setNewClassDialogHeight(dialog.height()); + pSettings->ui().setNewHeaderDialogWidth(dialog.width()); + pSettings->ui().setNewHeaderDialogHeight(dialog.height()); } diff --git a/RedPandaIDE/mainwindow.h b/RedPandaIDE/mainwindow.h index c938f3ba..757ef611 100644 --- a/RedPandaIDE/mainwindow.h +++ b/RedPandaIDE/mainwindow.h @@ -561,6 +561,8 @@ private slots: void on_actionNew_Class_triggered(); + void on_actionNew_Header_triggered(); + private: Ui::MainWindow *ui; EditorList *mEditorList; diff --git a/RedPandaIDE/mainwindow.ui b/RedPandaIDE/mainwindow.ui index 9c794c4d..96501241 100644 --- a/RedPandaIDE/mainwindow.ui +++ b/RedPandaIDE/mainwindow.ui @@ -543,7 +543,6 @@ - 50 false @@ -1389,7 +1388,7 @@ 0 0 1114 - 26 + 25 @@ -1487,8 +1486,6 @@ - - @@ -1510,6 +1507,8 @@ Project + + @@ -2702,6 +2701,14 @@ New Class... + + + New Header... + + + New Header... + + diff --git a/RedPandaIDE/project.cpp b/RedPandaIDE/project.cpp index 214e72de..4f2ae91a 100644 --- a/RedPandaIDE/project.cpp +++ b/RedPandaIDE/project.cpp @@ -164,7 +164,7 @@ void Project::open() newUnit->setFolder(fromByteArray(ini.GetValue(groupName,"Folder",""))); newUnit->setCompile(ini.GetBoolValue(groupName,"Compile", true)); newUnit->setCompileCpp( - ini.GetBoolValue(groupName,"CompileCpp",mOptions.useGPP)); + ini.GetBoolValue(groupName,"CompileCpp",mOptions.isCpp)); newUnit->setLink(ini.GetBoolValue(groupName,"Link", true)); newUnit->setPriority(ini.GetLongValue(groupName,"Priority", 1000)); @@ -268,7 +268,7 @@ PProjectUnit Project::newUnit(PFolderNode parentNode, const QString& customFileN newUnit->node()->unitIndex = count; //parentNode.Expand(True); newUnit->setCompile(true); - newUnit->setCompileCpp(mOptions.useGPP); + newUnit->setCompileCpp(mOptions.isCpp); newUnit->setLink(true); newUnit->setPriority(1000); newUnit->setOverrideBuildCmd(false); @@ -348,6 +348,7 @@ bool Project::removeUnit(int index, bool doClose , bool removeFile) // qDebug()<<(qint64)unit->editor(); // Attempt to close it if (doClose && (unit->editor())) { + unit->editor()->setInProject(false); if (!pMainWindow->editorList()->closeEditor(unit->editor())) return false; } @@ -658,7 +659,7 @@ bool Project::assignTemplate(const std::shared_ptr aTemplate, b } mOptions = aTemplate->options(); mOptions.compilerSet = pSettings->compilerSets().defaultIndex(); - mOptions.useGPP = useCpp; + mOptions.isCpp = useCpp; updateCompilerSetType(); mOptions.icon = aTemplate->icon(); @@ -690,7 +691,7 @@ bool Project::assignTemplate(const std::shared_ptr aTemplate, b } else { QString s; PProjectUnit unit; - if (mOptions.useGPP) { + if (mOptions.isCpp) { s = templateUnit->CppText; unit = newUnit(mNode, templateUnit->CppName); } else { @@ -743,7 +744,7 @@ void Project::saveOptions() ini.SetValue("Project","Compiler", toByteArray(mOptions.compilerCmd)); ini.SetValue("Project","CppCompiler", toByteArray(mOptions.cppCompilerCmd)); ini.SetValue("Project","Linker", toByteArray(mOptions.linkerCmd)); - ini.SetLongValue("Project","IsCpp", mOptions.useGPP); + ini.SetLongValue("Project","IsCpp", mOptions.isCpp); ini.SetValue("Project","Icon", toByteArray(extractRelativePath(directory(), mOptions.icon))); ini.SetValue("Project","ExeOutput", toByteArray(mOptions.exeOutput)); ini.SetValue("Project","ObjectOutput", toByteArray(mOptions.objectOutput)); @@ -848,7 +849,7 @@ PProjectUnit Project::addUnit(const QString &inFileName, PFolderNode parentNode, switch(getFileType(inFileName)) { case FileType::CSource: newUnit->setCompile(true); - newUnit->setCompileCpp(mOptions.useGPP); + newUnit->setCompileCpp(mOptions.isCpp); newUnit->setLink(true); break; case FileType::CppSource: @@ -858,7 +859,7 @@ PProjectUnit Project::addUnit(const QString &inFileName, PFolderNode parentNode, break; case FileType::WindowsResourceSource: newUnit->setCompile(true); - newUnit->setCompileCpp(mOptions.useGPP); + newUnit->setCompileCpp(mOptions.isCpp); newUnit->setLink(false); break; default: @@ -1212,6 +1213,7 @@ void Project::closeUnit(int index) PProjectUnit unit = mUnits[index]; if (unit->editor()) { saveUnitLayout(unit->editor(),index); + unit->editor()->setInProject(false); pMainWindow->editorList()->forceCloseEditor(unit->editor()); unit->setEditor(nullptr); } @@ -1381,7 +1383,7 @@ void Project::loadOptions(SimpleIni& ini) mOptions.privateResource = fromByteArray(ini.GetValue("Project", "PrivateResource", "")); mOptions.resourceIncludes = fromByteArray(ini.GetValue("Project", "ResourceIncludes", "")).split(";",QString::SkipEmptyParts); mOptions.makeIncludes = fromByteArray(ini.GetValue("Project", "MakeIncludes", "")).split(";",QString::SkipEmptyParts); - mOptions.useGPP = ini.GetBoolValue("Project", "IsCpp", false); + mOptions.isCpp = ini.GetBoolValue("Project", "IsCpp", false); mOptions.exeOutput = fromByteArray(ini.GetValue("Project", "ExeOutput", "")); mOptions.objectOutput = fromByteArray(ini.GetValue("Project", "ObjectOutput", "")); mOptions.logOutput = fromByteArray(ini.GetValue("Project", "LogOutput", "")); @@ -1470,7 +1472,7 @@ void Project::loadOptions(SimpleIni& ini) mOptions.objFiles = fromByteArray(ini.GetValue("Project", "ObjFiles", "")).split(";",QString::SkipEmptyParts); mOptions.includes = fromByteArray(ini.GetValue("Project", "IncludeDirs", "")).split(";",QString::SkipEmptyParts); mOptions.compilerCmd = fromByteArray(ini.GetValue("Project", "CompilerOptions", "")); - mOptions.useGPP = ini.GetBoolValue("Project", "Use_GPP", false); + mOptions.isCpp = ini.GetBoolValue("Project", "Use_GPP", false); mOptions.exeOutput = fromByteArray(ini.GetValue("Project", "ExeOutput", "")); mOptions.objectOutput = fromByteArray(ini.GetValue("Project", "ObjectOutput", "")); mOptions.overrideOutput = ini.GetBoolValue("Project", "OverrideOutput", false); diff --git a/RedPandaIDE/projectoptions.cpp b/RedPandaIDE/projectoptions.cpp index 0c324a1c..91736104 100644 --- a/RedPandaIDE/projectoptions.cpp +++ b/RedPandaIDE/projectoptions.cpp @@ -41,7 +41,7 @@ ProjectOptions::ProjectOptions() { type = ProjectType::GUI; version = 2; - useGPP = false; + isCpp = false; logOutputEnabled = false; useCustomMakefile = false; usePrecompiledHeader = false; diff --git a/RedPandaIDE/projectoptions.h b/RedPandaIDE/projectoptions.h index 523910e9..87331f5f 100644 --- a/RedPandaIDE/projectoptions.h +++ b/RedPandaIDE/projectoptions.h @@ -60,7 +60,7 @@ struct ProjectOptions{ QString privateResource; QStringList resourceIncludes; QStringList makeIncludes; - bool useGPP; + bool isCpp; QString icon; QString exeOutput; QString objectOutput; diff --git a/RedPandaIDE/projecttemplate.cpp b/RedPandaIDE/projecttemplate.cpp index 9b314c82..f17f763d 100644 --- a/RedPandaIDE/projecttemplate.cpp +++ b/RedPandaIDE/projecttemplate.cpp @@ -134,7 +134,7 @@ void ProjectTemplate::readTemplateFile(const QString &fileName) mOptions.compilerCmd = fromByteArray(mIni->GetValue("Project", "Compiler", "")); mOptions.cppCompilerCmd = fromByteArray(mIni->GetValue("Project", "CppCompiler", "")); mOptions.linkerCmd = fromByteArray(mIni->GetValue("Project", "Linker","")); - mOptions.useGPP = mIni->GetBoolValue("Project", "IsCpp", false); + mOptions.isCpp = mIni->GetBoolValue("Project", "IsCpp", false); mOptions.includeVersionInfo = mIni->GetBoolValue("Project", "IncludeVersionInfo", false); mOptions.supportXPThemes = mIni->GetBoolValue("Project", "SupportXPThemes", false); mOptions.exeOutput = fromByteArray(mIni->GetValue("Project", "ExeOutput", "")); diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp index 036501da..894b734f 100644 --- a/RedPandaIDE/settings.cpp +++ b/RedPandaIDE/settings.cpp @@ -4738,6 +4738,26 @@ void Settings::UI::setNewClassDialogHeight(int newNewClassDialogHeight) mNewClassDialogHeight = newNewClassDialogHeight; } +int Settings::UI::newHeaderDialogHeight() const +{ + return mNewHeaderDialogHeight; +} + +void Settings::UI::setNewHeaderDialogHeight(int newNewFileDialogHeight) +{ + mNewHeaderDialogHeight = newNewFileDialogHeight; +} + +int Settings::UI::newHeaderDialogWidth() const +{ + return mNewHeaderDialogWidth; +} + +void Settings::UI::setNewHeaderDialogWidth(int newNewFileDialogWidth) +{ + mNewHeaderDialogWidth = newNewFileDialogWidth; +} + int Settings::UI::settingsDialogHeight() const { return mSettingsDialogHeight; @@ -5002,6 +5022,8 @@ void Settings::UI::doSave() saveValue("new_project_dialog_height", mNewProjectDialogHeight); saveValue("new_class_dialog_width", mNewClassDialogWidth); saveValue("new_class_dialog_height", mNewClassDialogHeight); + saveValue("new_header_dialog_width", mNewHeaderDialogWidth); + saveValue("new_header_dialog_height", mNewHeaderDialogHeight); } void Settings::UI::doLoad() @@ -5049,4 +5071,6 @@ void Settings::UI::doLoad() mNewProjectDialogHeight = intValue("new_project_dialog_height", 600*qApp->desktop()->height()/1080); mNewClassDialogWidth = intValue("new_class_dialog_width", 642*qApp->desktop()->width()/1920); mNewClassDialogHeight = intValue("new_class_dialog_height", 300*qApp->desktop()->height()/1080); + mNewHeaderDialogWidth = intValue("new_header_dialog_width", 642*qApp->desktop()->width()/1920); + mNewHeaderDialogHeight = intValue("new_header_dialog_height", 300*qApp->desktop()->height()/1080); } diff --git a/RedPandaIDE/settings.h b/RedPandaIDE/settings.h index 0b49aacf..7e7f1361 100644 --- a/RedPandaIDE/settings.h +++ b/RedPandaIDE/settings.h @@ -988,6 +988,12 @@ public: int newClassDialogHeight() const; void setNewClassDialogHeight(int newNewClassDialogHeight); + int newHeaderDialogWidth() const; + void setNewHeaderDialogWidth(int newNewFileDialogWidth); + + int newHeaderDialogHeight() const; + void setNewHeaderDialogHeight(int newNewFileDialogHeight); + private: QByteArray mMainWindowState; QByteArray mMainWindowGeometry; @@ -1031,6 +1037,8 @@ public: int mNewProjectDialogHeight; int mNewClassDialogWidth; int mNewClassDialogHeight; + int mNewHeaderDialogWidth; + int mNewHeaderDialogHeight; protected: void doSave() override; diff --git a/RedPandaIDE/settingsdialog/projectgeneralwidget.cpp b/RedPandaIDE/settingsdialog/projectgeneralwidget.cpp index 8a1e7795..7ac1b5e2 100644 --- a/RedPandaIDE/settingsdialog/projectgeneralwidget.cpp +++ b/RedPandaIDE/settingsdialog/projectgeneralwidget.cpp @@ -81,7 +81,7 @@ void ProjectGeneralWidget::doLoad() ui->lstType->setCurrentRow( static_cast(project->options().type)); - ui->cbDefaultCpp->setChecked(project->options().useGPP); + ui->cbDefaultCpp->setChecked(project->options().isCpp); ui->cbSupportXPTheme->setChecked(project->options().supportXPThemes); mIconPath = project->options().icon; QPixmap icon(mIconPath); @@ -100,7 +100,7 @@ void ProjectGeneralWidget::doSave() int row = std::max(0,ui->lstType->currentRow()); project->options().type = static_cast(row); - project->options().useGPP = ui->cbDefaultCpp->isChecked(); + project->options().isCpp = ui->cbDefaultCpp->isChecked(); project->options().supportXPThemes = ui->cbSupportXPTheme->isChecked(); if (mIconPath.isEmpty() || !ui->lbIcon->pixmap() || ui->lbIcon->pixmap()->isNull()) { diff --git a/RedPandaIDE/widgets/newclassdialog.cpp b/RedPandaIDE/widgets/newclassdialog.cpp index a6c506e6..11d833ba 100644 --- a/RedPandaIDE/widgets/newclassdialog.cpp +++ b/RedPandaIDE/widgets/newclassdialog.cpp @@ -11,6 +11,7 @@ NewClassDialog::NewClassDialog(QWidget *parent) : ui->setupUi(this); resize(pSettings->ui().newClassDialogWidth(),pSettings->ui().newClassDialogHeight()); updateIcons(); + ui->txtClassName->setFocus(); } NewClassDialog::~NewClassDialog() diff --git a/RedPandaIDE/widgets/newheaderdialog.cpp b/RedPandaIDE/widgets/newheaderdialog.cpp index ce59eb0d..dcd52374 100644 --- a/RedPandaIDE/widgets/newheaderdialog.cpp +++ b/RedPandaIDE/widgets/newheaderdialog.cpp @@ -1,14 +1,68 @@ #include "newheaderdialog.h" #include "ui_newheaderdialog.h" +#include "../iconsmanager.h" +#include "../settings.h" + +#include NewHeaderDialog::NewHeaderDialog(QWidget *parent) : QDialog(parent), ui(new Ui::NewHeaderDialog) { ui->setupUi(this); + resize(pSettings->ui().newHeaderDialogWidth(),pSettings->ui().newHeaderDialogHeight()); + updateIcons(); + ui->txtHeader->setFocus(); } NewHeaderDialog::~NewHeaderDialog() { delete ui; } + +QString NewHeaderDialog::headerName() const +{ + return ui->txtHeader->text(); +} + +QString NewHeaderDialog::path() const +{ + return ui->txtPath->text(); +} + +void NewHeaderDialog::setPath(const QString &location) +{ + ui->txtPath->setText(location); +} + +void NewHeaderDialog::updateIcons() +{ + pIconsManager->setIcon(ui->btnBrowse, IconsManager::ACTION_FILE_OPEN_FOLDER); +} + +void NewHeaderDialog::closeEvent(QCloseEvent */*event*/) +{ + reject(); +} + +void NewHeaderDialog::on_btnCreate_clicked() +{ + accept(); +} + + +void NewHeaderDialog::on_btnCancel_clicked() +{ + reject(); +} + + +void NewHeaderDialog::on_btnBrowse_clicked() +{ + QString fileName = QFileDialog::getExistingDirectory( + this, + tr("Path"), + ui->txtPath->text()); + ui->txtPath->setText(fileName); +} + diff --git a/RedPandaIDE/widgets/newheaderdialog.h b/RedPandaIDE/widgets/newheaderdialog.h index f84151cf..5929856b 100644 --- a/RedPandaIDE/widgets/newheaderdialog.h +++ b/RedPandaIDE/widgets/newheaderdialog.h @@ -14,9 +14,23 @@ class NewHeaderDialog : public QDialog public: explicit NewHeaderDialog(QWidget *parent = nullptr); ~NewHeaderDialog(); + QString headerName() const; + QString path() const; + void setPath(const QString& location); private: Ui::NewHeaderDialog *ui; + +private: + void updateIcons(); + + // QWidget interface +protected: + void closeEvent(QCloseEvent *event) override; +private slots: + void on_btnCreate_clicked(); + void on_btnCancel_clicked(); + void on_btnBrowse_clicked(); }; #endif // NEWHEADERDIALOG_H diff --git a/RedPandaIDE/widgets/newheaderdialog.ui b/RedPandaIDE/widgets/newheaderdialog.ui index b6a87819..ee6a3566 100644 --- a/RedPandaIDE/widgets/newheaderdialog.ui +++ b/RedPandaIDE/widgets/newheaderdialog.ui @@ -11,68 +11,93 @@ - Dialog + New Header - - - - 30 - 40 - 69 - 20 - - - - Header: - - - - - - 150 - 40 - 113 - 27 - - - - - - - 40 - 90 - 69 - 20 - - - - Path: - - - - - - 150 - 80 - 113 - 27 - - - - - - - 350 - 80 - 28 - 27 - - - - ... - - + + + + + + + + Header: + + + + + + + Browse + + + Browse + + + + :/icons/images/newlook24/053-open.png:/icons/images/newlook24/053-open.png + + + + + + + Path: + + + + + + + + + + Qt::Horizontal + + + + 179 + 20 + + + + + + + + Create + + + + + + + Cancel + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + - + + + diff --git a/RedPandaIDE/widgets/newprojectdialog.cpp b/RedPandaIDE/widgets/newprojectdialog.cpp index c026733d..6e26881e 100644 --- a/RedPandaIDE/widgets/newprojectdialog.cpp +++ b/RedPandaIDE/widgets/newprojectdialog.cpp @@ -208,7 +208,7 @@ void NewProjectDialog::on_lstTemplates_currentItemChanged(QListWidgetItem *curre int index = current->data(Qt::UserRole).toInt(); PProjectTemplate t = mTemplates[index]; ui->lblDescription->setText(t->description()); - if (t->options().useGPP) { + if (t->options().isCpp) { ui->rdCProject->setEnabled(false); ui->rdCppProject->setChecked(true); } else {