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

CurrentProjectFind: Correct enabled/disable logic

Browse Source 
Task-number: QTCREATORBUG-8556

Change-Id: Ic542ac518656e2edf9c3cb17b2960238aa467a9d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
Daniel Teske
2013-02-12 18:37:14 +01:00
committed by David Schulz
parent ea0d68f7d4
commit 4b807bb78a
5 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/texteditor/basefilefind.cpp
View File

@@ -137,7 +137,9 @@ void BaseFileFind::runNewSearch(const QString &txt, Find::FindFlags findFlags,
connect(search, SIGNAL(cancelled()), this, SLOT(cancel()));
connect(search, SIGNAL(paused(bool)), this, SLOT(setPaused(bool)));
connect(search, SIGNAL(searchAgainRequested()), this, SLOT(searchAgain()));
connect(this, SIGNAL(enabledChanged(bool)), search, SLOT(setSearchAgainEnabled(bool)));
connect(this, SIGNAL(enabledChanged(bool)), search, SIGNAL(requestEnabledCheck()));
connect(search, SIGNAL(requestEnabledCheck()), this, SLOT(recheckEnabled()));
runSearch(search);
}
@@ -329,6 +331,14 @@ void BaseFileFind::searchAgain()
runSearch(search);
}
void BaseFileFind::recheckEnabled()
{
SearchResult *search = qobject_cast<SearchResult *>(sender());
if (!search)
return;
search->setSearchAgainEnabled(isEnabled());
}
QStringList BaseFileFind::replaceAll(const QString &text,
const QList<Find::SearchResultItem> &items,
bool preserveCase)
@@ -380,6 +390,11 @@ QStringList BaseFileFind::replaceAll(const QString &text,
return changes.keys();
}
QVariant BaseFileFind::getAdditionalParameters(SearchResult *search)
{
return search->userData().value<FileFindParameters>().additionalParameters;
}
CountingLabel::CountingLabel()
{
setAlignment(Qt::AlignCenter);