diff --git a/RedPandaIDE/RedPandaIDE.pro b/RedPandaIDE/RedPandaIDE.pro index 2f10f371..54bde0ca 100644 --- a/RedPandaIDE/RedPandaIDE.pro +++ b/RedPandaIDE/RedPandaIDE.pro @@ -101,6 +101,7 @@ SOURCES += \ vcs/gitremotedialog.cpp \ vcs/gitrepository.cpp \ vcs/gitresetdialog.cpp \ + vcs/gituserconfigdialog.cpp \ vcs/gitutils.cpp \ widgets/aboutdialog.cpp \ widgets/bookmarkmodel.cpp \ @@ -243,6 +244,7 @@ HEADERS += \ vcs/gitremotedialog.h \ vcs/gitrepository.h \ vcs/gitresetdialog.h \ + vcs/gituserconfigdialog.h \ vcs/gitutils.h \ widgets/aboutdialog.h \ widgets/bookmarkmodel.h \ @@ -347,6 +349,7 @@ FORMS += \ vcs/gitpushdialog.ui \ vcs/gitremotedialog.ui \ vcs/gitresetdialog.ui \ + vcs/gituserconfigdialog.ui \ widgets/aboutdialog.ui \ widgets/choosethemedialog.ui \ widgets/cpudialog.ui \ diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.ts b/RedPandaIDE/RedPandaIDE_zh_CN.ts index 727263a3..3c675f8b 100644 --- a/RedPandaIDE/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/RedPandaIDE_zh_CN.ts @@ -3231,7 +3231,7 @@ Are you really want to continue? Dialog - 对话框 + 对话框 @@ -3378,7 +3378,7 @@ Are you really want to continue? Dialog - 对话框 + 对话框 @@ -3386,7 +3386,7 @@ Are you really want to continue? Dialog - 对话框 + 对话框 @@ -3404,9 +3404,9 @@ Are you really want to continue? - - - + + + Add 添加 @@ -3441,7 +3441,12 @@ Are you really want to continue? 关闭 - + + Ok + 确定 + + + Update 更新 @@ -3520,6 +3525,39 @@ Are you really want to continue? 取消 + + GitUserConfigDialog + + + Fill User Info + 填写用户信息 + + + + User Email: + 用户邮箱 + + + + Ok + 确定 + + + + Cancel + 取消 + + + + User Name: + 用户姓名 + + + + Git needs the following info to commit： + Git需要下列信息进行提交： + + InfoMessageBox @@ -3702,18 +3740,18 @@ Are you really want to continue? MainWindow - + Red Panda C++ 小熊猫C++ - - - - - - + + + + + + Issues 编译器 @@ -3732,8 +3770,8 @@ Are you really want to continue? 工具 - + Run 运行 @@ -3745,25 +3783,25 @@ Are you really want to continue? - + Project 项目 - + Watch 监视 - + Structure 结构 - + Files 文件 @@ -3773,10 +3811,10 @@ Are you really want to continue? - - + - + + Debug 调试 @@ -3787,7 +3825,7 @@ Are you really want to continue? - + Debug Console 调试主控台 @@ -3809,7 +3847,7 @@ Are you really want to continue? - + Search 查找 @@ -3834,7 +3872,7 @@ Are you really want to continue? 替换 - + Close 关闭 @@ -3845,7 +3883,7 @@ Are you really want to continue? - + Code 代码 @@ -3863,72 +3901,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 工具输出 @@ -3943,200 +3981,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 新建试题集 @@ -4155,14 +4193,14 @@ Are you really want to continue? - + Save Problem Set 保存试题集 - + Load Problem Set 载入试题集 @@ -4184,21 +4222,21 @@ Are you really want to continue? - + TODO TODO - + Bookmark 书签 - - + + Problem 试题 @@ -4273,499 +4311,514 @@ 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） - + Merge 合并（Merge） - + Show Log Log 显示日志(Log) - + Remotes... 远程仓库... + + + Fetch + 取回(Fetch) + + + + Pull + 拉取(Pull) + + + + Push + 推送(Push) + 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 新建头文件... @@ -4775,47 +4828,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 删除到行首 @@ -4824,27 +4877,27 @@ Are you really want to continue? C/C++参考 - + EGE Manual EGE图形库手册 - + Add Bookmark 添加书签 - + Remove Bookmark 删除书签 - + Modify Bookmark Description 修改书签说明 - + Locate in Files View 在文件视图中定位 @@ -4853,47 +4906,47 @@ Are you really want to continue? 打开文件夹 - + Running Parameters... 运行参数... - + File Encoding 文件编码 - + Recent Files 文件历史 - - + - + + Debugging 正在调试 - - + - + + Running 正在运行 - - + - + + Compiling 正在编译 @@ -4902,194 +4955,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 @@ -5110,68 +5163,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: 描述： @@ -5180,344 +5233,354 @@ 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? 你真的要删除它吗？ - - - - Choose Working Folder - 选择工作文件夹 + + Can't Commit + 无法提交 - - + + Git needs user info to commit. + Git需要用信息进行提交。 + + + + + + Choose Working Folder + 选择工作文件夹 + + + + Header Exists 头文件已存在 - - + + Header file "%1" already exists! 头文件"%1"已存在！ - + Source Exists 源文件已存在！ - + Source file "%1" already exists! 源文件"%1"已存在！ - + Can't commit! 无法提交！ - + The following files are in conflicting: 下列文件处于冲突状态，请解决后重新添加和提交： - + Commit Message 提交信息 - + Commit Message: 提交信息： - + Commit Failed 提交失败 - + Commit message shouldn't be empty! 提交信息不能为空！ @@ -5526,239 +5589,239 @@ 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 载入主题失败 - - + + Clear History 清除历史 - - + + 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个文件） @@ -6729,7 +6792,7 @@ Are you really want to continue? QApplication - + Error 错误 @@ -6783,23 +6846,23 @@ Are you really want to continue? - - + + Error 错误 - + Can't create configuration folder %1 无法创建配置文件夹"%1" - + Can't write to configuration file %1 无法写入配置文件夹"%1" - + Can't load autolink settings 无法载入自动链接设置 @@ -7434,7 +7497,7 @@ Are you really want to continue? 无法解析试题集文件"%1":%2 - + <Auto Generated by Git> <由Git自动生成> @@ -7893,7 +7956,7 @@ Are you really want to continue? 自动链接 - + @@ -7969,15 +8032,15 @@ Are you really want to continue? 杂项 - - + + Program Runner 程序运行 - + Problem Set 试题集 diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 07ddef7d..4b09bad5 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -45,6 +45,7 @@ #include "vcs/gitmergedialog.h" #include "vcs/gitlogdialog.h" #include "vcs/gitremotedialog.h" +#include "vcs/gituserconfigdialog.h" #include "widgets/infomessagebox.h" #include @@ -768,7 +769,8 @@ void MainWindow::onFileSaved(const QString &path, bool inProject) if (!inProject) { if ( (isCFile(path) || isHFile(path)) && !mFileSystemModelIconProvider.VCSRepository()->isFileInRepository(path)) { - mFileSystemModelIconProvider.VCSRepository()->add(extractRelativePath(mFileSystemModelIconProvider.VCSRepository()->folder(),path)); + QString output; + mFileSystemModelIconProvider.VCSRepository()->add(extractRelativePath(mFileSystemModelIconProvider.VCSRepository()->folder(),path),output); } } // qDebug()<<"update icon provider"; @@ -5458,8 +5460,10 @@ void MainWindow::on_actionAdd_to_project_triggered() mProject->cppParser()->addFileToScan(filename); QString branch; if (pSettings->vcs().gitOk() && mProject->model()->iconProvider()->VCSRepository()->hasRepository(branch)) { + QString output; mProject->model()->iconProvider()->VCSRepository()->add( - extractRelativePath(mProject->folder(),filename) + extractRelativePath(mProject->folder(),filename), + output ); } } @@ -5713,7 +5717,8 @@ void MainWindow::newProjectUnitFile() editor->activate(); QString branch; if (pSettings->vcs().gitOk() && mProject->model()->iconProvider()->VCSRepository()->hasRepository(branch)) { - mProject->model()->iconProvider()->VCSRepository()->add(newFileName); + QString output; + mProject->model()->iconProvider()->VCSRepository()->add(newFileName,output); mProject->model()->beginUpdate(); mProject->model()->endUpdate(); } @@ -6719,10 +6724,11 @@ void MainWindow::on_actionGit_Create_Repository_triggered() } else if (ui->projectView->isVisible() && mProject) { GitManager vcsManager; vcsManager.createRepository(mProject->folder()); - vcsManager.add(mProject->folder(), extractFileName(mProject->filename())); - vcsManager.add(mProject->folder(), extractFileName(mProject->options().icon)); + QString output; + vcsManager.add(mProject->folder(), extractFileName(mProject->filename()), output); + vcsManager.add(mProject->folder(), extractFileName(mProject->options().icon), output); foreach (PProjectUnit pUnit, mProject->units()) { - vcsManager.add(mProject->folder(),extractRelativePath(mProject->folder(),pUnit->fileName())); + vcsManager.add(mProject->folder(),extractRelativePath(mProject->folder(),pUnit->fileName()),output); } //update project view mProject->addUnit(includeTrailingPathDelimiter(mProject->folder())+".gitignore", mProject->rootNode(), true); @@ -6747,9 +6753,10 @@ void MainWindow::on_actionGit_Add_Files_triggered() if (ui->treeFiles->isVisible()) { GitManager vcsManager; QModelIndexList indices = ui->treeFiles->selectionModel()->selectedRows(); + QString output; foreach (const QModelIndex index,indices) { QFileInfo info = mFileSystemModel.fileInfo(index); - vcsManager.add(info.absolutePath(),info.fileName()); + vcsManager.add(info.absolutePath(),info.fileName(),output); } //update icons in files view mFileSystemModelIconProvider.update(); @@ -6766,7 +6773,8 @@ void MainWindow::on_actionGit_Add_Files_triggered() if (folderNode->unitIndex>=0) { PProjectUnit unit = mProject->units()[folderNode->unitIndex]; QFileInfo info(unit->fileName()); - vcsManager.add(info.absolutePath(),info.fileName()); + QString output; + vcsManager.add(info.absolutePath(),info.fileName(),output); } } } @@ -6811,16 +6819,32 @@ void MainWindow::on_actionGit_Commit_triggered() ); return; } - vcsManager.commit(folder,message,true); - - //update project view - if (mProject) { - mProject->model()->beginUpdate(); - mProject->model()->endUpdate(); + QString output; + QString userName = vcsManager.getUserName(folder); + QString userEmail = vcsManager.getUserEmail(folder); + if (userName.isEmpty() || userEmail.isEmpty()) { + GitUserConfigDialog dialog(folder); + if (dialog.exec()!=QDialog::Accepted) { + QMessageBox::critical(this, + tr("Can't Commit"), + tr("Git needs user info to commit.")); + return; + } + } + if (vcsManager.commit(folder,message,true,output)) { + //update project view + if (mProject) { + mProject->model()->beginUpdate(); + mProject->model()->endUpdate(); + } + //update files view + mFileSystemModelIconProvider.update(); + mFileSystemModel.setIconProvider(&mFileSystemModelIconProvider); + } + if (!output.isEmpty()) { + InfoMessageBox infoBox; + infoBox.showMessage(output); } - //update files view - mFileSystemModelIconProvider.update(); - mFileSystemModel.setIconProvider(&mFileSystemModelIconProvider); } @@ -6835,16 +6859,22 @@ void MainWindow::on_actionGit_Restore_triggered() if (folder.isEmpty()) return; GitManager vcsManager; - vcsManager.restore(folder,""); + QString output; + if (vcsManager.restore(folder,"",output)) { - //update project view - if (mProject) { - mProject->model()->beginUpdate(); - mProject->model()->endUpdate(); + //update project view + if (mProject) { + mProject->model()->beginUpdate(); + mProject->model()->endUpdate(); + } + //update files view + mFileSystemModelIconProvider.update(); + mFileSystemModel.setIconProvider(&mFileSystemModelIconProvider); + } + if (!output.isEmpty()) { + InfoMessageBox infoBox; + infoBox.showMessage(output); } - //update files view - mFileSystemModelIconProvider.update(); - mFileSystemModel.setIconProvider(&mFileSystemModelIconProvider); } diff --git a/RedPandaIDE/vcs/gitmanager.cpp b/RedPandaIDE/vcs/gitmanager.cpp index 9aac1143..b7792d5a 100644 --- a/RedPandaIDE/vcs/gitmanager.cpp +++ b/RedPandaIDE/vcs/gitmanager.cpp @@ -29,7 +29,8 @@ void GitManager::createRepository(const QString &folder) QDir dir(folder); stringsToFile(contents,dir.filePath(".gitignore")); - add(folder,".gitignore"); + QString output; + add(folder,".gitignore",output); } bool GitManager::hasRepository(const QString &folder, QString& currentBranch) @@ -93,32 +94,36 @@ bool GitManager::isFileChanged(const QFileInfo &fileInfo) return output.trimmed() == fileInfo.fileName(); } -void GitManager::add(const QString &folder, const QString &path) +bool GitManager::add(const QString &folder, const QString &path, QString& output) { QStringList args; args.append("add"); args.append(path); - runGit(folder,args); + output = runGit(folder,args); + return isSuccess(output); } -void GitManager::remove(const QString &folder, const QString &path) +bool GitManager::remove(const QString &folder, const QString &path, QString& output) { QStringList args; args.append("rm"); args.append(path); - runGit(folder,args); + output = runGit(folder,args); + return isSuccess(output); } -void GitManager::rename(const QString &folder, const QString &oldName, const QString &newName) +bool GitManager::rename(const QString &folder, const QString &oldName, + const QString &newName, QString& output) { QStringList args; args.append("mv"); args.append(oldName); args.append(newName); - runGit(folder,args); + output = runGit(folder,args); + return isSuccess(output); } -void GitManager::restore(const QString &folder, const QString &path) +bool GitManager::restore(const QString &folder, const QString &path, QString& output) { QStringList args; args.append("restore"); @@ -126,7 +131,8 @@ void GitManager::restore(const QString &folder, const QString &path) args.append("."); else args.append(path); - runGit(folder,args); + output = runGit(folder,args); + return isSuccess(output); } int GitManager::logCounts(const QString &folder, const QString &branch) @@ -236,7 +242,7 @@ bool GitManager::removeRemote(const QString &folder, const QString &remoteName, args.append(remoteName); output = runGit(folder,args); - return !output.startsWith("error") && !output.startsWith("fatal"); + return isSuccess(output); } bool GitManager::renameRemote(const QString &folder, const QString &oldName, const QString &newName, QString &output) @@ -248,7 +254,7 @@ bool GitManager::renameRemote(const QString &folder, const QString &oldName, con args.append(newName); output = runGit(folder,args); - return !output.startsWith("error") && !output.startsWith("fatal"); + return isSuccess(output); } bool GitManager::addRemote(const QString &folder, const QString &name, const QString &url, QString &output) @@ -260,7 +266,7 @@ bool GitManager::addRemote(const QString &folder, const QString &name, const QSt args.append(url); output = runGit(folder,args); - return !output.startsWith("error") && !output.startsWith("fatal"); + return isSuccess(output); } bool GitManager::setRemoteURL(const QString &folder, const QString &name, const QString &newURL, QString &output) @@ -272,7 +278,7 @@ bool GitManager::setRemoteURL(const QString &folder, const QString &name, const args.append(newURL); output = runGit(folder,args); - return !output.startsWith("error") && !output.startsWith("fatal"); + return isSuccess(output); } QString GitManager::getRemoteURL(const QString &folder, const QString &name) @@ -313,7 +319,7 @@ bool GitManager::setBranchUpstream( args.append(QString("--set-upstream-to=%1/%2").arg(remoteName,branch)); args.append(branch); output = runGit(folder,args).trimmed(); - return !output.startsWith("error") && !output.startsWith("fatal"); + return isSuccess(output); } bool GitManager::fetch(const QString &folder, QString &output) @@ -321,7 +327,7 @@ bool GitManager::fetch(const QString &folder, QString &output) QStringList args; args.append("fetch"); output = runGit(folder,args).trimmed(); - return !output.startsWith("error") && !output.startsWith("fatal"); + return isSuccess(output); } bool GitManager::pull(const QString &folder, QString &output) @@ -329,7 +335,7 @@ bool GitManager::pull(const QString &folder, QString &output) QStringList args; args.append("pull"); output = runGit(folder,args).trimmed(); - return !output.startsWith("error") && !output.startsWith("fatal"); + return isSuccess(output); } bool GitManager::push(const QString &folder, QString &output) @@ -337,7 +343,7 @@ bool GitManager::push(const QString &folder, QString &output) QStringList args; args.append("push"); output = runGit(folder,args).trimmed(); - return !output.startsWith("error") && !output.startsWith("fatal"); + return isSuccess(output); } bool GitManager::push(const QString &folder, const QString &remoteName, const QString &branch, QString &output) @@ -348,7 +354,58 @@ bool GitManager::push(const QString &folder, const QString &remoteName, const QS args.append(remoteName); args.append(branch); output = runGit(folder,args).trimmed(); - return !output.startsWith("error") && !output.startsWith("fatal"); + return isSuccess(output); +} + +bool GitManager::removeConfig(const QString &folder, const QString &name, QString &output) +{ + QStringList args; + args.append("config"); + args.append("--unset-all"); + args.append(name); + output = runGit(folder,args); + return isSuccess(output); +} + +bool GitManager::setConfig(const QString &folder, const QString &name, const QString &value, QString &output) +{ + removeConfig(folder,name,output); + QStringList args; + args.append("config"); + args.append("--add"); + args.append(name); + args.append(value); + output = runGit(folder,args); + return isSuccess(output); +} + +bool GitManager::setUserName(const QString &folder, const QString &userName, QString &output) +{ + return setConfig(folder,"user.name",userName,output); +} + +bool GitManager::setUserEmail(const QString &folder, const QString &userEmail, QString &output) +{ + return setConfig(folder,"user.email",userEmail,output); +} + +QString GitManager::getConfig(const QString& folder, const QString &name) +{ + QStringList args; + args.append("config"); + args.append("--get"); + args.append(name); + return runGit(folder,args).trimmed(); +} + +QString GitManager::getUserName(const QString& folder) +{ + return getConfig(folder, "user.name"); +} + +QString GitManager::getUserEmail(const QString& folder) +{ + return getConfig(folder, "user.email"); } QStringList GitManager::listBranches(const QString &folder, int ¤t) @@ -393,7 +450,7 @@ bool GitManager::switchToBranch(const QString &folder, const QString &branch, args.append("--no-track"); args.append(branch); output = runGit(folder,args); - return !output.startsWith("error") && !output.startsWith("fatal"); + return isSuccess(output); } bool GitManager::merge(const QString &folder, const QString &commit, bool squash, @@ -418,7 +475,7 @@ bool GitManager::merge(const QString &folder, const QString &commit, bool squash } args.append(commit); output = runGit(folder,args); - return !output.startsWith("error") && !output.startsWith("fatal"); + return isSuccess(output); } bool GitManager::continueMerge(const QString &folder) @@ -427,7 +484,7 @@ bool GitManager::continueMerge(const QString &folder) args.append("merge"); args.append("--continue"); QString output = runGit(folder,args); - return !output.startsWith("error") && !output.startsWith("fatal"); + return isSuccess(output); } @@ -439,15 +496,30 @@ void GitManager::abortMerge(const QString &folder) runGit(folder,args); } -void GitManager::clone(const QString &folder, const QString &url) +bool GitManager::isSuccess(const QString &output) +{ + QStringList lst = textToLines(output); + if (!lst.isEmpty()) { + foreach (const QString& s, lst) { + QString last= s.trimmed(); + if (last.startsWith("error:") || last.startsWith("fatal:")) + return false; + } + return true; + } + return true; +} + +bool GitManager::clone(const QString &folder, const QString &url, QString& output) { QStringList args; args.append("clone"); args.append(url); - runGit(folder,args); + output = runGit(folder,args); + return isSuccess(output); } -void GitManager::commit(const QString &folder, const QString &message, bool autoStage) +bool GitManager::commit(const QString &folder, const QString &message, bool autoStage, QString& output) { QStringList args; args.append("commit"); @@ -455,19 +527,21 @@ void GitManager::commit(const QString &folder, const QString &message, bool auto args.append("-a"); args.append("-m"); args.append(message); - runGit(folder,args); + output = runGit(folder,args); + return isSuccess(output); } -void GitManager::revert(const QString &folder) +bool GitManager::revert(const QString &folder, QString& output) { QStringList args; args.append("revert"); - runGit(folder,args); + output = runGit(folder,args); + return isSuccess(output); } bool GitManager::reset(const QString &folder, const QString &commit, GitResetStrategy strategy, - QString& ouput) + QString& output) { //todo reset type QStringList args; @@ -490,8 +564,8 @@ bool GitManager::reset(const QString &folder, const QString &commit, break; } args.append(commit); - QString output = runGit(folder,args); - return !output.startsWith("error") && !output.startsWith("fatal"); + output = runGit(folder,args); + return isSuccess(output); } bool GitManager::isValid() @@ -512,10 +586,16 @@ QString GitManager::runGit(const QString& workingFolder, const QStringList &args args.join("\" \""))); // qDebug()<<"---------"; // qDebug()<dirs().appDir()); + env.insert("GIT_ASKPASS",includeTrailingPathDelimiter(pSettings->dirs().appDir())+"redpanda-win-git-askpass.exe"); QString output = runAndGetOutput( fileInfo.absoluteFilePath(), workingFolder, - args); + args, + "", + false, + env); output = escapeUTF8String(output.toUtf8()); // qDebug()< log(const QString& folder, int start, int count, const QString& branch=QString()); @@ -65,6 +65,15 @@ public: const QString& branch, QString& output); + bool removeConfig(const QString& folder, const QString &name, QString& output); + bool setConfig(const QString& folder, const QString &name, const QString &value, QString& output); + bool setUserName(const QString& folder, const QString& userName, QString& output); + bool setUserEmail(const QString& folder, const QString& userEmail, QString& output); + + QString getConfig(const QString& folder, const QString& name); + QString getUserName(const QString& folder); + QString getUserEmail(const QString& folder); + QStringList listBranches(const QString& folder, int& current); bool switchToBranch(const QString& folder, const QString& branch, bool create, @@ -78,9 +87,10 @@ public: bool continueMerge(const QString& folder); void abortMerge(const QString& folder); - void clone(const QString& folder, const QString& url); - void commit(const QString& folder, const QString& message, bool autoStage); - void revert(const QString& folder); + bool isSuccess(const QString& output); + bool clone(const QString& folder, const QString& url, QString& output); + bool commit(const QString& folder, const QString& message, bool autoStage, QString& output); + bool revert(const QString& folder, QString& output); bool reset(const QString& folder, const QString& commit, GitResetStrategy strategy, QString& output); bool isValid(); diff --git a/RedPandaIDE/vcs/gitrepository.cpp b/RedPandaIDE/vcs/gitrepository.cpp index c56c9ab7..ef528a18 100644 --- a/RedPandaIDE/vcs/gitrepository.cpp +++ b/RedPandaIDE/vcs/gitrepository.cpp @@ -30,24 +30,24 @@ bool GitRepository::hasRepository(QString& currentBranch) return mInRepository; } -void GitRepository::add(const QString &path) +bool GitRepository::add(const QString &path, QString& output) { - mManager->add(mFolder,path); + return mManager->add(mFolder,path, output); } -void GitRepository::remove(const QString &path) +bool GitRepository::remove(const QString &path, QString& output) { - mManager->remove(mFolder,path); + return mManager->remove(mFolder,path, output); } -void GitRepository::rename(const QString &oldName, const QString &newName) +bool GitRepository::rename(const QString &oldName, const QString &newName, QString& output) { - mManager->rename(mFolder, oldName, newName); + return mManager->rename(mFolder, oldName, newName,output); } -void GitRepository::restore(const QString &path) +bool GitRepository::restore(const QString &path, QString& output) { - mManager->restore(mFolder, path); + return mManager->restore(mFolder, path, output); } QSet GitRepository::listFiles(bool refresh) @@ -57,19 +57,19 @@ QSet GitRepository::listFiles(bool refresh) return mFilesInRepositories; } -void GitRepository::clone(const QString &url) +bool GitRepository::clone(const QString &url, QString& output) { - mManager->clone(mFolder,url); + return mManager->clone(mFolder,url, output); } -void GitRepository::commit(const QString &message, bool autoStage) +bool GitRepository::commit(const QString &message, QString& output, bool autoStage) { - mManager->commit(mRealFolder, message, autoStage); + return mManager->commit(mRealFolder, message, autoStage, output); } -void GitRepository::revert() +bool GitRepository::revert(QString& output) { - mManager->revert(mRealFolder); + return mManager->revert(mRealFolder, output); } void GitRepository::setFolder(const QString &newFolder) diff --git a/RedPandaIDE/vcs/gitrepository.h b/RedPandaIDE/vcs/gitrepository.h index d4521158..b7a6b6ac 100644 --- a/RedPandaIDE/vcs/gitrepository.h +++ b/RedPandaIDE/vcs/gitrepository.h @@ -54,15 +54,15 @@ public: return !mConflicts.isEmpty(); } - void add(const QString& path); - void remove(const QString& path); - void rename(const QString& oldName, const QString& newName); - void restore(const QString& path); + bool add(const QString& path, QString& output); + bool remove(const QString& path, QString& output); + bool rename(const QString& oldName, const QString& newName, QString& output); + bool restore(const QString& path, QString& output); QSet listFiles(bool refresh); - void clone(const QString& url); - void commit(const QString& message, bool autoStage=true); - void revert(); + bool clone(const QString& url, QString& output); + bool commit(const QString& message, QString& output, bool autoStage=true); + bool revert(QString& output); void setFolder(const QString &newFolder); diff --git a/RedPandaIDE/vcs/gituserconfigdialog.cpp b/RedPandaIDE/vcs/gituserconfigdialog.cpp new file mode 100644 index 00000000..95490563 --- /dev/null +++ b/RedPandaIDE/vcs/gituserconfigdialog.cpp @@ -0,0 +1,68 @@ +#include "gituserconfigdialog.h" +#include "ui_gituserconfigdialog.h" +#include "gitmanager.h" +#include "../widgets/infomessagebox.h" + +GitUserConfigDialog::GitUserConfigDialog(const QString& folder, QWidget *parent) : + QDialog(parent), + ui(new Ui::GitUserConfigDialog), + mFolder(folder) +{ + ui->setupUi(this); + GitManager manager; + ui->txtUserName->setText(manager.getUserName(folder)); + ui->txtUserEmail->setText(manager.getUserEmail(folder)); + checkInfo(); +} + +GitUserConfigDialog::~GitUserConfigDialog() +{ + delete ui; +} + +void GitUserConfigDialog::checkInfo() +{ + ui->btnOk->setEnabled(!ui->txtUserEmail->text().isEmpty() + && !ui->txtUserName->text().isEmpty()); +} + +void GitUserConfigDialog::on_btnOk_clicked() +{ + GitManager manager; + QString output; + if (!manager.setUserName(mFolder, ui->txtUserName->text(),output)) { + InfoMessageBox infoBox; + infoBox.showMessage(output); + reject(); + } + if (!manager.setUserEmail(mFolder, ui->txtUserEmail->text(),output)) { + InfoMessageBox infoBox; + infoBox.showMessage(output); + reject(); + } + accept(); +} + + +void GitUserConfigDialog::on_btnCancel_clicked() +{ + reject(); +} + +void GitUserConfigDialog::closeEvent(QCloseEvent * /*event*/) +{ + reject(); +} + + +void GitUserConfigDialog::on_txtUserName_textChanged(const QString &/*arg1*/) +{ + checkInfo(); +} + + +void GitUserConfigDialog::on_txtUserEmail_textChanged(const QString &/*arg1*/) +{ + checkInfo(); +} + diff --git a/RedPandaIDE/vcs/gituserconfigdialog.h b/RedPandaIDE/vcs/gituserconfigdialog.h new file mode 100644 index 00000000..6078e441 --- /dev/null +++ b/RedPandaIDE/vcs/gituserconfigdialog.h @@ -0,0 +1,35 @@ +#ifndef GITUSERCONFIGDIALOG_H +#define GITUSERCONFIGDIALOG_H + +#include + +namespace Ui { +class GitUserConfigDialog; +} + +class GitUserConfigDialog : public QDialog +{ + Q_OBJECT + +public: + explicit GitUserConfigDialog(const QString& folder, QWidget *parent = nullptr); + ~GitUserConfigDialog(); + +private: + Ui::GitUserConfigDialog *ui; + QString mFolder; + +private: + void checkInfo(); +private slots: + void on_btnOk_clicked(); + void on_btnCancel_clicked(); + void on_txtUserName_textChanged(const QString &arg1); + void on_txtUserEmail_textChanged(const QString &arg1); + + // QWidget interface +protected: + void closeEvent(QCloseEvent *event) override; +}; + +#endif // GITUSERCONFIGDIALOG_H diff --git a/RedPandaIDE/vcs/gituserconfigdialog.ui b/RedPandaIDE/vcs/gituserconfigdialog.ui new file mode 100644 index 00000000..56670360 --- /dev/null +++ b/RedPandaIDE/vcs/gituserconfigdialog.ui @@ -0,0 +1,97 @@ + + + GitUserConfigDialog + + + + 0 + 0 + 429 + 299 + + + + Fill User Info + + + + + + + + + User Email: + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Ok + + + + + + + Cancel + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + User Name: + + + + + + + Git needs the following info to commit： + + + true + + + + + + + +