From 51cb2007b53599f688ffd4f8452b4be2e3535c04 Mon Sep 17 00:00:00 2001 From: Frank Li Date: Sat, 22 Aug 2009 23:27:16 +0800 Subject: [PATCH] Show Line and Column Number at CommitDlg.cpp Signed-off-by: Frank Li --- src/Resources/TortoiseProcENG.rc | Bin 448460 -> 448590 bytes src/TortoiseProc/CommitDlg.cpp | 23 +++++++++++++++++++++++ src/TortoiseProc/CommitDlg.h | 1 + src/TortoiseProc/resource.h | Bin 166464 -> 166648 bytes 4 files changed, 24 insertions(+) diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index c19275a7690431b3e5e34bbaf4ea0478b95976df..513fa44fd8b14e854b76c539d84dfa030abb23a1 100644 GIT binary patch delta 123 zcwRfRUi#by=?!J;ISm+e7>pQ<8BC`8S2C`hUJ${|F@3>aCZ)|`8<^N8=M-{GUa(eA zHH5*HA%Y=a>!5^y20!SM&7%-RuX_LtdUDc<5^I()|F4@*zvW*dlnShuX Ph*^M`b$iJ+wg^Q4|C=S; delta 75 zcwRfVLHf*k=?!J;MU5DA7>pQ<86dO)gq$9Dj8Sy+g7rJtrq8*-DAxR8TlrG_KWt-*Qv?9kjvdSZ diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp index 3f817a429..e692e8de4 100644 --- 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) ON_BN_CLICKED(IDHELP, OnBnClickedHelp) ON_BN_CLICKED(IDC_SHOWUNVERSIONED, OnBnClickedShowunversioned) + ON_NOTIFY(SCN_UPDATEUI, IDC_LOGMESSAGE, OnScnUpdateUI) // ON_BN_CLICKED(IDC_HISTORY, OnBnClickedHistory) ON_BN_CLICKED(IDC_BUGTRAQBUTTON, OnBnClickedBugtraqbutton) ON_EN_CHANGE(IDC_LOGMESSAGE, OnEnChangeLogmessage) @@ -235,6 +236,7 @@ BOOL CCommitDlg::OnInitDialog() AddAnchor(IDC_SELECTALL, BOTTOM_LEFT); AddAnchor(IDC_EXTERNALWARNING, BOTTOM_RIGHT); AddAnchor(IDC_STATISTICS, BOTTOM_LEFT, BOTTOM_RIGHT); + AddAnchor(IDC_TEXT_INFO, TOP_RIGHT); AddAnchor(IDC_WHOLE_PROJECT, BOTTOM_LEFT); AddAnchor(IDC_KEEPLISTS, BOTTOM_LEFT); AddAnchor(IDOK, BOTTOM_RIGHT); @@ -1567,12 +1569,16 @@ void CCommitDlg::DoSize(int delta) RemoveAnchor(IDC_COMMIT_AMEND); RemoveAnchor(IDC_LISTGROUP); RemoveAnchor(IDC_FILELIST); + RemoveAnchor(IDC_TEXT_INFO); + CSplitterControl::ChangeHeight(&m_cLogMessage, delta, CW_TOPALIGN); CSplitterControl::ChangeHeight(GetDlgItem(IDC_MESSAGEGROUP), delta, CW_TOPALIGN); CSplitterControl::ChangeHeight(&m_ListCtrl, -delta, CW_BOTTOMALIGN); CSplitterControl::ChangeHeight(GetDlgItem(IDC_LISTGROUP), -delta, CW_BOTTOMALIGN); CSplitterControl::ChangePos(GetDlgItem(IDC_SIGNOFF),0,delta); CSplitterControl::ChangePos(GetDlgItem(IDC_COMMIT_AMEND),0,delta); + CSplitterControl::ChangePos(GetDlgItem(IDC_TEXT_INFO),0,delta); + AddAnchor(IDC_MESSAGEGROUP, TOP_LEFT, TOP_RIGHT); AddAnchor(IDC_LOGMESSAGE, TOP_LEFT, TOP_RIGHT); AddAnchor(IDC_SPLITTER, TOP_LEFT, TOP_RIGHT); @@ -1580,6 +1586,7 @@ void CCommitDlg::DoSize(int delta) AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT); AddAnchor(IDC_SIGNOFF,TOP_RIGHT); AddAnchor(IDC_COMMIT_AMEND,TOP_LEFT); + AddAnchor(IDC_TEXT_INFO,TOP_RIGHT); ArrangeLayout(); // adjust the minimum size of the dialog to prevent the resizing from // moving the list control too far down. @@ -1683,4 +1690,20 @@ void CCommitDlg::OnStnClickedBugidlabel() void CCommitDlg::OnFocusMessage() { m_cLogMessage.SetFocus(); +} + +void CCommitDlg::OnScnUpdateUI(NMHDR *pNMHDR, LRESULT *pResult) +{ + SCNotification *pHead =(SCNotification *)pNMHDR; + + int pos=this->m_cLogMessage.Call(SCI_GETCURRENTPOS); + int line=this->m_cLogMessage.Call(SCI_LINEFROMPOSITION,pos); + int column=this->m_cLogMessage.Call(SCI_GETCOLUMN,pos); + + CString str; + str.Format(_T("%d/%d"),line+1,column+1); + this->GetDlgItem(IDC_TEXT_INFO)->SetWindowText(str); + + if(*pResult) + *pResult=0; } \ No newline at end of file diff --git a/src/TortoiseProc/CommitDlg.h b/src/TortoiseProc/CommitDlg.h index e2700e592..e52ce8d66 100644 --- a/src/TortoiseProc/CommitDlg.h +++ b/src/TortoiseProc/CommitDlg.h @@ -151,4 +151,5 @@ public: afx_msg void OnBnClickedCommitAmend(); afx_msg void OnBnClickedWholeProject(); afx_msg void OnStnClickedBugidlabel(); + afx_msg void OnScnUpdateUI(NMHDR *pNMHDR, LRESULT *pResult); }; diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h index a4ab5d325ec97e40936a5ee4dbb73a4bcf64695f..ec74b61c90691c6d71f6afb0c48a010daf9f5c7c 100644 GIT binary patch delta 51 zcwPZB0L=fulnVHj3b0svlc0JOld|Y0lQw%I2UGw>09XK2mw~1MDU+a~41+j(hd6ry Jw>WzO2oEPL68iuE delta 22 ecwYN4mFvJ1t_=~@%>p&;0yT`=1!|aH@BsjEfe6