From 7cc5cf4f45b1317871b87910472329a2e145765f Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Sun, 20 Feb 2022 21:47:57 +0800 Subject: [PATCH] work save: git - merge --- RedPandaIDE/RedPandaIDE.pro | 3 + RedPandaIDE/RedPandaIDE_zh_CN.ts | 952 ++++++++++++++----------- RedPandaIDE/mainwindow.cpp | 44 +- RedPandaIDE/mainwindow.h | 2 + RedPandaIDE/mainwindow.ui | 7 + RedPandaIDE/vcs/gitbranchdialog.cpp | 13 +- RedPandaIDE/vcs/gitmergedialog.cpp | 59 +- RedPandaIDE/vcs/gitmergedialog.h | 12 + RedPandaIDE/vcs/gitmergedialog.ui | 4 +- RedPandaIDE/vcs/gitrepository.h | 6 + RedPandaIDE/widgets/infomessagebox.cpp | 25 + RedPandaIDE/widgets/infomessagebox.h | 26 + RedPandaIDE/widgets/infomessagebox.ui | 85 +++ 13 files changed, 793 insertions(+), 445 deletions(-) create mode 100644 RedPandaIDE/widgets/infomessagebox.cpp create mode 100644 RedPandaIDE/widgets/infomessagebox.h create mode 100644 RedPandaIDE/widgets/infomessagebox.ui diff --git a/RedPandaIDE/RedPandaIDE.pro b/RedPandaIDE/RedPandaIDE.pro index 4d20b552..fdd59aea 100644 --- a/RedPandaIDE/RedPandaIDE.pro +++ b/RedPandaIDE/RedPandaIDE.pro @@ -149,6 +149,7 @@ SOURCES += \ widgets/filepropertiesdialog.cpp \ widgets/functiontooltipwidget.cpp \ widgets/headercompletionpopup.cpp \ + widgets/infomessagebox.cpp \ widgets/issuestable.cpp \ widgets/labelwithmenu.cpp \ widgets/lightfusionstyle.cpp \ @@ -284,6 +285,7 @@ HEADERS += \ widgets/filepropertiesdialog.h \ widgets/functiontooltipwidget.h \ widgets/headercompletionpopup.h \ + widgets/infomessagebox.h \ widgets/issuestable.h \ widgets/labelwithmenu.h \ widgets/lightfusionstyle.h \ @@ -341,6 +343,7 @@ FORMS += \ settingsdialog/settingsdialog.ui \ widgets/custommakefileinfodialog.ui \ widgets/filepropertiesdialog.ui \ + widgets/infomessagebox.ui \ widgets/newclassdialog.ui \ widgets/newheaderdialog.ui \ widgets/newprojectdialog.ui \ diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.ts b/RedPandaIDE/RedPandaIDE_zh_CN.ts index 50267c4f..29a7afb1 100644 --- a/RedPandaIDE/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/RedPandaIDE_zh_CN.ts @@ -3210,6 +3210,77 @@ Are you really want to continue? 文件夹"%1"中已存在仓库！ + + GitMergeDialog + + + Merge + 合并 + + + + From + 从 + + + + Branch + 分支 + + + + Option + 选项 + + + + No Commit + 不提交(--no-commit) + + + + Squash + 粉碎(--squash) + + + + No Fast Forward + 不快速前进(--no-fast-forward) + + + + Fast Forward Only + 只快速前进(--fast-forward-only) + + + + Merge Message + 合并信息 + + + + Ok + 确定 + + + + Cancel + 取消 + + + + InfoMessageBox + + + Message + + + + + Ok + 确定 + + InitChooseLanguageWidget @@ -3379,18 +3450,18 @@ Are you really want to continue? MainWindow - + Red Panda C++ 小熊猫C++ - - - - - - + + + + + + Issues 编译器 @@ -3409,8 +3480,8 @@ Are you really want to continue? 工具 - - + + Run 运行 @@ -3422,25 +3493,25 @@ Are you really want to continue? - + Project 项目 - + Watch 监视 - + Structure 结构 - + Files 文件 @@ -3450,10 +3521,10 @@ Are you really want to continue? - - - - + + + + Debug 调试 @@ -3464,7 +3535,7 @@ Are you really want to continue? - + Debug Console 调试主控台 @@ -3486,7 +3557,7 @@ Are you really want to continue? - + Search 查找 @@ -3511,7 +3582,7 @@ Are you really want to continue? 替换 - + Close 关闭 @@ -3522,7 +3593,7 @@ Are you really want to continue? - + Code 代码 @@ -3540,72 +3611,72 @@ 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 编译 - + Tools Output 工具输出 @@ -3620,200 +3691,200 @@ Are you really want to continue? Git - + 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 新建试题集 @@ -3832,14 +3903,14 @@ Are you really want to continue? - + Save Problem Set 保存试题集 - + Load Problem Set 载入试题集 @@ -3861,21 +3932,21 @@ Are you really want to continue? - + TODO TODO - + Bookmark 书签 - - + + Problem 试题 @@ -3950,482 +4021,487 @@ Are you really want to continue? 工具窗口 - + 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参考手册 - + Show Tool Panels 显示全部工具面板 - + Create Git Repository Create Repository 创建Git仓库 - + Commit 提交(Commit) - + Revert 撤销(Revert) - + Reset 回滚(Reset) - + Add Files 添加文件 - + Restore 还原(Restore) - + Website 官方网站 - + Branch/Switch - 分支切换（Switch） + 分支切换（Switch） + + + + Merge + 合并（Merge） 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 新建头文件... @@ -4435,47 +4511,47 @@ Are you really want to continue? 插入行 - + 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 删除到行首 @@ -4484,78 +4560,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 正在编译 @@ -4564,194 +4640,194 @@ 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 @@ -4772,68 +4848,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: 描述： @@ -4842,322 +4918,322 @@ 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 删除文件夹 - + Switch to normal view 切换为普通视图 - + Switch to custom view 切换为自定义视图 - + Sort By Type 按类型排序 - + Sort alphabetically 按名称排序 - + Show inherited members 显示继承的成员 - + Goto declaration 跳转到声明处 - + Goto definition 跳转到定义处 - - - + + + New Folder 新建文件夹 - - - - + + + + Delete 删除 - + 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) - + 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? 你真的想要做那些吗？ - + 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? 你真的要删除它吗？ - - + + Header Exists 头文件已存在 - - + + Header file "%1" already exists! 头文件"%1"已存在！ - + Source Exists 源文件已存在！ - + Source file "%1" already exists! 源文件"%1"已存在！ - + Commit Message 提交信息 - + Commit Failed 提交失败 - + Commit message shouldn't be empty! 提交信息不能为空！ @@ -5166,233 +5242,233 @@ Are you really want to continue? 小熊猫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 载入主题失败 - - + + 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个文件） @@ -7067,6 +7143,12 @@ Are you really want to continue? Can't parse problem set file '%1':%2 无法解析试题集文件"%1":%2 + + + + <Auto Generated by Git> + <由Git自动生成> + RegisterModel @@ -7521,7 +7603,7 @@ Are you really want to continue? 自动链接 - + @@ -7597,15 +7679,15 @@ Are you really want to continue? 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 5e2d8193..5e706303 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -42,6 +42,7 @@ #include "vcs/gitmanager.h" #include "vcs/gitrepository.h" #include "vcs/gitbranchdialog.h" +#include "vcs/gitmergedialog.h" #include #include @@ -3077,10 +3078,14 @@ void MainWindow::onProjectViewContextMenu(const QPoint &pos) vcsMenu.addAction(ui->actionGit_Add_Files); } vcsMenu.addAction(ui->actionGit_Branch); + vcsMenu.addAction(ui->actionGit_Merge); vcsMenu.addAction(ui->actionGit_Commit); vcsMenu.addAction(ui->actionGit_Restore); - ui->actionGit_Commit->setEnabled(true); + bool canBranch = !mProject->model()->iconProvider()->VCSRepository()->hasChangedFiles() + && !mProject->model()->iconProvider()->VCSRepository()->hasChangedFiles(); + ui->actionGit_Merge->setEnabled(canBranch); + ui->actionGit_Commit->setEnabled(canBranch); ui->actionGit_Branch->setEnabled(true); ui->actionGit_Restore->setEnabled(true); @@ -3188,11 +3193,15 @@ void MainWindow::onFilesViewContextMenu(const QPoint &pos) vcsMenu.addAction(ui->actionGit_Add_Files); } vcsMenu.addAction(ui->actionGit_Branch); + vcsMenu.addAction(ui->actionGit_Merge); vcsMenu.addAction(ui->actionGit_Commit); vcsMenu.addAction(ui->actionGit_Restore); + bool canBranch = !mFileSystemModelIconProvider.VCSRepository()->hasChangedFiles() + && !mFileSystemModelIconProvider.VCSRepository()->hasChangedFiles(); + ui->actionGit_Branch->setEnabled(canBranch); + ui->actionGit_Merge->setEnabled(canBranch); ui->actionGit_Commit->setEnabled(true); - ui->actionGit_Branch->setEnabled(true); ui->actionGit_Restore->setEnabled(true); // vcsMenu.addAction(ui->actionGit_Reset); @@ -5675,20 +5684,26 @@ void MainWindow::updateVCSActions() { bool hasRepository = false; bool shouldEnable = false; + bool canBranch = false; if (ui->projectView->isVisible() && mProject) { GitManager vcsManager; QString branch; hasRepository = vcsManager.hasRepository(mProject->folder(),branch); shouldEnable = true; + canBranch = !mProject->model()->iconProvider()->VCSRepository()->hasChangedFiles() + && !mProject->model()->iconProvider()->VCSRepository()->hasChangedFiles(); } else if (ui->treeFiles->isVisible()) { GitManager vcsManager; QString branch; hasRepository = vcsManager.hasRepository(pSettings->environment().currentFolder(),branch); shouldEnable = true; + canBranch =!mFileSystemModelIconProvider.VCSRepository()->hasChangedFiles() + && !mFileSystemModelIconProvider.VCSRepository()->hasChangedFiles(); } ui->actionGit_Create_Repository->setEnabled(!hasRepository && shouldEnable); ui->actionGit_Commit->setEnabled(hasRepository && shouldEnable); - ui->actionGit_Branch->setEnabled(hasRepository && shouldEnable); + ui->actionGit_Branch->setEnabled(hasRepository && shouldEnable && canBranch); + ui->actionGit_Merge->setEnabled(hasRepository && shouldEnable && canBranch); ui->actionGit_Reset->setEnabled(hasRepository && shouldEnable); ui->actionGit_Restore->setEnabled(hasRepository && shouldEnable); ui->actionGit_Revert->setEnabled(hasRepository && shouldEnable); @@ -6793,3 +6808,26 @@ void MainWindow::on_actionGit_Branch_triggered() } } + +void MainWindow::on_actionGit_Merge_triggered() +{ + QString folder; + if (ui->treeFiles->isVisible()) { + folder = pSettings->environment().currentFolder(); + } else if (ui->projectView->isVisible() && mProject) { + folder = mProject->folder(); + } + if (folder.isEmpty()) + return; + GitMergeDialog dialog(folder); + if (dialog.exec()==QDialog::Accepted) { + //update project view + if (mProject) { + mProject->model()->beginUpdate(); + mProject->model()->endUpdate(); + } + //update files view + setFilesViewRoot(pSettings->environment().currentFolder()); + } +} + diff --git a/RedPandaIDE/mainwindow.h b/RedPandaIDE/mainwindow.h index d7ef7c01..8bc75c4c 100644 --- a/RedPandaIDE/mainwindow.h +++ b/RedPandaIDE/mainwindow.h @@ -590,6 +590,8 @@ private slots: void on_actionGit_Branch_triggered(); + void on_actionGit_Merge_triggered(); + private: Ui::MainWindow *ui; EditorList *mEditorList; diff --git a/RedPandaIDE/mainwindow.ui b/RedPandaIDE/mainwindow.ui index 24a54103..f4e8bde4 100644 --- a/RedPandaIDE/mainwindow.ui +++ b/RedPandaIDE/mainwindow.ui @@ -1604,6 +1604,8 @@ + + @@ -2795,6 +2797,11 @@ Branch/Switch + + + Merge + + diff --git a/RedPandaIDE/vcs/gitbranchdialog.cpp b/RedPandaIDE/vcs/gitbranchdialog.cpp index 16c5f7c5..6bf4cb38 100644 --- a/RedPandaIDE/vcs/gitbranchdialog.cpp +++ b/RedPandaIDE/vcs/gitbranchdialog.cpp @@ -1,6 +1,7 @@ #include "gitbranchdialog.h" #include "ui_gitbranchdialog.h" #include "gitmanager.h" +#include "../widgets/infomessagebox.h" GitBranchDialog::GitBranchDialog(const QString& folder, QWidget *parent) : QDialog(parent), @@ -47,6 +48,7 @@ void GitBranchDialog::on_btnOk_clicked() else text = ui->lstBranches->currentText(); bool result = false; + QString output; if (!text.isEmpty()) { result = mManager->switchToBranch( mFolder, @@ -56,12 +58,17 @@ void GitBranchDialog::on_btnOk_clicked() ui->chkMerge->isChecked(), ui->rbForceTrack->isChecked(), ui->rbForceNoTrack->isChecked(), - ui->chkForceCreation->isChecked()); + ui->chkForceCreation->isChecked(), + output); } - if (result) + if (result) { accept(); - else + } else if (!output.isEmpty()) { + InfoMessageBox box; + box.setMessage(output); + box.exec(); reject(); + } } diff --git a/RedPandaIDE/vcs/gitmergedialog.cpp b/RedPandaIDE/vcs/gitmergedialog.cpp index 507a3b10..4bf499dc 100644 --- a/RedPandaIDE/vcs/gitmergedialog.cpp +++ b/RedPandaIDE/vcs/gitmergedialog.cpp @@ -1,14 +1,31 @@ #include "gitmergedialog.h" #include "ui_gitmergedialog.h" #include "gitmanager.h" +#include "../widgets/infomessagebox.h" GitMergeDialog::GitMergeDialog(const QString& folder, QWidget *parent) : QDialog(parent), - ui(new Ui::GitMergeDialog), - mFolder(folder) + ui(new Ui::GitMergeDialog) { ui->setupUi(this); mManager = new GitManager(); + mCurrentBranchIndex=-1; + QStringList branches =mManager->listBranches(mFolder,mCurrentBranchIndex); + ui->cbBranch->addItems(branches); + ui->cbBranch->setCurrentIndex(mCurrentBranchIndex); + ui->btnOk->setEnabled(false); + ui->rbBranch->setChecked(true); + ui->txtMergeMessage->setPlainText(QObject::tr("")); + mFolder = mManager->rootFolder(folder); + if (branches.isEmpty()) { + QString currentBranch; + if (mManager->hasRepository(folder,currentBranch)) { + ui->cbBranch->addItem(currentBranch); + ui->btnOk->setEnabled(false); + } + ui->grpOptions->setEnabled(false); + ui->txtMergeMessage->setEnabled(false); + } } GitMergeDialog::~GitMergeDialog() @@ -16,3 +33,41 @@ GitMergeDialog::~GitMergeDialog() delete mManager; delete ui; } + +void GitMergeDialog::on_btnCancel_clicked() +{ + reject(); +} + +void GitMergeDialog::closeEvent(QCloseEvent */* event */) +{ + reject(); +} + + +void GitMergeDialog::on_btnOk_clicked() +{ + QString output; + if (mManager->merge(mFolder,ui->cbBranch->currentText(), + ui->chkSquash->isChecked(), + ui->chkFastForwardOnly->isChecked(), + ui->chkNoFastFoward->isChecked(), + ui->chkNoCommit->isChecked(), + output, + ui->txtMergeMessage->toPlainText() + )) { + accept(); + } else { + InfoMessageBox box; + box.setMessage(output); + box.exec(); + reject(); + } +} + + +void GitMergeDialog::on_cbBranch_currentIndexChanged(int index) +{ + ui->btnOk->setEnabled(mCurrentBranchIndex!=index); +} + diff --git a/RedPandaIDE/vcs/gitmergedialog.h b/RedPandaIDE/vcs/gitmergedialog.h index 27a8a363..ac02936e 100644 --- a/RedPandaIDE/vcs/gitmergedialog.h +++ b/RedPandaIDE/vcs/gitmergedialog.h @@ -16,10 +16,22 @@ public: explicit GitMergeDialog(const QString& folder, QWidget *parent = nullptr); ~GitMergeDialog(); +private slots: + void on_btnCancel_clicked(); + + void on_btnOk_clicked(); + + void on_cbBranch_currentIndexChanged(int index); + private: Ui::GitMergeDialog *ui; GitManager *mManager; QString mFolder; + int mCurrentBranchIndex; + + // QWidget interface +protected: + void closeEvent(QCloseEvent *event) override; }; #endif // GITMERGEDIALOG_H diff --git a/RedPandaIDE/vcs/gitmergedialog.ui b/RedPandaIDE/vcs/gitmergedialog.ui index a4312308..d9921aab 100644 --- a/RedPandaIDE/vcs/gitmergedialog.ui +++ b/RedPandaIDE/vcs/gitmergedialog.ui @@ -11,7 +11,7 @@ - Dialog + Merge @@ -133,7 +133,7 @@ - PushButton + Cancel diff --git a/RedPandaIDE/vcs/gitrepository.h b/RedPandaIDE/vcs/gitrepository.h index 16bb236f..9f894739 100644 --- a/RedPandaIDE/vcs/gitrepository.h +++ b/RedPandaIDE/vcs/gitrepository.h @@ -32,12 +32,18 @@ public: bool isFileStaged(const QString& filePath) { return mStagedFiles.contains(filePath); } + bool hasStagedFiles() { + return !mStagedFiles.isEmpty(); + } bool isFileChanged(const QFileInfo& fileInfo) { return isFileChanged(fileInfo.absoluteFilePath()); } bool isFileChanged(const QString& filePath) { return mChangedFiles.contains(filePath); } + bool hasChangedFiles() { + return !mChangedFiles.isEmpty(); + } void add(const QString& path); void remove(const QString& path); diff --git a/RedPandaIDE/widgets/infomessagebox.cpp b/RedPandaIDE/widgets/infomessagebox.cpp new file mode 100644 index 00000000..983b0701 --- /dev/null +++ b/RedPandaIDE/widgets/infomessagebox.cpp @@ -0,0 +1,25 @@ +#include "infomessagebox.h" +#include "ui_infomessagebox.h" + +InfoMessageBox::InfoMessageBox(QWidget *parent) : + QDialog(parent), + ui(new Ui::InfoMessageBox) +{ + ui->setupUi(this); +} + +void InfoMessageBox::setMessage(const QString message) +{ + ui->txtMessage->setText(message); +} + +InfoMessageBox::~InfoMessageBox() +{ + delete ui; +} + +void InfoMessageBox::on_btnOk_clicked() +{ + accept(); +} + diff --git a/RedPandaIDE/widgets/infomessagebox.h b/RedPandaIDE/widgets/infomessagebox.h new file mode 100644 index 00000000..252c9044 --- /dev/null +++ b/RedPandaIDE/widgets/infomessagebox.h @@ -0,0 +1,26 @@ +#ifndef INFOMESSAGEBOX_H +#define INFOMESSAGEBOX_H + +#include + +namespace Ui { +class InfoMessageBox; +} + +class InfoMessageBox : public QDialog +{ + Q_OBJECT + +public: + explicit InfoMessageBox(QWidget *parent = nullptr); + void setMessage(const QString message); + ~InfoMessageBox(); + +private slots: + void on_btnOk_clicked(); + +private: + Ui::InfoMessageBox *ui; +}; + +#endif // INFOMESSAGEBOX_H diff --git a/RedPandaIDE/widgets/infomessagebox.ui b/RedPandaIDE/widgets/infomessagebox.ui new file mode 100644 index 00000000..3a4d65fb --- /dev/null +++ b/RedPandaIDE/widgets/infomessagebox.ui @@ -0,0 +1,85 @@ + + + InfoMessageBox + + + + 0 + 0 + 617 + 459 + + + + Message + + + + + + true + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Ok + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + +