Add View Patch & Hide Patch at commit dialog

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / CommitDlg.cpp

diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp
index 97bb3b8..e1779b1 100644 (file)
--- a/src/TortoiseProc/CommitDlg.cpp
+++ b/src/TortoiseProc/CommitDlg.cpp
@@ -82,12 +82,14 @@ void CCommitDlg::DoDataExchange(CDataExchange* pDX)
        DDX_Control(pDX, IDC_SPLITTER, m_wndSplitter);\r
        DDX_Check(pDX, IDC_KEEPLISTS, m_bKeepChangeList);\r
        DDX_Check(pDX,IDC_COMMIT_AMEND,m_bCommitAmend);\r
+       DDX_Control(pDX,IDC_VIEW_PATCH,m_ctrlShowPatch);\r
 }\r
 \r
 BEGIN_MESSAGE_MAP(CCommitDlg, CResizableStandAloneDialog)\r
        ON_BN_CLICKED(IDC_SELECTALL, OnBnClickedSelectall)\r
        ON_BN_CLICKED(IDHELP, OnBnClickedHelp)\r
        ON_BN_CLICKED(IDC_SHOWUNVERSIONED, OnBnClickedShowunversioned)\r
+       ON_NOTIFY(SCN_UPDATEUI, IDC_LOGMESSAGE, OnScnUpdateUI)\r
 //     ON_BN_CLICKED(IDC_HISTORY, OnBnClickedHistory)\r
        ON_BN_CLICKED(IDC_BUGTRAQBUTTON, OnBnClickedBugtraqbutton)\r
        ON_EN_CHANGE(IDC_LOGMESSAGE, OnEnChangeLogmessage)\r
@@ -105,6 +107,7 @@ BEGIN_MESSAGE_MAP(CCommitDlg, CResizableStandAloneDialog)
     ON_BN_CLICKED(IDC_WHOLE_PROJECT, &CCommitDlg::OnBnClickedWholeProject)\r
        ON_STN_CLICKED(IDC_BUGIDLABEL, &CCommitDlg::OnStnClickedBugidlabel)\r
        ON_COMMAND(ID_FOCUS_MESSAGE,&CCommitDlg::OnFocusMessage)\r
+       ON_STN_CLICKED(IDC_VIEW_PATCH, &CCommitDlg::OnStnClickedViewPatch)\r
 END_MESSAGE_MAP()\r
 \r
 BOOL CCommitDlg::OnInitDialog()\r
@@ -228,6 +231,7 @@ BOOL CCommitDlg::OnInitDialog()
 //     AddAnchor(IDC_HISTORY, TOP_LEFT);\r
        AddAnchor(IDC_LOGMESSAGE, TOP_LEFT, TOP_RIGHT);\r
        AddAnchor(IDC_SIGNOFF,   TOP_RIGHT);\r
+       AddAnchor(IDC_VIEW_PATCH,TOP_RIGHT);\r
        AddAnchor(IDC_LISTGROUP, TOP_LEFT, BOTTOM_RIGHT);\r
        AddAnchor(IDC_SPLITTER, TOP_LEFT, TOP_RIGHT);\r
        AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT);\r
@@ -235,6 +239,7 @@ BOOL CCommitDlg::OnInitDialog()
        AddAnchor(IDC_SELECTALL, BOTTOM_LEFT);\r
        AddAnchor(IDC_EXTERNALWARNING, BOTTOM_RIGHT);\r
        AddAnchor(IDC_STATISTICS, BOTTOM_LEFT, BOTTOM_RIGHT);\r
+       AddAnchor(IDC_TEXT_INFO,  TOP_RIGHT);\r
        AddAnchor(IDC_WHOLE_PROJECT, BOTTOM_LEFT);\r
        AddAnchor(IDC_KEEPLISTS, BOTTOM_LEFT);\r
        AddAnchor(IDOK, BOTTOM_RIGHT);\r
@@ -301,6 +306,8 @@ BOOL CCommitDlg::OnInitDialog()
        //this->m_bCommitAmend=FALSE;\r
        //this->UpdateData(FALSE);\r
 \r
+       this->m_ctrlShowPatch.SetURL(CString());\r
+\r
        return FALSE;  // return TRUE unless you set the focus to a control\r
        // EXCEPTION: OCX Property Pages should return FALSE\r
 }\r
@@ -509,10 +516,11 @@ void CCommitDlg::OnOK()
                cmd.Format(_T("git.exe commit %s -F \"%s\""),amend, tempfile);\r
                \r
                CProgressDlg progress;\r
+               progress.m_bBufferAll=true; // improve show speed when there are many file added. \r
                progress.m_GitCmd=cmd;\r
                progress.m_bShowCommand = FALSE;        // don't show the commit command\r
                progress.m_PreText = out;                       // show any output already generated in log window\r
-               progress.m_changeAbortButtonOnSuccessTo = "&Push";\r
+               progress.m_changeAbortButtonOnSuccessTo = _T("&Push");\r
                DWORD userResponse = progress.DoModal();\r
                \r
                if(progress.m_GitStatus)\r
@@ -809,9 +817,11 @@ UINT CCommitDlg::StatusThread()
 void CCommitDlg::OnCancel()\r
 {\r
        m_bCancelled = true;\r
+       m_pathwatcher.Stop();\r
+\r
        if (m_bBlock)\r
                return;\r
-       m_pathwatcher.Stop();\r
+       \r
        if (m_bThreadRunning)\r
        {\r
                InterlockedExchange(&m_bRunThread, FALSE);\r
@@ -1564,12 +1574,19 @@ void CCommitDlg::DoSize(int delta)
        RemoveAnchor(IDC_COMMIT_AMEND);\r
        RemoveAnchor(IDC_LISTGROUP);\r
        RemoveAnchor(IDC_FILELIST);\r
+       RemoveAnchor(IDC_TEXT_INFO);\r
+       RemoveAnchor(IDC_VIEW_PATCH);\r
+\r
        CSplitterControl::ChangeHeight(&m_cLogMessage, delta, CW_TOPALIGN);\r
        CSplitterControl::ChangeHeight(GetDlgItem(IDC_MESSAGEGROUP), delta, CW_TOPALIGN);\r
        CSplitterControl::ChangeHeight(&m_ListCtrl, -delta, CW_BOTTOMALIGN);\r
        CSplitterControl::ChangeHeight(GetDlgItem(IDC_LISTGROUP), -delta, CW_BOTTOMALIGN);\r
        CSplitterControl::ChangePos(GetDlgItem(IDC_SIGNOFF),0,delta);\r
        CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_AMEND),0,delta);\r
+       CSplitterControl::ChangePos(GetDlgItem(IDC_TEXT_INFO),0,delta);\r
+       CSplitterControl::ChangePos(GetDlgItem(IDC_VIEW_PATCH),0,delta);\r
+       \r
+       AddAnchor(IDC_VIEW_PATCH,TOP_RIGHT);\r
        AddAnchor(IDC_MESSAGEGROUP, TOP_LEFT, TOP_RIGHT);\r
        AddAnchor(IDC_LOGMESSAGE, TOP_LEFT, TOP_RIGHT);\r
        AddAnchor(IDC_SPLITTER, TOP_LEFT, TOP_RIGHT);\r
@@ -1577,6 +1594,7 @@ void CCommitDlg::DoSize(int delta)
        AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT);\r
        AddAnchor(IDC_SIGNOFF,TOP_RIGHT);\r
        AddAnchor(IDC_COMMIT_AMEND,TOP_LEFT);\r
+       AddAnchor(IDC_TEXT_INFO,TOP_RIGHT);\r
        ArrangeLayout();\r
        // adjust the minimum size of the dialog to prevent the resizing from\r
        // moving the list control too far down.\r
@@ -1680,4 +1698,25 @@ void CCommitDlg::OnStnClickedBugidlabel()
 void CCommitDlg::OnFocusMessage()\r
 {\r
        m_cLogMessage.SetFocus();\r
-}
\ No newline at end of file
+}\r
+\r
+void CCommitDlg::OnScnUpdateUI(NMHDR *pNMHDR, LRESULT *pResult)\r
+{\r
+       SCNotification *pHead =(SCNotification *)pNMHDR;\r
+       \r
+       int pos=this->m_cLogMessage.Call(SCI_GETCURRENTPOS);\r
+       int line=this->m_cLogMessage.Call(SCI_LINEFROMPOSITION,pos);\r
+       int column=this->m_cLogMessage.Call(SCI_GETCOLUMN,pos);\r
+\r
+       CString str;\r
+       str.Format(_T("%d/%d"),line+1,column+1);\r
+       this->GetDlgItem(IDC_TEXT_INFO)->SetWindowText(str);\r
+\r
+       if(*pResult)\r
+               *pResult=0;\r
+}\r
+void CCommitDlg::OnStnClickedViewPatch()\r
+{\r
+       // TODO: Add your control notification handler code here\r
+       this->m_ctrlShowPatch.SetWindowText(_T("Hide Patch<<"));\r
+}\r