- Performance optimization in DolphinView::loadDirectory() (don't store the view...

[dolphin.git] / src / viewproperties.cpp

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index d099b3b22d48e244ba8eed9cd030f599e793677f..cd66519fd1dde40aa4a620a757f83c2f1a8a294f 100644 (file)
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -20,9 +20,8 @@
 
 #include <assert.h>
 
-#include <qdatetime.h>
-#include <qdir.h>
-#include <qfile.h>
+#include <QDateTime>
+#include <QFile>
 
 #include <klocale.h>
 #include <kstandarddirs.h>
@@ -30,8 +29,8 @@
 #include <kinstance.h>
 
 #include "viewproperties.h"
-
 #include "dolphinsettings.h"
+#include "generalsettings.h"
 
 #define FILE_NAME "/.directory"
 
@@ -50,9 +49,9 @@ ViewProperties::ViewProperties(const KUrl& url) :
         return;
     }
 
-    // we try and save it to a file 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
+    // We try and save it to a file 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.
     QString rootDir("/"); // TODO: should this be set to the root of the bookmark, if any?
     if (cleanUrl.isLocalFile()) {
         QFileInfo info(m_filepath);
@@ -97,7 +96,21 @@ DolphinView::Mode ViewProperties::viewMode() const
     return static_cast<DolphinView::Mode>(m_node->viewMode());
 }
 
-void ViewProperties::setShowHiddenFilesEnabled(bool show)
+void ViewProperties::setShowPreview(bool show)
+{
+    if (m_node->showPreview() != show) {
+        m_node->setShowPreview(show);
+        updateTimeStamp();
+    }
+}
+
+bool ViewProperties::showPreview() const
+{
+    return m_node->showPreview();
+}
+
+
+void ViewProperties::setShowHiddenFiles(bool show)
 {
     if (m_node->showHiddenFiles() != show) {
         m_node->setShowHiddenFiles(show);
@@ -105,7 +118,7 @@ void ViewProperties::setShowHiddenFilesEnabled(bool show)
     }
 }
 
-bool ViewProperties::isShowHiddenFilesEnabled() const
+bool ViewProperties::showHiddenFiles() const
 {
     return m_node->showHiddenFiles();
 }
@@ -154,9 +167,12 @@ void ViewProperties::updateTimeStamp()
 
 void ViewProperties::save()
 {
-    KStandardDirs::makeDir(m_filepath);
-    m_node->writeConfig();
-    m_changedProps = false;
+    const bool rememberSettings = !DolphinSettings::instance().generalSettings()->globalViewProps();
+    if (rememberSettings) {
+        KStandardDirs::makeDir(m_filepath);
+        m_node->writeConfig();
+        m_changedProps = false;
+    }
 }
 
 ViewProperties::ViewProperties(const ViewProperties& props)