Merge branch 'master' into frameworks

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

diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp
index 10e420c859b06a77e18c8d65e7680171a33b90d8..bcea0625348213eaa065a4c123e57a7a3616c17b 100644 (file)
--- a/src/views/viewproperties.cpp
+++ b/src/views/viewproperties.cpp
@@ -27,19 +27,26 @@
 #include <KLocale>
 #include <KStandardDirs>
 #include <KUrl>
 #include <KLocale>
 #include <KStandardDirs>
 #include <KUrl>

+#include <KDebug>
+#include <KGlobal>

 
 

+#include <QCryptographicHash>

 #include <QDate>
 #include <QFile>
 #include <QFileInfo>
 
 namespace {
 #include <QDate>
 #include <QFile>
 #include <QFileInfo>
 
 namespace {

-    const int CurrentViewPropertiesVersion = 2;

     const int AdditionalInfoViewPropertiesVersion = 1;
     const int AdditionalInfoViewPropertiesVersion = 1;

+    const int NameRolePropertiesVersion = 2;
+    const int CurrentViewPropertiesVersion = 3;

 
     // 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";
 
     // 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";

+
+    // Filename that is used for storing the properties
+    const char* ViewPropertiesFileName = ".directory";

 }
 
 ViewProperties::ViewProperties(const KUrl& url) :
 }
 
 ViewProperties::ViewProperties(const KUrl& url) :


@@ -48,7 +55,7 @@ ViewProperties::ViewProperties(const KUrl& url) :
     m_node(0)
 {
     GeneralSettings* settings = GeneralSettings::self();
     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.


@@ -57,28 +64,37 @@ ViewProperties::ViewProperties(const KUrl& url) :
     if (useGlobalViewProps) {
         m_filePath = destinationDir("global");
     } else if (url.protocol().contains("search")) {
     if (useGlobalViewProps) {
         m_filePath = destinationDir("global");
     } else if (url.protocol().contains("search")) {

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

         useDetailsViewWithPath = true;
     } else if (url.protocol() == QLatin1String("trash")) {
         m_filePath = destinationDir("trash");
         useDetailsViewWithPath = true;
     } else if (url.isLocalFile()) {
         m_filePath = url.toLocalFile();
         useDetailsViewWithPath = true;
     } else if (url.protocol() == QLatin1String("trash")) {
         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(':'));
+#endif

             m_filePath = destinationDir("local") + m_filePath;
         }
     } else {
         m_filePath = destinationDir("remote") + m_filePath;
     }
 
             m_filePath = destinationDir("local") + m_filePath;
         }
     } else {
         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) {


@@ -86,16 +102,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 KUrl ensures that the global view-properties
+            // are loaded.
+            KUrl 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()


@@ -202,6 +234,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.
 


@@ -252,24 +288,18 @@ QList<QByteArray> ViewProperties::visibleRoles() const
     // is accepted.
 
     QList<QByteArray> roles;
     // is accepted.
 
     QList<QByteArray> roles;

-    roles.append("name");
+    roles.append("text");

 
     // Iterate through all stored keys and append all roles that match to
 
     // 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();
-    if (visibleRoles.isEmpty() && m_node->version() <= AdditionalInfoViewPropertiesVersion) {
-        // Convert the obsolete additionalInfo-property from older versions into the
-        // visibleRoles-property
-        visibleRoles = const_cast<ViewProperties*>(this)->convertAdditionalInfo();
-    }
-
+    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();

-            if (role != "name") {
+            if (role != "text") {

                 roles.append(role);
             }
         }
                 roles.append(role);
             }
         }


@@ -277,7 +307,7 @@ QList<QByteArray> ViewProperties::visibleRoles() const
 
     // For the details view the size and date should be shown per default
     // until the additional information has been explicitly changed by the user
 
     // For the details view the size and date should be shown per default
     // until the additional information has been explicitly changed by the user

-    const bool useDefaultValues = roles.count() == 1 // "name"
+    const bool useDefaultValues = roles.count() == 1 // "text"

                                   && (m_node->viewMode() == DolphinView::DetailsView)
                                   && !visibleRoles.contains(CustomizedDetailsString);
     if (useDefaultValues) {
                                   && (m_node->viewMode() == DolphinView::DetailsView)
                                   && !visibleRoles.contains(CustomizedDetailsString);
     if (useDefaultValues) {


@@ -288,6 +318,19 @@ QList<QByteArray> ViewProperties::visibleRoles() const
     return roles;
 }
 
     return roles;
 }
 

+void ViewProperties::setHeaderColumnWidths(const QList<int>& widths)
+{
+    if (m_node->headerColumnWidths() != widths) {
+        m_node->setHeaderColumnWidths(widths);
+        update();
+    }
+}
+
+QList<int> ViewProperties::headerColumnWidths() const
+{
+    return m_node->headerColumnWidths();
+}
+

 void ViewProperties::setDirProperties(const ViewProperties& props)
 {
     setViewMode(props.viewMode());
 void ViewProperties::setDirProperties(const ViewProperties& props)
 {
     setViewMode(props.viewMode());


@@ -298,6 +341,8 @@ void ViewProperties::setDirProperties(const ViewProperties& props)
     setSortOrder(props.sortOrder());
     setSortFoldersFirst(props.sortFoldersFirst());
     setVisibleRoles(props.visibleRoles());
     setSortOrder(props.sortOrder());
     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)


@@ -318,17 +363,17 @@ void ViewProperties::update()
 
 void ViewProperties::save()
 {
 
 void ViewProperties::save()
 {

+    kDebug() << "Saving view-properties to" << m_filePath;

     KStandardDirs::makeDir(m_filePath);
     m_node->setVersion(CurrentViewPropertiesVersion);
     m_node->writeConfig();
     m_changedProps = false;
 }
 
     KStandardDirs::makeDir(m_filePath);
     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


@@ -352,7 +397,7 @@ QString ViewProperties::viewModePrefix() const
     return prefix;
 }
 
     return prefix;
 }
 

-QStringList ViewProperties::convertAdditionalInfo()
+void ViewProperties::convertAdditionalInfo()

 {
     QStringList visibleRoles;
 
 {
     QStringList visibleRoles;
 


@@ -380,9 +425,29 @@ QStringList ViewProperties::convertAdditionalInfo()
 
     m_node->setAdditionalInfo(QStringList());
     m_node->setVisibleRoles(visibleRoles);
 
     m_node->setAdditionalInfo(QStringList());
     m_node->setVisibleRoles(visibleRoles);

+    m_node->setVersion(AdditionalInfoViewPropertiesVersion);

     update();
     update();

+}

 
 

-    return visibleRoles;
+void ViewProperties::convertNameRoleToTextRole()
+{
+    QStringList visibleRoles = m_node->visibleRoles();
+    for (int i = 0; i < visibleRoles.count(); ++i) {
+        if (visibleRoles[i].endsWith(QLatin1String("_name"))) {
+            const int leftLength = visibleRoles[i].length() - 5;
+            visibleRoles[i] = visibleRoles[i].left(leftLength) + "_text";
+        }
+    }
+
+    QString sortRole = m_node->sortRole();
+    if (sortRole == QLatin1String("name")) {
+        sortRole = QLatin1String("text");
+    }
+
+    m_node->setVisibleRoles(visibleRoles);
+    m_node->setSortRole(sortRole);
+    m_node->setVersion(NameRolePropertiesVersion);
+    update();

 }
 
 bool ViewProperties::isPartOfHome(const QString& filePath)
 }
 
 bool ViewProperties::isPartOfHome(const QString& filePath)


@@ -397,3 +462,19 @@ bool ViewProperties::isPartOfHome(const QString& filePath)
 
     return filePath.startsWith(homePath);
 }
 
     return filePath.startsWith(homePath);
 }

+
+QString ViewProperties::directoryHashForUrl(const KUrl& url)
+{
+    const QByteArray hashValue = QCryptographicHash::hash(url.prettyUrl().toLatin1(),
+                                                     QCryptographicHash::Sha1);
+    QString hashString = hashValue.toBase64();
+    hashString.replace('/', '-');
+    return hashString;
+}
+
+KUrl ViewProperties::mirroredDirectory()
+{
+    QString basePath = KGlobal::mainComponent().componentName();
+    basePath.append("/view_properties/");
+    return KUrl(KStandardDirs::locateLocal("data", basePath));
+}