Show Line and Column Number at CommitDlg.cpp

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index c19275a..513fa44 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ

diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp
index 3f817a4..e692e8d 100644 (file)
--- a/src/TortoiseProc/CommitDlg.cpp
+++ b/src/TortoiseProc/CommitDlg.cpp
@@ -88,6 +88,7 @@ BEGIN_MESSAGE_MAP(CCommitDlg, CResizableStandAloneDialog)
        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
@@ -235,6 +236,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
@@ -1567,12 +1569,16 @@ void CCommitDlg::DoSize(int delta)
        RemoveAnchor(IDC_COMMIT_AMEND);\r
        RemoveAnchor(IDC_LISTGROUP);\r
        RemoveAnchor(IDC_FILELIST);\r
+       RemoveAnchor(IDC_TEXT_INFO);\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
+\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
@@ -1580,6 +1586,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
@@ -1683,4 +1690,20 @@ void CCommitDlg::OnStnClickedBugidlabel()
 void CCommitDlg::OnFocusMessage()\r
 {\r
        m_cLogMessage.SetFocus();\r
+}\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
 }
\ No newline at end of file

diff --git a/src/TortoiseProc/CommitDlg.h b/src/TortoiseProc/CommitDlg.h
index e2700e5..e52ce8d 100644 (file)
--- a/src/TortoiseProc/CommitDlg.h
+++ b/src/TortoiseProc/CommitDlg.h
@@ -151,4 +151,5 @@ public:
        afx_msg void OnBnClickedCommitAmend();\r
     afx_msg void OnBnClickedWholeProject();\r
        afx_msg void OnStnClickedBugidlabel();\r
+       afx_msg void OnScnUpdateUI(NMHDR *pNMHDR, LRESULT *pResult);\r
 };\r

diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index a4ab5d3..ec74b61 100644 (file)
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ