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

Find: Fix Current Project find to fall back to startup project

Browse Source 
If no files are open.

Change-Id: I78f695fbc128c0e4dc093ac2afef6b68ea20ba93
Task-number: QTCREATORBUG-13998
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Daniel Teske
2015-02-26 15:43:07 +01:00
parent 5a05255f05
commit 9d1b6e6e61
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/projectexplorer/currentprojectfind.cpp
View File

@@ -44,6 +44,14 @@ using namespace ProjectExplorer;
using namespace ProjectExplorer::Internal; using namespace ProjectExplorer::Internal;
using namespace TextEditor; using namespace TextEditor;
static Project *currentProject()
{
Project *p = ProjectTree::currentProject();
if (p)
return p;
return SessionManager::startupProject();
}
CurrentProjectFind::CurrentProjectFind() CurrentProjectFind::CurrentProjectFind()
{ {
connect(ProjectTree::instance(), &ProjectTree::currentProjectChanged, connect(ProjectTree::instance(), &ProjectTree::currentProjectChanged,
@@ -68,12 +76,12 @@ QString CurrentProjectFind::displayName() const
bool CurrentProjectFind::isEnabled() const bool CurrentProjectFind::isEnabled() const
{ {
return ProjectTree::currentProject() != 0 && BaseFileFind::isEnabled(); return currentProject() != 0 && BaseFileFind::isEnabled();
} }
QVariant CurrentProjectFind::additionalParameters() const QVariant CurrentProjectFind::additionalParameters() const
{ {
Project *project = ProjectTree::currentProject(); Project *project = currentProject();
if (project && project->document()) if (project && project->document())
return qVariantFromValue(project->projectFilePath().toString()); return qVariantFromValue(project->projectFilePath().toString());
return QVariant(); return QVariant();
@@ -94,8 +102,9 @@ Utils::FileIterator *CurrentProjectFind::files(const QStringList &nameFilters,
QString CurrentProjectFind::label() const QString CurrentProjectFind::label() const
{ {
QTC_ASSERT(ProjectTree::currentProject(), return QString()); Project *p = currentProject();
return tr("Project \"%1\":").arg(ProjectTree::currentProject()->displayName()); QTC_ASSERT(p, return QString());
return tr("Project \"%1\":").arg(p->displayName());
} }
void CurrentProjectFind::handleProjectChanged() void CurrentProjectFind::handleProjectChanged()