feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Move advanced search dialog into search result pane.

Browse Source 
And move the cancel button into the specific search result widget.

Change-Id: Ide8173e1ec5de091e1c1332a2b0c47d9a30a4c87
Reviewed-on: http://codereview.qt-project.org/4555
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Eike Ziller
2011-09-09 08:46:51 +02:00
parent 5990b039e8
commit 1e47de1416
18 changed files with 247 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/find/findplugin.cpp
View File

@@ -136,7 +136,7 @@ bool FindPlugin::initialize(const QStringList &, QString *)
d->m_findToolBar = new Internal::FindToolBar(this, d->m_currentDocumentFind);
d->m_findDialog = new Internal::FindToolWindow(this);
SearchResultWindow *searchResultWindow = new SearchResultWindow;
SearchResultWindow *searchResultWindow = new SearchResultWindow(d->m_findDialog);
addAutoReleasedObject(searchResultWindow);
return true;
}
@@ -178,12 +178,7 @@ void FindPlugin::openFindFilter()
QAction *action = qobject_cast<QAction*>(sender());
QTC_ASSERT(action, return);
IFindFilter *filter = action->data().value<IFindFilter *>();
if (d->m_currentDocumentFind->candidateIsEnabled())
d->m_currentDocumentFind->acceptCandidate();
QString currentFindString = (d->m_currentDocumentFind->isEnabled() ? d->m_currentDocumentFind->currentFindString() : "");
if (!currentFindString.isEmpty())
d->m_findDialog->setFindText(currentFindString);
d->m_findDialog->open(filter);
openFindDialog(filter);
}
void FindPlugin::openFindDialog(IFindFilter *filter)
@@ -193,7 +188,8 @@ void FindPlugin::openFindDialog(IFindFilter *filter)
QString currentFindString = (d->m_currentDocumentFind->isEnabled() ? d->m_currentDocumentFind->currentFindString() : "");
if (!currentFindString.isEmpty())
d->m_findDialog->setFindText(currentFindString);
d->m_findDialog->open(filter);
d->m_findDialog->setCurrentFilter(filter);
SearchResultWindow::instance()->openNewSearchPanel();
}
void FindPlugin::setupMenu()