From 8061c3fb90c787ae76b4d5e213cc7f84ba92f4a4 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Wed, 15 Dec 2010 16:40:32 +0000 Subject: [PATCH] If "Use common view properties for all folders" is checked, the optimized view-modes for trash and searching should be replaced by the common view properties too. BUG: 259894 FIXED-IN: 4.6.0 svn path=/trunk/KDE/kdebase/apps/; revision=1206728 --- src/views/viewproperties.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp index ed055e09e..0e50dcec7 100644 --- a/src/views/viewproperties.cpp +++ b/src/views/viewproperties.cpp @@ -49,19 +49,19 @@ ViewProperties::ViewProperties(const KUrl& url) : { GeneralSettings* settings = DolphinSettings::instance().generalSettings(); const bool useGlobalViewProps = settings->globalViewProps(); + bool useDetailsViewWithPath = false; // We try and save it to the file .directory in the directory being viewed. // If the directory is not writable by the user or the directory is not local, // we store the properties information in a local file. - bool useDetailsViewWithPath = false; - if (url.protocol().contains("search")) { + if (useGlobalViewProps) { + m_filePath = destinationDir("global"); + } else if (url.protocol().contains("search")) { m_filePath = destinationDir("search"); useDetailsViewWithPath = true; } else if (url.protocol() == QLatin1String("trash")) { m_filePath = destinationDir("trash"); useDetailsViewWithPath = true; - } else if (useGlobalViewProps) { - m_filePath = destinationDir("global"); } else if (url.isLocalFile()) { m_filePath = url.toLocalFile(); const QFileInfo info(m_filePath); -- 2.47.3