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

Fixed display of root path and Windows paths in FolderNavigationWidget.

Browse Source
This commit is contained in:
Robert Loehning
2010-06-22 15:36:39 +02:00
parent bfa80c41a9
commit 979a1a7087
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/projectexplorer/foldernavigationwidget.cpp
View File

@@ -230,7 +230,8 @@ bool FolderNavigationWidget::setCurrentDirectory(const QString &directory)
} }
m_listView->setRootIndex(m_filterModel->mapFromSource(index)); m_listView->setRootIndex(m_filterModel->mapFromSource(index));
const QDir current(QDir::cleanPath(newDirectory)); const QDir current(QDir::cleanPath(newDirectory));
setCurrentTitle(current.dirName(), current.absolutePath()); setCurrentTitle(current.dirName(),
QDir::toNativeSeparators(current.absolutePath()));
return !directory.isEmpty(); return !directory.isEmpty();
} }
@@ -267,8 +268,10 @@ void FolderNavigationWidget::openItem(const QModelIndex &srcIndex)
editorManager->openEditor(m_fileSystemModel->filePath(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->setText(dirName);
m_title->setToolTip(fullPath); m_title->setToolTip(fullPath);
} }

2
src/plugins/projectexplorer/foldernavigationwidget.h
View File

@@ -81,7 +81,7 @@ protected:
virtual void contextMenuEvent(QContextMenuEvent *ev); virtual void contextMenuEvent(QContextMenuEvent *ev);
private: private:
void setCurrentTitle(const QString &dirName, const QString &fullPath); void setCurrentTitle(QString dirName, const QString &fullPath);
bool setCurrentDirectory(const QString &directory); bool setCurrentDirectory(const QString &directory);
void openItem(const QModelIndex &srcIndex); void openItem(const QModelIndex &srcIndex);
QModelIndex currentItem() const; QModelIndex currentItem() const;