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

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index 60e91cabf..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  *
@@ -15,23 +15,23 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
 #include <assert.h>
 
-#include <qdatetime.h>
-#include <qdir.h>
-#include <qfile.h>
+#include <QDateTime>
+#include <QFile>
 
+#include <kcomponentdata.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
-#include <kinstance.h>
+#include <kcomponentdata.h>
 
 #include "viewproperties.h"
-
 #include "dolphinsettings.h"
+#include "dolphin_generalsettings.h"
 
 #define FILE_NAME "/.directory"
 
@@ -41,7 +41,6 @@ ViewProperties::ViewProperties(const KUrl& url) :
       m_node(0)
 {
     KUrl cleanUrl(url);
-
     cleanUrl.cleanPath();
     m_filepath = cleanUrl.path();
 
@@ -53,25 +52,39 @@ 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.
-    QString rootDir("/"); // TODO: should this be set to the root of the bookmark, if any?
-    if (cleanUrl.isLocalFile()) {
-        QFileInfo info(m_filepath);
-
+    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    const bool useGlobalViewProps = settings->globalViewProps();
+    if (useGlobalViewProps) {
+        m_filepath = destinationDir("global");
+    }
+    else if (cleanUrl.isLocalFile()) {
+        const QFileInfo info(m_filepath);
         if (!info.isWritable()) {
-            QString basePath = KGlobal::instance()->instanceName();
-            basePath.append("/view_properties/local");
-            rootDir = KStandardDirs::locateLocal("data", basePath);
-            m_filepath = rootDir + m_filepath;
+            m_filepath = destinationDir("local") + m_filepath;
         }
     }
     else {
-        QString basePath = KGlobal::instance()->instanceName();
-        basePath.append("/view_properties/remote/").append(cleanUrl.host());
-        rootDir = KStandardDirs::locateLocal("data", basePath);
-        m_filepath = rootDir + m_filepath;
+        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()
@@ -150,6 +163,15 @@ Qt::SortOrder ViewProperties::sortOrder() const
     return static_cast<Qt::SortOrder>(m_node->sortOrder());
 }
 
+void ViewProperties::setDirProperties(const ViewProperties& props)
+{
+    setViewMode(props.viewMode());
+    setShowPreview(props.showPreview());
+    setShowHiddenFiles(props.showHiddenFiles());
+    setSorting(props.sorting());
+    setSortOrder(props.sortOrder());
+}
+
 void ViewProperties::setAutoSaveEnabled(bool autoSave)
 {
     m_autoSave = autoSave;
@@ -173,12 +195,16 @@ void ViewProperties::save()
     m_changedProps = false;
 }
 
-ViewProperties::ViewProperties(const ViewProperties& props)
+KUrl ViewProperties::mirroredDirectory()
 {
-    assert(false);
+    QString basePath = KGlobal::mainComponent().componentName();
+    basePath.append("/view_properties/");
+    return KUrl(KStandardDirs::locateLocal("data", basePath));
 }
 
-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);
 }