Fixed issue #112: (6) Low hanging GUI fruits during Commit and Push

Add recent message back to context menu.

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

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index cbdf175..1b5703a 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 3dc9a52..ebc94a2 100644 (file)
--- a/src/TortoiseProc/CommitDlg.cpp
+++ b/src/TortoiseProc/CommitDlg.cpp
@@ -1273,6 +1273,11 @@ void CCommitDlg::InsertMenuItems(CMenu& mPopup, int& nCmd)
                sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PASTELASTMESSAGE);\r
                m_nPopupPasteLastMessage = nCmd++;\r
                mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteLastMessage, sMenuItemText);\r
+\r
+               sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_LOGHISTORY);\r
+               m_nPopupRecentMessage = nCmd++;\r
+               mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupRecentMessage, sMenuItemText);\r
+\r
        }\r
        \r
 }\r
@@ -1320,6 +1325,12 @@ bool CCommitDlg::HandleMenuItemClick(int cmd, CSciEdit * pSciEdit)
                pSciEdit->InsertText(logmsg);\r
                return true;\r
        }\r
+\r
+       if(cmd == m_nPopupRecentMessage )\r
+       {\r
+               OnBnClickedHistory();\r
+               return true;\r
+       }\r
        return false;\r
 }\r
 \r
@@ -1353,7 +1364,7 @@ void CCommitDlg::OnBnClickedHistory()
        m_tooltips.Pop();       // hide the tooltips\r
        if (m_pathList.GetCount() == 0)\r
                return;\r
-#if 0\r
+\r
        CHistoryDlg historyDlg;\r
        historyDlg.SetHistory(m_History);\r
        if (historyDlg.DoModal() != IDOK)\r
@@ -1375,7 +1386,7 @@ void CCommitDlg::OnBnClickedHistory()
 \r
        UpdateOKButton();\r
        GetDlgItem(IDC_LOGMESSAGE)->SetFocus();\r
-#endif\r
+\r
 }\r
 \r
 void CCommitDlg::OnBnClickedBugtraqbutton()\r

diff --git a/src/TortoiseProc/CommitDlg.h b/src/TortoiseProc/CommitDlg.h
index dc2e339..e2700e5 100644 (file)
--- a/src/TortoiseProc/CommitDlg.h
+++ b/src/TortoiseProc/CommitDlg.h
@@ -134,6 +134,7 @@ private:
        static UINT                     WM_AUTOLISTREADY;\r
        int                                     m_nPopupPasteListCmd;\r
        int                                     m_nPopupPasteLastMessage;\r
+       int                                     m_nPopupRecentMessage;\r
        CRegHistory                     m_History;\r
        bool                            m_bCancelled;\r
        CSplitterControl        m_wndSplitter;\r

diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index bf72a6f..0659734 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -453,6 +453,14 @@
                                        RelativePath=".\DeleteConflictDlg.h"\r
                                        >\r
                                </File>\r
+                               <File\r
+                                       RelativePath=".\HistoryDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\HistoryDlg.h"\r
+                                       >\r
+                               </File>\r
                        </Filter>\r
                        <Filter\r
                                Name="UI"\r

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