From 979a1a7087edd85076d2473940ad0eaf584196c8 Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@nokia.com>
Date: Tue, 22 Jun 2010 15:36:39 +0200
Subject: [PATCH] Fixed display of root path and Windows paths in
FolderNavigationWidget.
---
src/plugins/projectexplorer/foldernavigationwidget.cpp | 7 +++++--
src/plugins/projectexplorer/foldernavigationwidget.h | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp
index 0c25e7adf48..46afd75f2c9 100644
--- a/src/plugins/projectexplorer/foldernavigationwidget.cpp
+++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp
@@ -230,7 +230,8 @@ bool FolderNavigationWidget::setCurrentDirectory(const QString &directory)
}
m_listView->setRootIndex(m_filterModel->mapFromSource(index));
const QDir current(QDir::cleanPath(newDirectory));
- setCurrentTitle(current.dirName(), current.absolutePath());
+ setCurrentTitle(current.dirName(),
+ QDir::toNativeSeparators(current.absolutePath()));
return !directory.isEmpty();
}
@@ -267,8 +268,10 @@ void FolderNavigationWidget::openItem(const QModelIndex &srcIndex)
editorManager->openEditor(m_fileSystemModel->filePath(srcIndex));
}
-void FolderNavigationWidget::setCurrentTitle(const QString &dirName, const QString &fullPath)
+void FolderNavigationWidget::setCurrentTitle(QString dirName, const QString &fullPath)
{
+ if (dirName.isEmpty())
+ dirName = fullPath;
m_title->setText(dirName);
m_title->setToolTip(fullPath);
}
diff --git a/src/plugins/projectexplorer/foldernavigationwidget.h b/src/plugins/projectexplorer/foldernavigationwidget.h
index 2f15ad8e07a..e0930394c53 100644
--- a/src/plugins/projectexplorer/foldernavigationwidget.h
+++ b/src/plugins/projectexplorer/foldernavigationwidget.h
@@ -81,7 +81,7 @@ protected:
virtual void contextMenuEvent(QContextMenuEvent *ev);
private:
- void setCurrentTitle(const QString &dirName, const QString &fullPath);
+ void setCurrentTitle(QString dirName, const QString &fullPath);
bool setCurrentDirectory(const QString &directory);
void openItem(const QModelIndex &srcIndex);
QModelIndex currentItem() const;
--
GitLab