From 54bed74549d4366aaedb035c370bf0ed331d4922 Mon Sep 17 00:00:00 2001 From: Adam Strzelecki Date: Thu, 3 Apr 2014 18:06:27 +0200 Subject: [PATCH] Make Enter Find String enabled regardless of Find Previously Enter Find String (Ctrl+E) required opening Find toolbar at least once, which is minor but noticeable annoyance. With this change it always opens Find without focus, so it lines up with Find Next Selected behavior and also with default Mac behavior. It does also show yellow highlight for all occurrences without moving cursor. Task-number: QTCREATORBUG-8993 Change-Id: I1eb8f151d5482895cc49fa5281e7d4e66cf31545 Reviewed-by: Eike Ziller --- src/plugins/coreplugin/find/findtoolbar.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp index 2d2e0d4595d..01965ef654d 100644 --- a/src/plugins/coreplugin/find/findtoolbar.cpp +++ b/src/plugins/coreplugin/find/findtoolbar.cpp @@ -353,6 +353,8 @@ void FindToolBar::updateFindAction() m_findInDocumentAction->setEnabled(enabled); m_findNextSelectedAction->setEnabled(enabled); m_findPreviousSelectedAction->setEnabled(enabled); + if (QApplication::clipboard()->supportsFindBuffer()) + m_enterFindStringAction->setEnabled(enabled); } void FindToolBar::updateToolBar() @@ -371,8 +373,6 @@ void FindToolBar::updateToolBar() m_wholeWordAction->setEnabled(enabled); m_regularExpressionAction->setEnabled(enabled); m_preserveCaseAction->setEnabled(replaceEnabled && !hasFindFlag(FindRegularExpression)); - if (QApplication::clipboard()->supportsFindBuffer()) - m_enterFindStringAction->setEnabled(enabled); bool replaceFocus = m_ui.replaceEdit->hasFocus(); m_ui.findEdit->setEnabled(enabled); m_ui.findLabel->setEnabled(enabled); @@ -529,6 +529,7 @@ void FindToolBar::invokeResetIncrementalSearch() void FindToolBar::putSelectionToFindClipboard() { + openFind(false); const QString text = m_currentDocumentFind->currentFindString(); QApplication::clipboard()->setText(text, QClipboard::FindBuffer); setFindText(text);