From bfdc7b4fa21a08a821cbd5d873798d16c6025809 Mon Sep 17 00:00:00 2001
From: Peter Penz <peter.penz19@gmail.com>
Date: Sat, 4 Sep 2010 15:31:01 +0000
Subject: [PATCH] Never ignore the view-properties if "Use common view
 properties for all folders" has been set, otherwise the view-properties
 switch when searching files won't work. Originally this flag has been
 introduced when working with a split view, however I consider the behavior to
 always respect the view-properties when changing a folder more consistent
 anyway.

svn path=/trunk/KDE/kdebase/apps/; revision=1171589
---
 src/views/dolphinview.cpp | 14 --------------
 src/views/dolphinview.h   |  1 -
 2 files changed, 15 deletions(-)

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 00751bf77..d4f489615 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -86,7 +86,6 @@ DolphinView::DolphinView(QWidget* parent,
     m_storedCategorizedSorting(false),
     m_tabsForFiles(false),
     m_isContextMenuOpen(false),
-    m_ignoreViewProperties(false),
     m_assureVisibleCurrentIndex(false),
     m_mode(DolphinView::IconsView),
     m_topLayout(0),
@@ -440,8 +439,6 @@ void DolphinView::reload()
 
 void DolphinView::refresh()
 {
-    m_ignoreViewProperties = false;
-
     const bool oldActivationState = m_active;
     const int oldZoomLevel = m_viewModeController->zoomLevel();
     m_active = true;
@@ -1192,10 +1189,6 @@ void DolphinView::loadDirectory(const KUrl& url, bool reload)
 
 void DolphinView::applyViewProperties()
 {
-    if (m_ignoreViewProperties) {
-        return;
-    }
-
     const ViewProperties props(rootUrl());
 
     const Mode mode = props.viewMode();
@@ -1262,13 +1255,6 @@ void DolphinView::applyViewProperties()
         // the used zoom level of the controller must be adjusted manually:
         updateZoomLevel(oldZoomLevel);
     }
-
-    if (DolphinSettings::instance().generalSettings()->globalViewProps()) {
-        // During the lifetime of a DolphinView instance the global view properties
-        // should not be changed. This allows e. g. to split a view and use different
-        // view properties for each view.
-        m_ignoreViewProperties = true;
-    }
 }
 
 void DolphinView::createView()
diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 4877b0cd2..6a5d10898 100644
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -783,7 +783,6 @@ private:
     bool m_storedCategorizedSorting : 1;
     bool m_tabsForFiles : 1;
     bool m_isContextMenuOpen : 1;   // TODO: workaround for Qt-issue 207192
-    bool m_ignoreViewProperties : 1;
     bool m_assureVisibleCurrentIndex : 1;
     bool m_expanderActive : 1;
 
-- 
2.47.3