kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

* the directory lister must be updated when reloading columns

Browse source 
* ignore trailing slashes when comparing URLs

svn path=/trunk/KDE/kdebase/apps/; revision=716858
This commit is contained in:
Peter Penz 2007-09-25 12:03:57 +00:00
parent e0c795a529
commit d4103e8ecb
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/dolphincolumnview.cpp
View file

@ -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();