diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-02-07 23:35:41 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2016-02-10 13:10:17 +0000 |
| commit | 84f2875f6d410588bd01f1d3a573b1ec0f02ef3c (patch) | |
| tree | 8e109ec2e949f2cb9fb4998f891b296a9cfc5324 /src/plugins/texteditor/basefilefind.cpp | |
| parent | fcdb286cece402be3c1498b79ac20d6b5c69f428 (diff) | |
Git: Support tree argument for Grep
Change-Id: Ic7dfcd8bad98223d68725f1a0c1f103ad8ea4e0f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/texteditor/basefilefind.cpp')
| -rw-r--r-- | src/plugins/texteditor/basefilefind.cpp | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index bb8c9f2f1c..facac8a9c0 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -140,8 +140,11 @@ void BaseFileFind::runNewSearch(const QString &txt, FindFlags findFlags, d->m_currentFindSupport = 0; if (d->m_filterCombo) updateComboEntries(d->m_filterCombo, true); + QString tooltip = toolTip(); + if (d->m_extension) + tooltip = tooltip.arg(d->m_extension->toolTip()); SearchResult *search = SearchResultWindow::instance()->startNewSearch(label(), - toolTip().arg(IFindFilter::descriptionForFindFlags(findFlags)), + tooltip.arg(IFindFilter::descriptionForFindFlags(findFlags)), txt, searchMode, SearchResultWindow::PreserveCaseEnabled, QString::fromLatin1("TextEditor")); search->setTextToReplace(txt); @@ -320,14 +323,19 @@ void BaseFileFind::updateComboEntries(QComboBox *combo, bool onTop) void BaseFileFind::openEditor(const SearchResultItem &item) { SearchResult *result = qobject_cast<SearchResult *>(sender()); + FileFindParameters parameters = result->userData().value<FileFindParameters>(); IEditor *openedEditor = 0; - if (item.path.size() > 0) { - openedEditor = EditorManager::openEditorAt(QDir::fromNativeSeparators(item.path.first()), - item.lineNumber, - item.textMarkPos, Id(), - EditorManager::DoNotSwitchToDesignMode); - } else { - openedEditor = EditorManager::openEditor(QDir::fromNativeSeparators(item.text)); + if (d->m_extension) + openedEditor = d->m_extension->openEditor(item, parameters); + if (!openedEditor) { + if (item.path.size() > 0) { + openedEditor = EditorManager::openEditorAt(QDir::fromNativeSeparators(item.path.first()), + item.lineNumber, + item.textMarkPos, Id(), + EditorManager::DoNotSwitchToDesignMode); + } else { + openedEditor = EditorManager::openEditor(QDir::fromNativeSeparators(item.text)); + } } if (d->m_currentFindSupport) d->m_currentFindSupport->clearHighlights(); @@ -336,11 +344,8 @@ void BaseFileFind::openEditor(const SearchResultItem &item) return; // highlight results if (IFindSupport *findSupport = Aggregation::query<IFindSupport>(openedEditor->widget())) { - if (result) { - FileFindParameters parameters = result->userData().value<FileFindParameters>(); - d->m_currentFindSupport = findSupport; - d->m_currentFindSupport->highlightAll(parameters.text, parameters.flags); - } + d->m_currentFindSupport = findSupport; + d->m_currentFindSupport->highlightAll(parameters.text, parameters.flags); } } |