X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/17e8c553deaf66bb6dc844d6b31adc50db6ad401..b5cc2a6924cfd8f59611d3cec2edbb00a08b4ff1:/src/viewproperties.cpp

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index 24573c1c9..cf675f30a 100644
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
- *   Copyright (C) 2006 by Peter Penz                                      *
- *   peter.penz@gmx.at                                                     *
+ *   Copyright (C) 2006 by Peter Penz (<peter.penz@gmx.at>)                *
+ *   Copyright (C) 2006 by Aaron J. Seigo (<aseigo@kde.org>)               *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -31,7 +31,7 @@
 
 #include "viewproperties.h"
 #include "dolphinsettings.h"
-#include "generalsettings.h"
+#include "dolphin_generalsettings.h"
 
 #define FILE_NAME "/.directory"
 
@@ -52,7 +52,8 @@ ViewProperties::ViewProperties(const KUrl& url) :
     // 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.
-    const bool useGlobalViewProps = DolphinSettings::instance().generalSettings()->globalViewProps();
+    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    const bool useGlobalViewProps = settings->globalViewProps();
     if (useGlobalViewProps) {
         m_filepath = destinationDir("global");
     }
@@ -66,7 +67,24 @@ ViewProperties::ViewProperties(const KUrl& url) :
         m_filepath = destinationDir("remote") + m_filepath;
     }
 
-    m_node = new ViewPropertySettings(KSharedConfig::openConfig(m_filepath + FILE_NAME));
+    const QString file(m_filepath + FILE_NAME);
+    m_node = new ViewPropertySettings(KSharedConfig::openConfig(file));
+
+    const bool useDefaultProps = !useGlobalViewProps &&
+                                 (!QFileInfo(file).exists() ||
+                                  (m_node->timestamp() < settings->viewPropsTimestamp()));
+    if (useDefaultProps) {
+        // If the .directory file does not exist or the timestamp is too old,
+        // use the values from the global .directory file instead, which acts
+        // as default view for new folders in this case.
+        settings->setGlobalViewProps(true);
+
+        ViewProperties defaultProps(url);
+        setDirProperties(defaultProps);
+
+        settings->setGlobalViewProps(false);
+        m_changedProps = false;
+    }
 }
 
 ViewProperties::~ViewProperties()
@@ -177,19 +195,16 @@ void ViewProperties::save()
     m_changedProps = false;
 }
 
-QString ViewProperties::destinationDir(const QString& subDir) const
+KUrl ViewProperties::mirroredDirectory()
 {
     QString basePath = KGlobal::mainComponent().componentName();
-    basePath.append("/view_properties/").append(subDir);
-    return KStandardDirs::locateLocal("data", basePath);
+    basePath.append("/view_properties/");
+    return KUrl(KStandardDirs::locateLocal("data", basePath));
 }
 
-ViewProperties::ViewProperties(const ViewProperties& props)
-{
-    assert(false);
-}
-
-ViewProperties& ViewProperties::operator = (const ViewProperties& props)
+QString ViewProperties::destinationDir(const QString& subDir) const
 {
-    assert(false);
+    QString basePath = KGlobal::mainComponent().componentName();
+    basePath.append("/view_properties/").append(subDir);
+    return KStandardDirs::locateLocal("data", basePath);
 }