diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-09-16 09:28:20 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-09-20 12:01:51 +0200 |
| commit | a4570dec9fa451a024dc444d389cf63adb2abb0b (patch) | |
| tree | abc9a195db2a4546053ede613c049f3b405a0ea3 /src/plugins/texteditor | |
| parent | d52d4ccd93531e8438894e10ea804acbd7242334 (diff) | |
| download | qt-creator-a4570dec9fa451a024dc444d389cf63adb2abb0b.tar.gz | |
Fix displayed file name when searching directory ending with '/'.
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>
Diffstat (limited to 'src/plugins/texteditor')
| -rw-r--r-- | src/plugins/texteditor/findincurrentfile.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/texteditor/findinfiles.cpp | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/plugins/texteditor/findincurrentfile.cpp b/src/plugins/texteditor/findincurrentfile.cpp index 7da08853f2..087ce65429 100644 --- a/src/plugins/texteditor/findincurrentfile.cpp +++ b/src/plugins/texteditor/findincurrentfile.cpp @@ -84,6 +84,7 @@ QString FindInCurrentFile::label() const QString FindInCurrentFile::toolTip() const { + // %2 is filled by BaseFileFind::runNewSearch return tr("File path: %1\n%2").arg(QDir::toNativeSeparators(m_currentFile->fileName())); } diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp index baf0e6ca8d..9884211326 100644 --- a/src/plugins/texteditor/findinfiles.cpp +++ b/src/plugins/texteditor/findinfiles.cpp @@ -70,19 +70,24 @@ void FindInFiles::findAll(const QString &txt, Find::FindFlags findFlags) Utils::FileIterator *FindInFiles::files() const { - return new Utils::SubDirFileIterator(QStringList() << m_directory->currentText(), + return new Utils::SubDirFileIterator(QStringList() << QDir::fromNativeSeparators(m_directory->currentText()), fileNameFilters(), Core::EditorManager::instance()->defaultTextCodec()); } 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 { - 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(","))); } |