Add View Patch & Hide Patch at commit dialog

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

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index 513fa44..b983ce3 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 e692e8d..e1779b1 100644 (file)
--- a/src/TortoiseProc/CommitDlg.cpp
+++ b/src/TortoiseProc/CommitDlg.cpp
@@ -82,6 +82,7 @@ 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
@@ -106,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
@@ -229,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
@@ -303,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
@@ -1570,6 +1575,7 @@ void CCommitDlg::DoSize(int delta)
        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
@@ -1578,7 +1584,9 @@ void CCommitDlg::DoSize(int delta)
        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
+       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
@@ -1706,4 +1714,9 @@ void CCommitDlg::OnScnUpdateUI(NMHDR *pNMHDR, LRESULT *pResult)
 \r
        if(*pResult)\r
                *pResult=0;\r
-}
\ No newline at end of file
+}\r
+void CCommitDlg::OnStnClickedViewPatch()\r
+{\r
+       // TODO: Add your control notification handler code here\r
+       this->m_ctrlShowPatch.SetWindowText(_T("Hide Patch<<"));\r
+}\r

diff --git a/src/TortoiseProc/CommitDlg.h b/src/TortoiseProc/CommitDlg.h
index e52ce8d..1e9baed 100644 (file)
--- a/src/TortoiseProc/CommitDlg.h
+++ b/src/TortoiseProc/CommitDlg.h
@@ -30,6 +30,7 @@
 #include "Tooltip.h"\r
 #include "..\IBugTraqProvider\IBugTraqProvider_h.h"\r
 #include "Git.h"\r
+#include "HyperLink.h"\r
 \r
 #include <regex>\r
 using namespace std;\r
@@ -141,6 +142,7 @@ private:
        CRect                           m_DlgOrigRect;\r
        CRect                           m_LogMsgOrigRect;\r
        CPathWatcher            m_pathwatcher;\r
+       CHyperLink                      m_ctrlShowPatch;\r
 \r
        CBugTraqAssociation m_bugtraq_association;\r
        HACCEL                          m_hAccel;\r
@@ -152,4 +154,5 @@ public:
     afx_msg void OnBnClickedWholeProject();\r
        afx_msg void OnStnClickedBugidlabel();\r
        afx_msg void OnScnUpdateUI(NMHDR *pNMHDR, LRESULT *pResult);\r
+       afx_msg void OnStnClickedViewPatch();\r
 };\r

diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index 0ebbde6..cf3d55a 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -419,6 +419,14 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath=".\PatchViewDlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\PatchViewDlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\ProjectProperties.cpp"\r
                                >\r
                        </File>\r
@@ -588,11 +596,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\copy.ico"\r
+                               RelativePath="..\Resources\copy.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\copy.ico"\r
+                               RelativePath=".\copy.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -620,11 +628,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\explorer.ico"\r
+                               RelativePath=".\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\explorer.ico"\r
+                               RelativePath="..\Resources\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -868,11 +876,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\newfolder.ico"\r
+                               RelativePath="..\Resources\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\newfolder.ico"\r
+                               RelativePath=".\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -904,11 +912,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\refresh.ico"\r
+                               RelativePath="..\Resources\refresh.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\refresh.ico"\r
+                               RelativePath=".\refresh.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -984,11 +992,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\save.ico"\r
+                               RelativePath=".\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\save.ico"\r
+                               RelativePath="..\Resources\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1088,11 +1096,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\up.ico"\r
+                               RelativePath="..\Resources\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\up.ico"\r
+                               RelativePath=".\up.ico"\r
                                >\r
                        </File>\r
                        <File\r

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