X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/a5473c0cf255b5846ad85eebc043ebb6551e72d0..136e2ae3d75677ec008e7b5973b8e73bc38e9530:/src/dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 19e01cb90..6db79452c 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -753,8 +753,6 @@ void DolphinView::setShowPreview(bool show)
     // As the view does not emit a signal when the icon size has been changed,
     // the used zoom level of the controller must be adjusted manually:
     updateZoomLevel(oldZoomLevel);
-
-    loadDirectory(viewPropsUrl);
 }
 
 void DolphinView::setShowHiddenFiles(bool show)
@@ -769,8 +767,6 @@ void DolphinView::setShowHiddenFiles(bool show)
 
     m_viewAccessor.dirLister()->setShowingDotFiles(show);
     emit showHiddenFilesChanged();
-
-    loadDirectory(viewPropsUrl);
 }
 
 void DolphinView::setCategorizedSorting(bool categorized)
@@ -1237,7 +1233,7 @@ void DolphinView::applyViewProperties()
         createView();
     }
     Q_ASSERT(m_viewAccessor.itemView() != 0);
-    Q_ASSERT(m_fileItemDelegate != 0);
+    Q_ASSERT(m_viewAccessor.itemDelegate() != 0);
 
     const bool showHiddenFiles = props.showHiddenFiles();
     if (showHiddenFiles != m_viewAccessor.dirLister()->showingDotFiles()) {
@@ -1306,7 +1302,7 @@ void DolphinView::createView()
     Q_ASSERT(view != 0);
     view->installEventFilter(this);
     view->viewport()->installEventFilter(this);
-    setFocusProxy(view);
+
 
     /* TODO: enable folder expanding again later
 
@@ -1361,6 +1357,7 @@ void DolphinView::createView()
     connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)),
             this, SLOT(emitContentsMoved()));
 
+    setFocusProxy(m_viewAccessor.layoutTarget());
     m_topLayout->insertWidget(1, m_viewAccessor.layoutTarget());
 }