kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-19 16:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

If the root directory lister is different from the internally used directory lister (e. g. in the column view), it is important to synchronize them.

Browse source 
This fixes the issue that the enabled state of the "Create New..." menu in the column view has not been updated.

BUG: 222329

svn path=/trunk/KDE/kdebase/apps/; revision=1074441
This commit is contained in:
Peter Penz 2010-01-14 07:43:14 +00:00
parent a0d3cf4aa8
commit d3ee535749
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/dolphinview.cpp
View file

@ -1269,7 +1269,16 @@ void DolphinView::loadDirectory(const KUrl& url, bool reload)
m_loadingDirectory = true;
m_expanderActive = false;
m_viewAccessor.dirLister()->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
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()
@ -1532,7 +1541,7 @@ void DolphinView::ViewAccessor::prepareUrlChange(const KUrl& url)
}
if(!m_detailsViewExpander.isNull()) {
// Stop expanding items in the current folder
// stop expanding items in the current folder
m_detailsViewExpander->stop();
}
}
@ -1572,6 +1581,11 @@ 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;
@ -1585,17 +1599,16 @@ bool DolphinView::ViewAccessor::itemsExpandable() const
QSet<KUrl> DolphinView::ViewAccessor::expandedUrls() const
{
if(m_detailsView != 0) {
if (m_detailsView != 0) {
return m_detailsView->expandedUrls();
}
else {
return QSet<KUrl>();
}
return QSet<KUrl>();
}
const DolphinDetailsViewExpander* DolphinView::ViewAccessor::setExpandedUrls(const QSet<KUrl>& urlsToExpand)
{
if((m_detailsView != 0) && m_detailsView->itemsExpandable() && !urlsToExpand.isEmpty()) {
if ((m_detailsView != 0) && m_detailsView->itemsExpandable() && !urlsToExpand.isEmpty()) {
m_detailsViewExpander = new DolphinDetailsViewExpander(m_detailsView, urlsToExpand);
return m_detailsViewExpander;
}

1
src/dolphinview.h
View file

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