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

Fix displayed file name when searching directory ending with '/'.

Browse Source 
Task-number: QTCREATORBUG-6119

Change-Id: I894da0f77e484fe0785ece8039f46233e05c5c91
Reviewed-on: http://codereview.qt-project.org/5063
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
This commit is contained in:
Eike Ziller
2011-09-16 09:28:20 +02:00
parent d52d4ccd93
commit a4570dec9f
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/projectexplorer/allprojectsfind.cpp
View File

@@ -124,6 +124,7 @@ QString AllProjectsFind::label() const
QString AllProjectsFind::toolTip() const QString AllProjectsFind::toolTip() const
{ {
// %2 is filled by BaseFileFind::runNewSearch
return tr("Filter: %1\n%2").arg(fileNameFilters().join(QLatin1String(","))); return tr("Filter: %1\n%2").arg(fileNameFilters().join(QLatin1String(",")));
} }

1
src/plugins/texteditor/findincurrentfile.cpp
View File

@@ -84,6 +84,7 @@ QString FindInCurrentFile::label() const
QString FindInCurrentFile::toolTip() const QString FindInCurrentFile::toolTip() const
{ {
// %2 is filled by BaseFileFind::runNewSearch
return tr("File path: %1\n%2").arg(QDir::toNativeSeparators(m_currentFile->fileName())); return tr("File path: %1\n%2").arg(QDir::toNativeSeparators(m_currentFile->fileName()));
} }

11
src/plugins/texteditor/findinfiles.cpp
View File

@@ -70,19 +70,24 @@ void FindInFiles::findAll(const QString &txt, Find::FindFlags findFlags)
Utils::FileIterator *FindInFiles::files() const Utils::FileIterator *FindInFiles::files() const
{ {
return new Utils::SubDirFileIterator(QStringList() << m_directory->currentText(), return new Utils::SubDirFileIterator(QStringList() << QDir::fromNativeSeparators(m_directory->currentText()),
fileNameFilters(), fileNameFilters(),
Core::EditorManager::instance()->defaultTextCodec()); Core::EditorManager::instance()->defaultTextCodec());
} }
QString FindInFiles::label() const QString FindInFiles::label() const
{ {
return tr("Directory '%1':").arg(QFileInfo(m_directory->currentText()).fileName()); const QStringList &nonEmptyComponents = QDir::cleanPath(
QFileInfo(QDir::fromNativeSeparators(m_directory->currentText())).absoluteFilePath())
.split(QLatin1Char('/'), QString::SkipEmptyParts);
return tr("Directory '%1':").arg(nonEmptyComponents.isEmpty() ? "/" : nonEmptyComponents.last());
} }
QString FindInFiles::toolTip() const QString FindInFiles::toolTip() const
{ {
return tr("Path: %1\nFilter: %2\n%3").arg(QFileInfo(m_directory->currentText()).absoluteFilePath()) // %3 is filled by BaseFileFind::runNewSearch
return tr("Path: %1\nFilter: %2\n%3")
.arg(QDir::toNativeSeparators(QFileInfo(m_directory->currentText()).absoluteFilePath()))
.arg(fileNameFilters().join(QLatin1String(","))); .arg(fileNameFilters().join(QLatin1String(",")));
} }