Never ignore the view-properties if "Use common view properties for all folders"...

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

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 00751bf771168e0cd8332d761649b41838b5c3b5..d4f489615cfc6853c5f5e4850b2a3e7f7015032b 100644 (file)
--- 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 4877b0cd26c9630c58a773a1da679b8263f90e6c..6a5d1089899cb3942330f3b24bc3180e9ed0754c 100644 (file)
--- 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;