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

The "Message" field of the Commit dialog should have a shortcut key (Alt-M is a good choice)

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

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index dcd728c..cbc398e 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 91987a5..3dc9a52 100644 (file)
--- a/src/TortoiseProc/CommitDlg.cpp
+++ b/src/TortoiseProc/CommitDlg.cpp
@@ -104,6 +104,7 @@ BEGIN_MESSAGE_MAP(CCommitDlg, CResizableStandAloneDialog)
     ON_BN_CLICKED(IDC_COMMIT_AMEND, &CCommitDlg::OnBnClickedCommitAmend)\r
     ON_BN_CLICKED(IDC_WHOLE_PROJECT, &CCommitDlg::OnBnClickedWholeProject)\r
        ON_STN_CLICKED(IDC_BUGIDLABEL, &CCommitDlg::OnStnClickedBugidlabel)\r
     ON_BN_CLICKED(IDC_COMMIT_AMEND, &CCommitDlg::OnBnClickedCommitAmend)\r
     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

 END_MESSAGE_MAP()\r
 \r
 BOOL CCommitDlg::OnInitDialog()\r
 END_MESSAGE_MAP()\r
 \r
 BOOL CCommitDlg::OnInitDialog()\r


@@ -118,6 +119,8 @@ BOOL CCommitDlg::OnInitDialog()
        m_regKeepChangelists = CRegDWORD(_T("Software\\TortoiseGit\\KeepChangeLists"), FALSE);\r
        m_bKeepChangeList = m_regKeepChangelists;\r
 \r
        m_regKeepChangelists = CRegDWORD(_T("Software\\TortoiseGit\\KeepChangeLists"), FALSE);\r
        m_bKeepChangeList = m_regKeepChangelists;\r
 \r

+       m_hAccel = LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_COMMITDLG));\r
+\r

 //     GitConfig config;\r
 //     m_bWholeProject = config.KeepLocks();\r
 \r
 //     GitConfig config;\r
 //     m_bWholeProject = config.KeepLocks();\r
 \r


@@ -860,6 +863,14 @@ BOOL CCommitDlg::PreTranslateMessage(MSG* pMsg)
 {\r
        if (!m_bBlock)\r
                m_tooltips.RelayEvent(pMsg);\r
 {\r
        if (!m_bBlock)\r
                m_tooltips.RelayEvent(pMsg);\r

+       \r
+       if (m_hAccel)\r
+       {\r
+               int ret = TranslateAccelerator(m_hWnd, m_hAccel, pMsg);\r
+               if (ret)\r
+                       return TRUE;\r
+       }\r
+\r

        if (pMsg->message == WM_KEYDOWN)\r
        {\r
                switch (pMsg->wParam)\r
        if (pMsg->message == WM_KEYDOWN)\r
        {\r
                switch (pMsg->wParam)\r


@@ -1654,3 +1665,8 @@ void CCommitDlg::OnStnClickedBugidlabel()
 {\r
        // TODO: Add your control notification handler code here\r
 }\r
 {\r
        // TODO: Add your control notification handler code here\r
 }\r

+\r
+void CCommitDlg::OnFocusMessage()\r
+{\r
+       m_cLogMessage.SetFocus();\r
+}
\ No newline at end of file

diff --git a/src/TortoiseProc/CommitDlg.h b/src/TortoiseProc/CommitDlg.h
index a10f5fd..dc2e339 100644 (file)
--- a/src/TortoiseProc/CommitDlg.h
+++ b/src/TortoiseProc/CommitDlg.h
@@ -77,6 +77,7 @@ protected:
        afx_msg void OnBnClickedBugtraqbutton();\r
        afx_msg void OnEnChangeLogmessage();\r
        afx_msg void OnStnClickedExternalwarning();\r
        afx_msg void OnBnClickedBugtraqbutton();\r
        afx_msg void OnEnChangeLogmessage();\r
        afx_msg void OnStnClickedExternalwarning();\r

+       afx_msg void OnFocusMessage();\r

        afx_msg LRESULT OnGitStatusListCtrlItemCountChanged(WPARAM, LPARAM);\r
        afx_msg LRESULT OnGitStatusListCtrlNeedsRefresh(WPARAM, LPARAM);\r
        afx_msg LRESULT OnGitStatusListCtrlCheckChanged(WPARAM, LPARAM);\r
        afx_msg LRESULT OnGitStatusListCtrlItemCountChanged(WPARAM, LPARAM);\r
        afx_msg LRESULT OnGitStatusListCtrlNeedsRefresh(WPARAM, LPARAM);\r
        afx_msg LRESULT OnGitStatusListCtrlCheckChanged(WPARAM, LPARAM);\r


@@ -141,6 +142,7 @@ private:
        CPathWatcher            m_pathwatcher;\r
 \r
        CBugTraqAssociation m_bugtraq_association;\r
        CPathWatcher            m_pathwatcher;\r
 \r
        CBugTraqAssociation m_bugtraq_association;\r

+       HACCEL                          m_hAccel;\r

 \r
 public:\r
        afx_msg void OnBnClickedSignOff();\r
 \r
 public:\r
        afx_msg void OnBnClickedSignOff();\r

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