Merge remote-tracking branch 'origin/master' into frameworks

[dolphin.git] / src / views / viewproperties.cpp

diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp
index 3a9a2a370e1577b974a9589b40c2a97d918fe1b0..018f42d2b65c70ed8eb1c46017cfcb64c7e028c1 100644 (file)
--- a/src/views/viewproperties.cpp
+++ b/src/views/viewproperties.cpp
@@ -23,15 +23,16 @@
 #include "dolphin_directoryviewpropertysettings.h"
 #include "dolphin_generalsettings.h"
 
 #include "dolphin_directoryviewpropertysettings.h"
 #include "dolphin_generalsettings.h"
 

-#include <KComponentData>
-#include <KLocale>
-#include <KStandardDirs>
-#include <KUrl>
+#include <QUrl>
+#include <KDebug>
+#include <KGlobal>

 
 

+#include <KComponentData>

 #include <QCryptographicHash>
 #include <QDate>
 #include <QFile>
 #include <QFileInfo>
 #include <QCryptographicHash>
 #include <QDate>
 #include <QFile>
 #include <QFileInfo>

+#include <QStandardPaths>

 
 namespace {
     const int AdditionalInfoViewPropertiesVersion = 1;
 
 namespace {
     const int AdditionalInfoViewPropertiesVersion = 1;


@@ -41,16 +42,19 @@ namespace {
     // String representation to mark the additional properties of
     // the details view as customized by the user. See
     // ViewProperties::visibleRoles() for more information.
     // String representation to mark the additional properties of
     // the details view as customized by the user. See
     // ViewProperties::visibleRoles() for more information.

-    const char* CustomizedDetailsString = "CustomizedDetails";
+    const char CustomizedDetailsString[] = "CustomizedDetails";
+
+    // Filename that is used for storing the properties
+    const char ViewPropertiesFileName[] = ".directory";

 }
 
 }
 

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

     m_changedProps(false),
     m_autoSave(true),
     m_node(0)
 {
     GeneralSettings* settings = GeneralSettings::self();
     m_changedProps(false),
     m_autoSave(true),
     m_node(0)
 {
     GeneralSettings* settings = GeneralSettings::self();

-    const bool useGlobalViewProps = settings->globalViewProps();
+    const bool useGlobalViewProps = settings->globalViewProps() || url.isEmpty();

     bool useDetailsViewWithPath = false;
 
     // We try and save it to the file .directory in the directory being viewed.
     bool useDetailsViewWithPath = false;
 
     // We try and save it to the file .directory in the directory being viewed.


@@ -58,16 +62,21 @@ ViewProperties::ViewProperties(const KUrl& url) :
     // we store the properties information in a local file.
     if (useGlobalViewProps) {
         m_filePath = destinationDir("global");
     // we store the properties information in a local file.
     if (useGlobalViewProps) {
         m_filePath = destinationDir("global");

-    } else if (url.protocol().contains("search")) {
+    } else if (url.scheme().contains("search")) {

         m_filePath = destinationDir("search/") + directoryHashForUrl(url);
         useDetailsViewWithPath = true;
         m_filePath = destinationDir("search/") + directoryHashForUrl(url);
         useDetailsViewWithPath = true;

-    } else if (url.protocol() == QLatin1String("trash")) {
+    } else if (url.scheme() == QLatin1String("trash")) {

         m_filePath = destinationDir("trash");
         useDetailsViewWithPath = true;
     } else if (url.isLocalFile()) {
         m_filePath = url.toLocalFile();
         m_filePath = destinationDir("trash");
         useDetailsViewWithPath = true;
     } else if (url.isLocalFile()) {
         m_filePath = url.toLocalFile();

-        const QFileInfo info(m_filePath);
-        if (!info.isWritable() || !isPartOfHome(m_filePath)) {
+        const QFileInfo dirInfo(m_filePath);
+        const QFileInfo fileInfo(m_filePath + QDir::separator() + ViewPropertiesFileName);
+        // Check if the directory is writable and check if the ".directory" file exists and
+        // is read- and writable.
+        if (!dirInfo.isWritable()
+                || (fileInfo.exists() && !(fileInfo.isReadable() && fileInfo.isWritable()))
+                || !isPartOfHome(m_filePath)) {

 #ifdef Q_OS_WIN
                        // m_filePath probably begins with C:/ - the colon is not a valid character for paths though
                        m_filePath =  QDir::separator() + m_filePath.remove(QLatin1Char(':'));
 #ifdef Q_OS_WIN
                        // m_filePath probably begins with C:/ - the colon is not a valid character for paths though
                        m_filePath =  QDir::separator() + m_filePath.remove(QLatin1Char(':'));


@@ -78,13 +87,13 @@ ViewProperties::ViewProperties(const KUrl& url) :
         m_filePath = destinationDir("remote") + m_filePath;
     }
 
         m_filePath = destinationDir("remote") + m_filePath;
     }
 

-    const QString file = m_filePath + QDir::separator() + QLatin1String(".directory");
+    const QString file = m_filePath + QDir::separator() + ViewPropertiesFileName;

     m_node = new ViewPropertySettings(KSharedConfig::openConfig(file));
 
     // If the .directory file does not exist or the timestamp is too old,
     // use default values instead.
     const bool useDefaultProps = (!useGlobalViewProps || useDetailsViewWithPath) &&
     m_node = new ViewPropertySettings(KSharedConfig::openConfig(file));
 
     // If the .directory file does not exist or the timestamp is too old,
     // use default values instead.
     const bool useDefaultProps = (!useGlobalViewProps || useDetailsViewWithPath) &&

-                                 (!QFileInfo(file).exists() ||
+                                 (!QFile::exists(file) ||

                                   (m_node->timestamp() < settings->viewPropsTimestamp()));
     if (useDefaultProps) {
         if (useDetailsViewWithPath) {
                                   (m_node->timestamp() < settings->viewPropsTimestamp()));
     if (useDefaultProps) {
         if (useDetailsViewWithPath) {


@@ -92,16 +101,32 @@ ViewProperties::ViewProperties(const KUrl& url) :
             setVisibleRoles(QList<QByteArray>() << "path");
         } else {
             // The global view-properties act as default for directories without
             setVisibleRoles(QList<QByteArray>() << "path");
         } else {
             // The global view-properties act as default for directories without

-            // any view-property configuration
-            settings->setGlobalViewProps(true);
-
-            ViewProperties defaultProps(url);
+            // any view-property configuration. Constructing a ViewProperties 
+            // instance for an empty QUrl ensures that the global view-properties
+            // are loaded.
+            QUrl emptyUrl;
+            ViewProperties defaultProps(emptyUrl);

             setDirProperties(defaultProps);
 
             setDirProperties(defaultProps);
 

-            settings->setGlobalViewProps(false);

             m_changedProps = false;
         }
     }
             m_changedProps = false;
         }
     }

+
+    if (m_node->version() < CurrentViewPropertiesVersion) {
+        // The view-properties have an outdated version. Convert the properties
+        // to the changes of the current version.
+        if (m_node->version() < AdditionalInfoViewPropertiesVersion) {
+            convertAdditionalInfo();
+            Q_ASSERT(m_node->version() == AdditionalInfoViewPropertiesVersion);
+        }
+
+        if (m_node->version() < NameRolePropertiesVersion) {
+            convertNameRoleToTextRole();
+            Q_ASSERT(m_node->version() == NameRolePropertiesVersion);
+        }
+
+        m_node->setVersion(CurrentViewPropertiesVersion);
+    }

 }
 
 ViewProperties::~ViewProperties()
 }
 
 ViewProperties::~ViewProperties()


@@ -177,10 +202,6 @@ void ViewProperties::setSortRole(const QByteArray& role)
 
 QByteArray ViewProperties::sortRole() const
 {
 
 QByteArray ViewProperties::sortRole() const
 {

-    if (m_node->version() <= NameRolePropertiesVersion) {
-        const_cast<ViewProperties*>(this)->convertNameRoleToTextRole();
-    }
-

     return m_node->sortRole().toLatin1();
 }
 
     return m_node->sortRole().toLatin1();
 }
 


@@ -212,6 +233,10 @@ bool ViewProperties::sortFoldersFirst() const
 
 void ViewProperties::setVisibleRoles(const QList<QByteArray>& roles)
 {
 
 void ViewProperties::setVisibleRoles(const QList<QByteArray>& roles)
 {

+    if (roles == visibleRoles()) {
+        return;
+    }
+

     // See ViewProperties::visibleRoles() for the storage format
     // of the additional information.
 
     // See ViewProperties::visibleRoles() for the storage format
     // of the additional information.
 


@@ -265,22 +290,11 @@ QList<QByteArray> ViewProperties::visibleRoles() const
     roles.append("text");
 
     // Iterate through all stored keys and append all roles that match to
     roles.append("text");
 
     // Iterate through all stored keys and append all roles that match to

-    // the curren view mode.
+    // the current view mode.

     const QString prefix = viewModePrefix();
     const int prefixLength = prefix.length();
 
     const QString prefix = viewModePrefix();
     const int prefixLength = prefix.length();
 

-    QStringList visibleRoles = m_node->visibleRoles();
-    const int version = m_node->version();
-    if (visibleRoles.isEmpty() && version <= AdditionalInfoViewPropertiesVersion) {
-        // Convert the obsolete additionalInfo-property from older versions into the
-        // visibleRoles-property
-        const_cast<ViewProperties*>(this)->convertAdditionalInfo();
-        visibleRoles = m_node->visibleRoles();
-    } else if (version <= NameRolePropertiesVersion) {
-        const_cast<ViewProperties*>(this)->convertNameRoleToTextRole();
-        visibleRoles = m_node->visibleRoles();
-    }
-
+    const QStringList visibleRoles = m_node->visibleRoles();

     foreach (const QString& visibleRole, visibleRoles) {
         if (visibleRole.startsWith(prefix)) {
             const QByteArray role = visibleRole.right(visibleRole.length() - prefixLength).toLatin1();
     foreach (const QString& visibleRole, visibleRoles) {
         if (visibleRole.startsWith(prefix)) {
             const QByteArray role = visibleRole.right(visibleRole.length() - prefixLength).toLatin1();


@@ -327,6 +341,7 @@ void ViewProperties::setDirProperties(const ViewProperties& props)
     setSortFoldersFirst(props.sortFoldersFirst());
     setVisibleRoles(props.visibleRoles());
     setHeaderColumnWidths(props.headerColumnWidths());
     setSortFoldersFirst(props.sortFoldersFirst());
     setVisibleRoles(props.visibleRoles());
     setHeaderColumnWidths(props.headerColumnWidths());

+    m_node->setVersion(props.m_node->version());

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


@@ -347,24 +362,26 @@ void ViewProperties::update()
 
 void ViewProperties::save()
 {
 
 void ViewProperties::save()
 {

-    KStandardDirs::makeDir(m_filePath);
+    kDebug() << "Saving view-properties to" << m_filePath;
+    QDir dir;
+    dir.mkpath(m_filePath);

     m_node->setVersion(CurrentViewPropertiesVersion);
     m_node->writeConfig();
     m_changedProps = false;
 }
 
     m_node->setVersion(CurrentViewPropertiesVersion);
     m_node->writeConfig();
     m_changedProps = false;
 }
 

-KUrl ViewProperties::mirroredDirectory()
+bool ViewProperties::exist() const

 {
 {

-    QString basePath = KGlobal::mainComponent().componentName();
-    basePath.append("/view_properties/");
-    return KUrl(KStandardDirs::locateLocal("data", basePath));
+    const QString file = m_filePath + QDir::separator() + ViewPropertiesFileName;
+    return QFile::exists(file);

 }
 
 QString ViewProperties::destinationDir(const QString& subDir) const
 {
 }
 
 QString ViewProperties::destinationDir(const QString& subDir) const
 {

-    QString basePath = KGlobal::mainComponent().componentName();
-    basePath.append("/view_properties/").append(subDir);
-    return KStandardDirs::locateLocal("data", basePath);
+    QString path = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
+    path.append(KGlobal::mainComponent().componentName());
+    path.append("/view_properties/").append(subDir);
+    return path;

 }
 
 QString ViewProperties::viewModePrefix() const
 }
 
 QString ViewProperties::viewModePrefix() const


@@ -409,6 +426,7 @@ void ViewProperties::convertAdditionalInfo()
 
     m_node->setAdditionalInfo(QStringList());
     m_node->setVisibleRoles(visibleRoles);
 
     m_node->setAdditionalInfo(QStringList());
     m_node->setVisibleRoles(visibleRoles);

+    m_node->setVersion(AdditionalInfoViewPropertiesVersion);

     update();
 }
 
     update();
 }
 


@@ -416,7 +434,7 @@ void ViewProperties::convertNameRoleToTextRole()
 {
     QStringList visibleRoles = m_node->visibleRoles();
     for (int i = 0; i < visibleRoles.count(); ++i) {
 {
     QStringList visibleRoles = m_node->visibleRoles();
     for (int i = 0; i < visibleRoles.count(); ++i) {

-        if (visibleRoles[i].endsWith("_name")) {
+        if (visibleRoles[i].endsWith(QLatin1String("_name"))) {

             const int leftLength = visibleRoles[i].length() - 5;
             visibleRoles[i] = visibleRoles[i].left(leftLength) + "_text";
         }
             const int leftLength = visibleRoles[i].length() - 5;
             visibleRoles[i] = visibleRoles[i].left(leftLength) + "_text";
         }


@@ -429,6 +447,7 @@ void ViewProperties::convertNameRoleToTextRole()
 
     m_node->setVisibleRoles(visibleRoles);
     m_node->setSortRole(sortRole);
 
     m_node->setVisibleRoles(visibleRoles);
     m_node->setSortRole(sortRole);

+    m_node->setVersion(NameRolePropertiesVersion);

     update();
 }
 
     update();
 }
 


@@ -445,10 +464,9 @@ bool ViewProperties::isPartOfHome(const QString& filePath)
     return filePath.startsWith(homePath);
 }
 
     return filePath.startsWith(homePath);
 }
 

-QString ViewProperties::directoryHashForUrl(const KUrl& url)
+QString ViewProperties::directoryHashForUrl(const QUrl& url)

 {
 {

-    const QByteArray hashValue = QCryptographicHash::hash(url.prettyUrl().toLatin1(),
-                                                     QCryptographicHash::Sha1);
+    const QByteArray hashValue = QCryptographicHash::hash(url.toEncoded(), QCryptographicHash::Sha1);

     QString hashString = hashValue.toBase64();
     hashString.replace('/', '-');
     return hashString;
     QString hashString = hashValue.toBase64();
     hashString.replace('/', '-');
     return hashString;