X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=blobdiff_plain;f=src%2FTortoiseProc%2FSVNProgressDlg.cpp;h=2d5a88878bb8034c06179cf7dce9c33fa0cd5625;hp=1db965e52c2f619c268c83f7d3fc1d22e7cd0392;hb=c722f9989e2ba525949587d11792ef3baa4fdd04;hpb=426cc7d8a24b971896b99610681f00631e4a9847;ds=sidebyside

diff --git a/src/TortoiseProc/SVNProgressDlg.cpp b/src/TortoiseProc/SVNProgressDlg.cpp
index 1db965e..2d5a888 100644
--- a/src/TortoiseProc/SVNProgressDlg.cpp
+++ b/src/TortoiseProc/SVNProgressDlg.cpp
@@ -40,6 +40,7 @@
 #include "ShellUpdater.h"
 #include "IconMenu.h"
 #include "BugTraqAssociations.h"
+#include "patch.h"
 
 static UINT WM_GITPROGRESS = RegisterWindowMessage(_T("TORTOISEGIT_GITPROGRESS_MSG"));
 
@@ -267,6 +268,10 @@ BOOL CGitProgressDlg::Notify(const CTGitPath& path, git_wc_notify_action_t actio
 			data->color = m_Colors.GetColor(CColors::Added);
 	//	}
 		break;
+	case git_wc_notify_sendmail:
+		data->sActionColumnText.LoadString(IDS_SVNACTION_SENDMAIL);
+		data->color = m_Colors.GetColor(CColors::Modified);
+		break;
 	
 	case git_wc_notify_resolved:
 		data->sActionColumnText.LoadString(IDS_SVNACTION_RESOLVE);
@@ -896,6 +901,9 @@ UINT CGitProgressDlg::ProgressThread()
 	case GitProgress_Update:
 		bSuccess = CmdUpdate(sWindowTitle, localoperation);
 		break;
+	case GitProgress_SendMail:
+		bSuccess = CmdSendMail(sWindowTitle, localoperation);
+		break;
 	}
 	if (!bSuccess)
 		temp.LoadString(IDS_PROGRS_TITLEFAILED);
@@ -2671,3 +2679,20 @@ CString CGitProgressDlg::GetPathFromColumnText(const CString& sColumnText)
 	}
 	return sPath;
 }
+
+bool CGitProgressDlg::CmdSendMail(CString& sWindowTitle, bool& /*localoperation*/)
+{
+	sWindowTitle.LoadString(IDS_PROGRS_TITLE_SENDMAIL);
+	SetWindowText(sWindowTitle);
+	//SetBackgroundImage(IDI_ADD_BKG);
+	ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_SENDMAIL)));
+
+	for(int i=0;i<m_targetPathList.GetCount();i++)
+	{
+		CPatch patch;
+		patch.Send((CString&)m_targetPathList[i].GetWinPathString(),this->m_SendMailTO,
+			          this->m_SendMailCC,this->m_SendMailFlags&SENDMAIL_ATTACHMENT);
+		Notify(m_targetPathList[i],git_wc_notify_sendmail);
+	}
+	return true;
+}
\ No newline at end of file