From d4103e8ecbbb6dc27d662460289314b1cc777c4c Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Tue, 25 Sep 2007 12:03:57 +0000 Subject: [PATCH] * the directory lister must be updated when reloading columns * ignore trailing slashes when comparing URLs svn path=/trunk/KDE/kdebase/apps/; revision=716858 --- src/dolphincolumnview.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp index 119888f2d..381a795e1 100644 --- a/src/dolphincolumnview.cpp +++ b/src/dolphincolumnview.cpp @@ -757,7 +757,9 @@ void DolphinColumnView::expandToActiveUrl() Q_ASSERT(lastIndex >= 0); const KUrl& activeUrl = m_columns[lastIndex]->url(); const KUrl rootUrl = m_dolphinModel->dirLister()->url(); - if (rootUrl.isParentOf(activeUrl) && (rootUrl != activeUrl)) { + const bool expand = rootUrl.isParentOf(activeUrl) + && !rootUrl.equals(activeUrl, KUrl::CompareWithoutTrailingSlash); + if (expand) { m_dolphinModel->expandToUrl(activeUrl); reloadColumns(); } @@ -775,6 +777,10 @@ void DolphinColumnView::reloadColumns() const int end = m_columns.count() - 2; // next to last column for (int i = 0; i <= end; ++i) { ColumnWidget* nextColumn = m_columns[i + 1]; + + KDirLister* dirLister = m_dolphinModel->dirLister(); + dirLister->updateDirectory(nextColumn->url()); + const QModelIndex rootIndex = nextColumn->rootIndex(); if (rootIndex.isValid()) { nextColumn->show(); -- 2.47.3