Forward port of SVN commit 1096089: Fix regression that columns stay empty when switc...

CCBUG: 227785
CCBUG: 227748

svn path=/trunk/KDE/kdebase/apps/; revision=1096093

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 6d265c01fac932c910a9a749b10da09f570a7b20..c89a645debc6f4b707be14e7cd5ad62b823c28ea 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -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()

diff --git a/src/dolphincolumnviewcontainer.cpp b/src/dolphincolumnviewcontainer.cpp
index 83940711758ab976876c02dd10e8f7b66635831f..6f1418436590928f9801c9f8a7cba83a3b7692ef 100644 (file)
--- a/src/dolphincolumnviewcontainer.cpp
+++ b/src/dolphincolumnviewcontainer.cpp
@@ -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.

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 2fa351b3256ed443d17e60e433acaec773e5c6f7..c5f6c91d391e4dd01f54c30d61bdcf461709b742 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -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;

diff --git a/src/dolphinview.h b/src/dolphinview.h
index a00e5427b1b5c7f4c5d075da222a6057451fba13..cab9fa56026bda83604ccf83d4a9e6ed8820a3f5 100644 (file)
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -747,7 +747,6 @@ private:
         QWidget* layoutTarget() const;
 
         KUrl rootUrl() const;
-        KDirLister* rootDirLister() const;
 
         bool supportsCategorizedSorting() const;
         bool itemsExpandable() const;