From f5aa9adff675070c880d5fdc1df498fa05f999d3 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 7 Nov 2014 20:15:15 +0100 Subject: [PATCH] Fixed issue #2341: Jump to search box when pressing CTRL+E Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/Resources/TortoiseProcENG.rc | 1 + src/TortoiseProc/BrowseRefsDlg.cpp | 10 ++++++++++ src/TortoiseProc/LogDlg.cpp | 7 +++++++ src/TortoiseProc/LogDlg.h | 1 + src/TortoiseProc/resource.h | 3 ++- 6 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 6c1a9e351..8be53f37f 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -16,6 +16,7 @@ Released: unreleased * Fixed issue #2330: Optimize submodule conflict resolution * Fixed issue #2332: TortoiseGitMerge: Move "Create patch file" to the File menu * TortoiseGitMerge: Updated EditorConfig version to 0.12 + * Fixed issue #2341: Jump to search box when pressing CTRL+E == Bug Fixes == * Fixed issue #2260: Clicking in blank space in Commit dialog causes all unversioned files to become selected diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index 16defdf99..cff0e11cf 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -3107,6 +3107,7 @@ BEGIN VK_RIGHT, ID_GO_FORWARD, VIRTKEY, SHIFT, ALT, NOINVERT VK_UP, ID_GO_UP, VIRTKEY, ALT, NOINVERT VK_DOWN, ID_GO_DOWN, VIRTKEY, ALT, NOINVERT + "E", ID_SELECT_SEARCHFIELD, VIRTKEY, CONTROL, NOINVERT END IDR_ACC_COMMITDLG ACCELERATORS diff --git a/src/TortoiseProc/BrowseRefsDlg.cpp b/src/TortoiseProc/BrowseRefsDlg.cpp index 4f403b22f..7c67b3faf 100644 --- a/src/TortoiseProc/BrowseRefsDlg.cpp +++ b/src/TortoiseProc/BrowseRefsDlg.cpp @@ -1309,6 +1309,16 @@ BOOL CBrowseRefsDlg::PreTranslateMessage(MSG* pMsg) Refresh(); } break; + case L'E': + { + if (GetAsyncKeyState(VK_CONTROL) & 0x8000) + { + m_ctrlFilter.SetSel(0, -1, FALSE); + m_ctrlFilter.SetFocus(); + return TRUE; + } + } + break; } } diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp index 0d179cc45..e3149f429 100644 --- a/src/TortoiseProc/LogDlg.cpp +++ b/src/TortoiseProc/LogDlg.cpp @@ -178,6 +178,7 @@ BEGIN_MESSAGE_MAP(CLogDlg, CResizableStandAloneDialog) ON_COMMAND(ID_GO_FORWARD_SELECT, &CLogDlg::GoForwardAndSelect) ON_COMMAND(ID_GO_BACKWARD, &CLogDlg::GoBack) ON_COMMAND(ID_GO_FORWARD, &CLogDlg::GoForward) + ON_COMMAND(ID_SELECT_SEARCHFIELD, &CLogDlg::OnSelectSearchField) ON_COMMAND(ID_LOGDLG_FIND, &CLogDlg::OnFind) ON_COMMAND(ID_LOGDLG_FOCUSFILTER, &CLogDlg::OnFocusFilter) ON_COMMAND(ID_EDIT_COPY, &CLogDlg::OnEditCopy) @@ -1057,6 +1058,12 @@ void CLogDlg::OnSizing(UINT fwSide, LPRECT pRect) m_patchViewdlg.MoveWindow(patchrect); } +void CLogDlg::OnSelectSearchField() +{ + m_cFilter.SetSel(0, -1, FALSE); + m_cFilter.SetFocus(); +} + void CLogDlg::GoBack() { GoBackForward(false, false); diff --git a/src/TortoiseProc/LogDlg.h b/src/TortoiseProc/LogDlg.h index 934b34764..fca6de10e 100644 --- a/src/TortoiseProc/LogDlg.h +++ b/src/TortoiseProc/LogDlg.h @@ -109,6 +109,7 @@ protected: afx_msg void OnLvnItemchangedLogmsg(NMHDR *pNMHDR, LRESULT *pResult); afx_msg void OnEnLinkMsgview(NMHDR *pNMHDR, LRESULT *pResult); afx_msg void OnBnClickedStatbutton(); + afx_msg void OnSelectSearchField(); afx_msg void OnNMCustomdrawChangedFileList(NMHDR *pNMHDR, LRESULT *pResult); afx_msg void OnLvnGetdispinfoChangedFileList(NMHDR *pNMHDR, LRESULT *pResult); diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h index bc495c4bf..e5cbed1a4 100644 --- a/src/TortoiseProc/resource.h +++ b/src/TortoiseProc/resource.h @@ -1980,13 +1980,14 @@ #define ID_GO_DOWN 32870 #define ID_GO_BACKWARD_SELECT 32871 #define ID_GO_FORWARD_SELECT 32872 +#define ID_SELECT_SEARCHFIELD 32873 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 358 -#define _APS_NEXT_COMMAND_VALUE 32873 +#define _APS_NEXT_COMMAND_VALUE 32874 #define _APS_NEXT_CONTROL_VALUE 1827 #define _APS_NEXT_SYMED_VALUE 201 #endif -- 2.11.4.GIT