Dolphin is now a KUniqueApplication. A lot of thanks go to Oscar Blumberg, who submit...

[dolphin.git] / src / viewproperties.cpp

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index a3a8ec46bbf16d3671bbad4821d71711733fdc0e..25aa98e0e579d495755cf9893521a7a349e4b09f 100644 (file)
--- 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  *
  *                                                                         *
  *   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,86 +15,75 @@
  *   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.,                                       *
  *   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 <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 <klocale.h>
 #include <kstandarddirs.h>
 #include <kurl.h>

-#include <kinstance.h>
+#include <kcomponentdata.h>

 
 #include "viewproperties.h"
 
 #include "viewproperties.h"

-

 #include "dolphinsettings.h"
 #include "dolphinsettings.h"

+#include "generalsettings.h"

 
 #define FILE_NAME "/.directory"
 
 
 #define FILE_NAME "/.directory"
 

-ViewProperties::ViewProperties(KUrl url) :
+ViewProperties::ViewProperties(const KUrl& url) :

       m_changedProps(false),
       m_autoSave(true),
       m_changedProps(false),
       m_autoSave(true),

-      m_subDirValidityHidden(false),

       m_node(0)
 {
       m_node(0)
 {

-    url.cleanPath();
-    m_filepath = url.path();
+    KUrl cleanUrl(url);
+    cleanUrl.cleanPath();
+    m_filepath = cleanUrl.path();

 
     if ((m_filepath.length() < 1) || (m_filepath.at(0) != QChar('/'))) {
         m_node = new ViewPropertySettings();
         return;
     }
 
 
     if ((m_filepath.length() < 1) || (m_filepath.at(0) != QChar('/'))) {
         m_node = new ViewPropertySettings();
         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
-    QString rootDir("/"); // TODO: should this be set to the root of the bookmark, if any?
-    if (url.isLocalFile()) {
-        QFileInfo info(m_filepath);
-
+    // 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.
+    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()) {
         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 {
         }
     }
     else {

-        QString basePath = KGlobal::instance()->instanceName();
-        basePath.append("/view_properties/remote/").append(url.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));
-
-    QDir dir(m_filepath);
-    const bool isValidForSubDirs = m_node->validForSubDirs();
-    while ((dir.path() != rootDir) && dir.cdUp()) {
-        QString parentPath(dir.path() + FILE_NAME);
+    const QString file(m_filepath + FILE_NAME);
+    m_node = new ViewPropertySettings(KSharedConfig::openConfig(file));

 
 

-        if (!QFile::exists(parentPath))
-        {
-            continue;
-        }
-
-        ViewPropertySettings parentNode(KSharedConfig::openConfig(dir.path() + FILE_NAME));
-        const bool inheritProps = parentNode.validForSubDirs() &&
-                                  (parentNode.timestamp() > m_node->timestamp());
+    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);

 
 

-        if (inheritProps) {
-            delete m_node;
-            m_node = new ViewPropertySettings(KSharedConfig::openConfig(dir.path() + FILE_NAME));
-            break;
-        }
-    }
+        ViewProperties defaultProps(url);
+        setDirProperties(defaultProps);

 
 

-    if (isValidForSubDirs) {
-        m_subDirValidityHidden = true;
+        settings->setGlobalViewProps(false);
+        m_changedProps = false;

     }
 }
 
     }
 }
 


@@ -105,6 +94,7 @@ ViewProperties::~ViewProperties()
     }
 
     delete m_node;
     }
 
     delete m_node;

+    m_node = 0;

 }
 
 void ViewProperties::setViewMode(DolphinView::Mode mode)
 }
 
 void ViewProperties::setViewMode(DolphinView::Mode mode)


@@ -120,7 +110,21 @@ DolphinView::Mode ViewProperties::viewMode() const
     return static_cast<DolphinView::Mode>(m_node->viewMode());
 }
 
     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);
 {
     if (m_node->showHiddenFiles() != show) {
         m_node->setShowHiddenFiles(show);


@@ -128,7 +132,7 @@ void ViewProperties::setShowHiddenFilesEnabled(bool show)
     }
 }
 
     }
 }
 

-bool ViewProperties::isShowHiddenFilesEnabled() const
+bool ViewProperties::showHiddenFiles() const

 {
     return m_node->showHiddenFiles();
 }
 {
     return m_node->showHiddenFiles();
 }


@@ -159,17 +163,13 @@ Qt::SortOrder ViewProperties::sortOrder() const
     return static_cast<Qt::SortOrder>(m_node->sortOrder());
 }
 
     return static_cast<Qt::SortOrder>(m_node->sortOrder());
 }
 

-void ViewProperties::setValidForSubDirs(bool valid)
-{
-    if (m_node->validForSubDirs() != valid) {
-        m_node->setValidForSubDirs(valid);
-        updateTimeStamp();
-    }
-}
-
-bool ViewProperties::isValidForSubDirs() const
+void ViewProperties::setDirProperties(const ViewProperties& props)

 {
 {

-    return m_node->validForSubDirs();
+    setViewMode(props.viewMode());
+    setShowPreview(props.showPreview());
+    setShowHiddenFiles(props.showHiddenFiles());
+    setSorting(props.sorting());
+    setSortOrder(props.sortOrder());

 }
 
 void ViewProperties::setAutoSaveEnabled(bool autoSave)
 }
 
 void ViewProperties::setAutoSaveEnabled(bool autoSave)


@@ -195,16 +195,19 @@ void ViewProperties::save()
     m_changedProps = false;
 }
 
     m_changedProps = false;
 }
 

-ViewProperties& ViewProperties::operator = (const ViewProperties& props)
+QString ViewProperties::destinationDir(const QString& subDir) const

 {
 {

-    if (&props != this) {
-        m_changedProps = props.m_changedProps;
-        m_autoSave = props.m_autoSave;
-        m_subDirValidityHidden = props.m_subDirValidityHidden;
-        m_filepath = props.m_filepath;
-        m_node = new ViewPropertySettings();
-        //*m_node = *(props.m_node);
-    }
+    QString basePath = KGlobal::mainComponent().componentName();
+    basePath.append("/view_properties/").append(subDir);
+    return KStandardDirs::locateLocal("data", basePath);
+}

 
 

-    return *this;
+ViewProperties::ViewProperties(const ViewProperties& /*props*/)
+{
+    assert(false);
+}
+
+ViewProperties& ViewProperties::operator = (const ViewProperties& /*props*/)
+{
+    assert(false);

 }
 }