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

Forward port of SVN commit 1096089: Fix regression that columns stay empty when switching between URLs that differ by more than one sub directory. Thanks to Frank Reininghaus for the analysis.

Browse source 
CCBUG: 227785
CCBUG: 227748

svn path=/trunk/KDE/kdebase/apps/; revision=1096093
This commit is contained in:
Peter Penz 2010-02-25 19:36:36 +00:00
parent e488496286
commit df6bc98ded
4 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/dolphincolumnview.cpp
View file

@ -134,7 +134,10 @@ DolphinColumnView::DolphinColumnView(QWidget* parent,
}
updateDecorationSize(dolphinView->showPreview());
updateBackground();
m_extensionsFactory = new ViewExtensionsFactory(this, controller);
m_dirLister->openUrl(url, KDirLister::NoFlags);
}
DolphinColumnView::~DolphinColumnView()

2
src/dolphincolumnviewcontainer.cpp
View file

@ -160,8 +160,6 @@ void DolphinColumnViewContainer::showColumn(const KUrl& url)
columnIndex++;
DolphinColumnView* column = new DolphinColumnView(viewport(), this, childUrl);
column->setActive(false);
m_columns.append(column);
// Before invoking layoutColumns() the column must be set visible temporary.

13
src/dolphinview.cpp
View file

@ -1211,14 +1211,6 @@ void DolphinView::loadDirectory(const KUrl& url, bool reload)
KDirLister* dirLister = m_viewAccessor.dirLister();
dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
KDirLister* rootDirLister = m_viewAccessor.rootDirLister();
if (dirLister != rootDirLister) {
// In the case of the column view the root directory lister can be different. Assure
// that it gets synchronized (clients from DolphinView are not aware that internally
// different directory listers are used).
rootDirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
}
}
void DolphinView::applyViewProperties()
@ -1507,11 +1499,6 @@ KUrl DolphinView::ViewAccessor::rootUrl() const
return (m_columnsContainer != 0) ? m_columnsContainer->rootUrl() : KUrl();
}
KDirLister* DolphinView::ViewAccessor::rootDirLister() const
{
return static_cast<DolphinModel*>(m_proxyModel->sourceModel())->dirLister();
}
bool DolphinView::ViewAccessor::supportsCategorizedSorting() const
{
return m_iconsView != 0;

1
src/dolphinview.h
View file

@ -747,7 +747,6 @@ private:
QWidget* layoutTarget() const;
KUrl rootUrl() const;
KDirLister* rootDirLister() const;
bool supportsCategorizedSorting() const;
bool itemsExpandable() const;