OSDN Git Service

Use processdlg to format patch.
authorFrank Li <lznuaa@gmail.com>
Sun, 12 Apr 2009 14:30:01 +0000 (22:30 +0800)
committerFrank Li <lznuaa@gmail.com>
Sun, 12 Apr 2009 14:30:01 +0000 (22:30 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
src/Resources/TortoiseProcENG.rc
src/TortoiseProc/Commands/FormatPatchCommand.cpp

index 2330fcd..f7370da 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ
index 05bf75f..56a5a65 100644 (file)
@@ -26,6 +26,8 @@
 #include "DirFileEnum.h"\r
 #include "ShellUpdater.h"\r
 \r
+#include "ProgressDlg.h"\r
+\r
 bool FormatPatchCommand::Execute()\r
 {\r
        CFormatPatchDlg dlg;\r
@@ -53,11 +55,11 @@ bool FormatPatchCommand::Execute()
                        range\r
                        );\r
 \r
-               CString out;\r
-               if(g_Git.Run(cmd,&out,CP_ACP))\r
-               {\r
-                       CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);\r
-               }\r
+               CProgressDlg progress;\r
+               progress.m_GitCmd=cmd;\r
+               if(progress.DoModal()==IDOK)\r
+                       return TRUE;\r
+\r
                return TRUE;\r
                \r
        }\r