SVN_SILENT: removed commented codephin with the column view a wrong layout has been...

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 6f36d1655a66192e5c24a8d48eb5006981baffcd..c0d700eb5999b33526685b8a16053aa1f3506521 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -156,7 +156,7 @@ DolphinView::DolphinView(QWidget* parent,
             this, SLOT(emitSelectionChangedSignal()));
 
     applyViewProperties();
-    m_topLayout->addWidget(m_viewAccessor.itemView());
+    m_topLayout->addWidget(m_viewAccessor.layoutTarget());
 }
 
 DolphinView::~DolphinView()
@@ -222,6 +222,10 @@ void DolphinView::setMode(Mode mode)
     const int oldZoomLevel = m_controller->zoomLevel();
     m_mode = mode;
 
+    // remember the currently selected items, so that they will
+    // be restored after reloading the directory
+    m_selectedItems = selectedItems();
+
     deleteView();
 
     const KUrl viewPropsUrl = rootUrl();
@@ -248,9 +252,7 @@ void DolphinView::setMode(Mode mode)
     emit modeChanged();
 
     updateZoomLevel(oldZoomLevel);
-    if (m_showPreview) {
-        loadDirectory(viewPropsUrl);
-    }
+    loadDirectory(viewPropsUrl);
 }
 
 DolphinView::Mode DolphinView::mode() const